diff options
| author | PJ Fanning <fanningpj@apache.org> | 2018-07-14 15:49:49 +0000 |
|---|---|---|
| committer | PJ Fanning <fanningpj@apache.org> | 2018-07-14 15:49:49 +0000 |
| commit | 1aa5124c7f03b56750429f992e8667b86086501b (patch) | |
| tree | bf645421fb1f1e42d8d26c5d75a7a7b84f2262e9 | |
| parent | b31f1fd159f069e748fb0bddba41251039bbc433 (diff) | |
| download | poi-1aa5124c7f03b56750429f992e8667b86086501b.tar.gz poi-1aa5124c7f03b56750429f992e8667b86086501b.zip | |
upgrade commons-collections4 to 4.2
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1835913 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | build.xml | 5 | ||||
| -rw-r--r-- | maven/poi.pom | 2 | ||||
| -rw-r--r-- | sonar/main/pom.xml | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/.classpath b/.classpath index e312554be1..8bb77501a5 100644 --- a/.classpath +++ b/.classpath @@ -33,7 +33,7 @@ <classpathentry exported="true" kind="lib" path="compile-lib/xmlsec-2.1.0.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.11.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/> - <classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.1.jar"/> + <classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.2.jar"/> <classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/> <classpathentry kind="lib" path="lib/xmlunit-core-2.5.1.jar"/> <classpathentry kind="lib" path="lib/mockito-core-2.13.0.jar"/> diff --git a/build.gradle b/build.gradle index 1be2664337..bf5e8aefcc 100644 --- a/build.gradle +++ b/build.gradle @@ -173,7 +173,7 @@ project('main') { dependencies { compile 'commons-codec:commons-codec:1.11' compile 'commons-logging:commons-logging:1.2' - compile 'org.apache.commons:commons-collections4:4.1' + compile 'org.apache.commons:commons-collections4:4.2' compile 'org.apache.commons:commons-math3:3.6.1' testCompile 'junit:junit:4.12' @@ -217,7 +217,7 @@ project('ooxml') { dependencies { compile 'org.apache.xmlbeans:xmlbeans:3.0.0' - compile 'org.apache.commons:commons-collections4:4.1' + compile 'org.apache.commons:commons-collections4:4.2' compile 'org.apache.commons:commons-math3:3.6.1' compile 'org.apache.commons:commons-compress:1.17' compile 'org.apache.santuario:xmlsec:2.1.0' @@ -178,9 +178,9 @@ under the License. <property name="main.ant.url" value="${repository.m2}/maven2/org/apache/ant/ant/1.10.1/ant-1.10.1.jar"/> <property name="main.antlauncher.jar" location="${main.lib}/ant-launcher-1.10.1.jar"/> <property name="main.antlauncher.url" value="${repository.m2}/maven2/org/apache/ant/ant-launcher/1.10.1/ant-launcher-1.10.1.jar"/> - <property name="main.commons-collections4.jar" location="${main.lib}/commons-collections4-4.1.jar"/> + <property name="main.commons-collections4.jar" location="${main.lib}/commons-collections4-4.2.jar"/> <property name="main.commons-collections4.url" - value="${repository.m2}/maven2/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar"/> + value="${repository.m2}/maven2/org/apache/commons/commons-collections4/4.2/commons-collections4-4.2.jar"/> <property name="main.commons-math3.jar" location="${main.lib}/commons-math3-3.6.1.jar"/> <property name="main.commons-math3.url" value="${repository.m2}/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar"/> @@ -588,6 +588,7 @@ under the License. <include name="commons-codec-1.9*"/> <include name="commons-codec-1.10*"/> <include name="commons-compress-1.16*"/> + <include name="commons-collections4-4.1*"/> <include name="commons-logging-1.1*.jar"/> <include name="findbugs-noUpdateChecks-2.0.3*"/> <include name="jacoco-0.6*"/> diff --git a/maven/poi.pom b/maven/poi.pom index efd24cfe0b..da2268759a 100644 --- a/maven/poi.pom +++ b/maven/poi.pom @@ -94,7 +94,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.1</version> + <version>4.2</version> </dependency> </dependencies> diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml index b269520289..21a8abda0a 100644 --- a/sonar/main/pom.xml +++ b/sonar/main/pom.xml @@ -113,7 +113,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.1</version> + <version>4.2</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> |