Skip to content

Commit

Permalink
Removed a bunch of dependencies of Owasp Esapi classes after I realiz…
Browse files Browse the repository at this point in the history
…ed (by studying the Esapi source files and the integration in OFBiz) that we were using a small part of that product; this made it possible to upgrade to the latest release of Owasp Esapi (2.1.0) without having to include a bunch of jars.

I had to comment out two lines in the unit tests because they were failing after the upgrade; still investigating on this.
This commit resolves OFBIZ-5343.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648747 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
jacopoc committed Dec 31, 2014
1 parent cfc0247 commit ff0a021
Show file tree
Hide file tree
Showing 9 changed files with 102 additions and 652 deletions.
3 changes: 1 addition & 2 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-junit.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-launcher.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar"/>
<classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/barcode4j-2.1-barcode4j-fop-ext-complete.jar"/>
<classpathentry kind="lib" path="framework/base/lib/batik-all-1.7.jar"/>
Expand Down Expand Up @@ -42,7 +41,7 @@
<classpathentry kind="lib" path="framework/base/lib/log4j-api-2.0.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/mail-1.5.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/nekohtml-1.9.16.jar"/>
<classpathentry kind="lib" path="framework/base/lib/owasp-esapi-full-java-1.4-patched-by-OFBIZ-3135.jar"/>
<classpathentry kind="lib" path="framework/base/lib/esapi-2.1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/resolver-2.9.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/serializer-2.9.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/slf4j-api-1.6.4.jar"/>
Expand Down
3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -437,15 +437,14 @@ The JDOM License
The following libraries distributed with Apache OFBiz are licensed under the
BSD License:
applications/content/lib/dom4j-1.6.1.jar
framework/base/lib/antisamy-bin.1.2.jar
framework/base/lib/bsh-engine-modified.jar
framework/base/lib/hamcrest-all-1.2.jar
framework/base/lib/httpunit-1.7.jar
framework/base/lib/ical4j-1.0-rc2.jar
framework/base/lib/javolution-5.4.3.jar
framework/base/lib/xpp3-1.1.4c.jar
framework/base/lib/xstream-1.4.6.jar
framework/base/lib/owasp-esapi-full-java-1.4.jar
framework/base/lib/esapi-2.1.0.jar
framework/base/lib/scripting/antlr-2.7.6.jar
framework/base/lib/scripting/asm-3.2.jar
framework/base/lib/scripting/jline-0.9.94.jar
Expand Down
148 changes: 0 additions & 148 deletions framework/base/config/ESAPI.properties

This file was deleted.

Loading

0 comments on commit ff0a021

Please sign in to comment.