diff options
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | build.xml | 9 | ||||
| -rw-r--r-- | maven/poi.pom | 2 | ||||
| -rw-r--r-- | sonar/main/pom.xml | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/.classpath b/.classpath index e486e2df9d..a93222b2ea 100644 --- a/.classpath +++ b/.classpath @@ -36,7 +36,7 @@ <classpathentry exported="true" kind="lib" path="compile-lib/xmlsec-2.1.2.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.13.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/> - <classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.3.jar"/> + <classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.4.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/objenesis-2.6.jar"/> diff --git a/build.gradle b/build.gradle index dd5c360b2f..430f948b5e 100644 --- a/build.gradle +++ b/build.gradle @@ -180,7 +180,7 @@ project('main') { dependencies { compile 'commons-codec:commons-codec:1.13' compile 'commons-logging:commons-logging:1.2' - compile 'org.apache.commons:commons-collections4:4.3' + compile 'org.apache.commons:commons-collections4:4.4' compile 'org.apache.commons:commons-math3:3.6.1' compile 'javax.xml.bind:jaxb-api:2.3.1' compile 'com.sun.xml.bind:jaxb-impl:2.3.2' @@ -231,7 +231,7 @@ project('ooxml') { dependencies { compile 'org.apache.xmlbeans:xmlbeans:3.1.0' - compile 'org.apache.commons:commons-collections4:4.3' + compile 'org.apache.commons:commons-collections4:4.4' compile 'org.apache.commons:commons-math3:3.6.1' compile 'org.apache.commons:commons-compress:1.18' compile 'org.apache.santuario:xmlsec:2.1.2' @@ -200,9 +200,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.3.jar"/> + <property name="main.commons-collections4.jar" location="${main.lib}/commons-collections4-4.4.jar"/> <property name="main.commons-collections4.url" - value="${repository.m2}/maven2/org/apache/commons/commons-collections4/4.3/commons-collections4-4.3.jar"/> + value="${repository.m2}/maven2/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4.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"/> @@ -654,6 +654,7 @@ under the License. <include name="commons-compress-1.17*"/> <include name="commons-collections4-4.1*"/> <include name="commons-collections4-4.2*"/> + <include name="commons-collections4-4.3*"/> <include name="commons-logging-1.1*.jar"/> <include name="findbugs-noUpdateChecks-2.0.3*"/> <include name="jacoco-0.6*"/> @@ -681,8 +682,8 @@ under the License. <include name="mockito-core-2*.jar"/> <include name="byte-buddy-*1.7*.jar"/> <include name="byte-buddy-*1.9*.jar"/> - <include name="lib/jaxb-api-2.3.0.jar"/> - <include name="lib/jaxb-impl-2.3.0.1.jar"/> + <include name="jaxb-api-2.3.0.jar"/> + <include name="jaxb-impl-2.3.0.1.jar"/> </fileset> <fileset dir="${ooxml.lib}"> <!-- remove jars from previous versions, but not the current version --> diff --git a/maven/poi.pom b/maven/poi.pom index f53e22cb37..d0cdf9baf5 100644 --- a/maven/poi.pom +++ b/maven/poi.pom @@ -81,7 +81,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.3</version> + <version>4.4</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml index 0e368f00f4..464149bec1 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.3</version> + <version>4.4</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> |