From cbba4831877d8a6bc284d57edf7f0d4a58669b57 Mon Sep 17 00:00:00 2001
From: Ben Stewart <bst@google.com>
Date: Tue, 8 Mar 2016 13:12:26 -0800
Subject: [PATCH] Upgrade Apache Commons Collections to v3.2.2

Version 3.2.1 has a CVSS 10.0 vulnerability. That's the worst kind of
vulnerability that exists. By merely existing on the classpath, this
library causes the Java serialization parser for the entire JVM process
to go from being a state machine to a turing machine. A turing machine
with an exec() function!

https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8103
https://commons.apache.org/proper/commons-collections/security-reports.html
http://foxglovesecurity.com/2015/11/06/what-do-weblogic-websphere-jboss-jenkins-opennms-and-your-application-have-in-common-this-vulnerability/
---
 BASE-APP/java/all-dependency-infrastructure/pom.xml           | 4 ++--
 BASE-APP/java/privilege-api-server/.classpath                 | 4 ++--
 .../.settings/org.eclipse.wst.common.component                | 4 ++--
 BASE-APP/java/privilege-server/.classpath                     | 4 ++--
 .../.settings/org.eclipse.wst.common.component                | 4 ++--
 CAS-SHIRO-CLIENT-DEMO/pom.xml                                 | 2 +-
 CAS-SHIRO-CLIENT-JAR-DEMO/.classpath                          | 4 ++--
 CAS-SHIRO-CLIENT-JAR-DEMO/pom.xml                             | 2 +-
 CAS-SHIRO-CLIENT-JAR/.classpath                               | 4 ++--
 CAS-SHIRO-CLIENT-JAR/pom.xml                                  | 4 ++--
 CAS-SHIRO-SERVER-DEMO/.classpath                              | 4 ++--
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/BASE-APP/java/all-dependency-infrastructure/pom.xml b/BASE-APP/java/all-dependency-infrastructure/pom.xml
index e9ab781..33ab0c8 100644
--- a/BASE-APP/java/all-dependency-infrastructure/pom.xml
+++ b/BASE-APP/java/all-dependency-infrastructure/pom.xml
@@ -207,7 +207,7 @@
 			<dependency>
 				<groupId>commons-collections</groupId>
 				<artifactId>commons-collections</artifactId>
-				<version>3.2.1</version>
+				<version>3.2.2</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-io</groupId>
@@ -498,4 +498,4 @@
 		
 		</dependencies>
 	</dependencyManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/BASE-APP/java/privilege-api-server/.classpath b/BASE-APP/java/privilege-api-server/.classpath
index 371fff7..c0b0eef 100644
--- a/BASE-APP/java/privilege-api-server/.classpath
+++ b/BASE-APP/java/privilege-api-server/.classpath
@@ -34,7 +34,7 @@
   <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.6/commons-pool-1.6.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/alibaba/dubbo/2.5.3/dubbo-2.5.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/javassist/javassist/3.15.0-GA/javassist-3.15.0-GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/github/sgroschupf/zkclient/0.1/zkclient-0.1.jar"/>
@@ -44,4 +44,4 @@
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/caucho/hessian/4.0.7/hessian-4.0.7.jar"/>
   <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.36/mysql-connector-java-5.1.36.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
diff --git a/BASE-APP/java/privilege-api-server/.settings/org.eclipse.wst.common.component b/BASE-APP/java/privilege-api-server/.settings/org.eclipse.wst.common.component
index 99e7130..ec3183c 100644
--- a/BASE-APP/java/privilege-api-server/.settings/org.eclipse.wst.common.component
+++ b/BASE-APP/java/privilege-api-server/.settings/org.eclipse.wst.common.component
@@ -88,7 +88,7 @@
     <dependent-module archiveName="commons-pool-1.6.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-pool/commons-pool/1.6/commons-pool-1.6.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="commons-collections-3.2.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar">
+    <dependent-module archiveName="commons-collections-3.2.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="dubbo-2.5.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/alibaba/dubbo/2.5.3/dubbo-2.5.3.jar">
@@ -115,4 +115,4 @@
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
   </wb-module>
-</project-modules>
\ No newline at end of file
+</project-modules>
diff --git a/BASE-APP/java/privilege-server/.classpath b/BASE-APP/java/privilege-server/.classpath
index fada93d..eeba920 100644
--- a/BASE-APP/java/privilege-server/.classpath
+++ b/BASE-APP/java/privilege-server/.classpath
@@ -52,7 +52,7 @@
   <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.6/commons-pool-1.6.jar" sourcepath="M2_REPO/commons-pool/commons-pool/1.6/commons-pool-1.6-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/18.0/guava-18.0.jar" sourcepath="M2_REPO/com/google/guava/guava/18.0/guava-18.0-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/netty/netty/3.2.0.Final/netty-3.2.0.Final.jar" sourcepath="M2_REPO/org/jboss/netty/netty/3.2.0.Final/netty-3.2.0.Final-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/redis/clients/jedis/2.0.0/jedis-2.0.0.jar" sourcepath="M2_REPO/redis/clients/jedis/2.0.0/jedis-2.0.0-sources.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
diff --git a/BASE-APP/java/privilege-server/.settings/org.eclipse.wst.common.component b/BASE-APP/java/privilege-server/.settings/org.eclipse.wst.common.component
index f402168..25d171b 100644
--- a/BASE-APP/java/privilege-server/.settings/org.eclipse.wst.common.component
+++ b/BASE-APP/java/privilege-server/.settings/org.eclipse.wst.common.component
@@ -127,7 +127,7 @@
     <dependent-module archiveName="commons-lang-2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
-    <dependent-module archiveName="commons-collections-3.2.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar">
+    <dependent-module archiveName="commons-collections-3.2.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar">
       <dependency-type>uses</dependency-type>
     </dependent-module>
     <dependent-module archiveName="netty-3.2.0.Final.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/jboss/netty/netty/3.2.0.Final/netty-3.2.0.Final.jar">
@@ -139,4 +139,4 @@
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
   </wb-module>
-</project-modules>
\ No newline at end of file
+</project-modules>
diff --git a/CAS-SHIRO-CLIENT-DEMO/pom.xml b/CAS-SHIRO-CLIENT-DEMO/pom.xml
index 8384711..ded0f9f 100644
--- a/CAS-SHIRO-CLIENT-DEMO/pom.xml
+++ b/CAS-SHIRO-CLIENT-DEMO/pom.xml
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
-			<version>3.2.1</version>
+			<version>3.2.2</version>
 		</dependency>
 
 		<dependency>
diff --git a/CAS-SHIRO-CLIENT-JAR-DEMO/.classpath b/CAS-SHIRO-CLIENT-JAR-DEMO/.classpath
index 25dd514..2ce76fd 100644
--- a/CAS-SHIRO-CLIENT-JAR-DEMO/.classpath
+++ b/CAS-SHIRO-CLIENT-JAR-DEMO/.classpath
@@ -15,7 +15,7 @@
   <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/18.0/guava-18.0.jar" sourcepath="M2_REPO/com/google/guava/guava/18.0/guava-18.0-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar" sourcepath="M2_REPO/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/shiro/shiro-core/1.2.2/shiro-core-1.2.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3-sources.jar"/>
@@ -47,4 +47,4 @@
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/4.0.0.RELEASE/spring-test-4.0.0.RELEASE.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
diff --git a/CAS-SHIRO-CLIENT-JAR-DEMO/pom.xml b/CAS-SHIRO-CLIENT-JAR-DEMO/pom.xml
index dd36ee6..87e72cd 100644
--- a/CAS-SHIRO-CLIENT-JAR-DEMO/pom.xml
+++ b/CAS-SHIRO-CLIENT-JAR-DEMO/pom.xml
@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
-			<version>3.2.1</version>
+			<version>3.2.2</version>
 		</dependency>
 
 		<dependency>
diff --git a/CAS-SHIRO-CLIENT-JAR/.classpath b/CAS-SHIRO-CLIENT-JAR/.classpath
index f572445..c91ae53 100644
--- a/CAS-SHIRO-CLIENT-JAR/.classpath
+++ b/CAS-SHIRO-CLIENT-JAR/.classpath
@@ -18,7 +18,7 @@
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/4.0.0.RELEASE/spring-test-4.0.0.RELEASE.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/4.0.0.RELEASE/spring-core-4.0.0.RELEASE.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/shiro/shiro-core/1.2.2/shiro-core-1.2.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3-sources.jar"/>
@@ -46,4 +46,4 @@
   <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3.jar" sourcepath="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3.jar" sourcepath="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.4.3/jackson-annotations-2.4.3.jar" sourcepath="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.4.3/jackson-annotations-2.4.3-sources.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
diff --git a/CAS-SHIRO-CLIENT-JAR/pom.xml b/CAS-SHIRO-CLIENT-JAR/pom.xml
index ad13cca..7d97d06 100644
--- a/CAS-SHIRO-CLIENT-JAR/pom.xml
+++ b/CAS-SHIRO-CLIENT-JAR/pom.xml
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
-			<version>3.2.1</version>
+			<version>3.2.2</version>
 		</dependency>
 
 		<dependency>
@@ -192,4 +192,4 @@
 		</plugins>
 	</build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/CAS-SHIRO-SERVER-DEMO/.classpath b/CAS-SHIRO-SERVER-DEMO/.classpath
index 1e8bbd9..9abdd4d 100644
--- a/CAS-SHIRO-SERVER-DEMO/.classpath
+++ b/CAS-SHIRO-SERVER-DEMO/.classpath
@@ -50,7 +50,7 @@
   <classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-config/3.2.0.RELEASE/spring-security-config-3.2.0.RELEASE.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jasig/service/persondir/person-directory-impl/1.5.1/person-directory-impl-1.5.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2/jaxb-impl-2.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jasig/service/persondir/person-directory-api/1.5.1/person-directory-api-1.5.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
@@ -88,4 +88,4 @@
   <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/github/axet/kaptcha/0.0.9/kaptcha-0.0.9.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/jhlabs/filters/2.0.235/filters-2.0.235.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>