Author: jleroux
Date: Mon Nov 30 13:01:47 2015
New Revision: 1717247
URL: http://svn.apache.org/viewvc?rev=1717247&view=rev
Log:
Updates commons collections from 3.2.2 to 4.1 - OFBIZ-6748
Even if we are covered from the Java Object possible deserialisation exploit by
the 3.2.2 version, since it's easy to update, this issue to update the trunk to
the last available release.
I updated the .classpath file by hand, but kept the tabs in it, so I could move
misplaced entries to their right alphabetical places.
Added:
ofbiz/trunk/framework/base/lib/commons/commons-collections4-4.1.jar (with
props)
Removed:
ofbiz/trunk/framework/base/lib/commons/commons-collections-3.2.2.jar
Modified:
ofbiz/trunk/.classpath
ofbiz/trunk/LICENSE
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
Modified: ofbiz/trunk/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1717247&r1=1717246&r2=1717247&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Mon Nov 30 13:01:47 2015
@@ -22,6 +22,9 @@
<classpathentry kind="lib"
path="framework/base/lib/freemarker-2.3.22.jar"/>
<classpathentry kind="lib" path="framework/base/lib/guava-14.0.1.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/hamcrest-all-1.2.jar"/>
+ <classpathentry kind="lib"
path="framework/base/lib/httpclient-4.4.1.jar"/>
+ <classpathentry kind="lib"
path="framework/base/lib/httpclient-cache-4.4.1.jar"/>
+ <classpathentry kind="lib"
path="framework/base/lib/httpcore-4.4.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpunit-1.7.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/ical4j-1.0-rc2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/icu4j-52_1.jar"/>
@@ -59,6 +62,7 @@
<classpathentry kind="lib"
path="framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-beanutils-core-1.8.3.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-codec-1.10.jar"/>
+ <classpathentry kind="lib"
path="framework/base/lib/commons/commons-collections4-4.1.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-compress-1.9.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-csv-1.1.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-el-1.0.jar"/>
@@ -194,9 +198,6 @@
<classpathentry kind="lib"
path="specialpurpose/solr/lib/runtime/noggit-0.6.jar"/>
<classpathentry kind="lib"
path="specialpurpose/solr/lib/runtime/org.restlet-2.3.0.jar"/>
<classpathentry kind="lib"
path="specialpurpose/solr/lib/runtime/org.restlet.ext.servlet-2.3.0.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/httpclient-4.4.1.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/httpclient-cache-4.4.1.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/httpcore-4.4.1.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/commons/commons-collections-3.2.2.jar"/>
+
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ofbiz/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1717247&r1=1717246&r2=1717247&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Mon Nov 30 13:01:47 2015
@@ -48,7 +48,7 @@ framework/base/lib/xml-apis-ext-1.3.04.j
framework/base/lib/zxing-core-3.2.0.jar
framework/base/lib/commons/commons-beanutils-core-1.8.3.jar
framework/base/lib/commons/commons-codec-1.10.jar
-framework/base/lib/commons/commons-collections-3.2.2.jar
+framework/base/lib/commons/commons-collections4-4.1.jar
framework/base/lib/commons/commons-compress-1.9.jar
framework/base/lib/commons/commons-csv-1.1.jar
framework/base/lib/commons/commons-el-1.0.jar
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1717247&r1=1717246&r2=1717247&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
(original)
+++
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
Mon Nov 30 13:01:47 2015
@@ -34,7 +34,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVRecord;
import org.ofbiz.accounting.payment.PaymentGatewayServices;
Added: ofbiz/trunk/framework/base/lib/commons/commons-collections4-4.1.jar
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/commons/commons-collections4-4.1.jar?rev=1717247&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ofbiz/trunk/framework/base/lib/commons/commons-collections4-4.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
