Author: fanningpj
Date: Fri Feb 14 23:00:49 2020
New Revision: 1874036
URL: http://svn.apache.org/viewvc?rev=1874036&view=rev
Log:
commons-compress 1.20
Modified:
poi/trunk/.classpath
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/maven/poi-ooxml.pom
poi/trunk/sonar/ooxml/pom.xml
Modified: poi/trunk/.classpath
URL:
http://svn.apache.org/viewvc/poi/trunk/.classpath?rev=1874036&r1=1874035&r2=1874036&view=diff
==============================================================================
--- poi/trunk/.classpath (original)
+++ poi/trunk/.classpath Fri Feb 14 23:00:49 2020
@@ -40,7 +40,7 @@
<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"/>
- <classpathentry kind="lib" path="lib/commons-compress-1.19.jar"/>
+ <classpathentry kind="lib" path="lib/commons-compress-1.20.jar"/>
<classpathentry kind="lib" path="lib/mockito-core-3.2.4.jar"/>
<classpathentry kind="lib" path="lib/byte-buddy-1.10.1.jar"/>
<classpathentry kind="lib" path="lib/byte-buddy-agent-1.10.1.jar"/>
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1874036&r1=1874035&r2=1874036&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Fri Feb 14 23:00:49 2020
@@ -92,9 +92,12 @@ subprojects {
version = '4.1.3-SNAPSHOT'
ext {
- commonsCompressVersion = '1.19'
+ commonsCodecVersion = '1.13'
+ commonsCompressVersion = '1.20'
+ commonsMathVersion = '3.6.1'
japicmpversion = '4.1.2'
junitVersion = '4.13'
+ mockitoVersion = '3.2.4'
xmlbeansVersion = '3.1.0'
}
@@ -180,10 +183,10 @@ project('main') {
sourceSets.test.java.srcDirs = ['../../src/testcases']
dependencies {
- implementation 'commons-codec:commons-codec:1.13'
+ implementation "commons-codec:commons-codec:${commonsCodecVersion}"
implementation 'commons-logging:commons-logging:1.2'
implementation 'org.apache.commons:commons-collections4:4.4'
- implementation 'org.apache.commons:commons-math3:3.6.1'
+ implementation "org.apache.commons:commons-math3:${commonsMathVersion}"
implementation 'javax.xml.bind:jaxb-api:2.3.1'
implementation 'com.sun.xml.bind:jaxb-impl:2.3.2'
implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1'
@@ -191,7 +194,7 @@ project('main') {
implementation 'com.zaxxer:SparseBitSet:1.2'
testImplementation "junit:junit:${junitVersion}"
- testImplementation 'org.mockito:mockito-core:3.2.4'
+ testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation 'org.reflections:reflections:0.9.11'
}
@@ -235,7 +238,7 @@ project('ooxml') {
dependencies {
implementation "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
implementation 'org.apache.commons:commons-collections4:4.4'
- implementation 'org.apache.commons:commons-math3:3.6.1'
+ implementation "org.apache.commons:commons-math3:${commonsMathVersion}"
implementation
"org.apache.commons:commons-compress:${commonsCompressVersion}"
implementation 'org.apache.santuario:xmlsec:2.1.2'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.62'
@@ -256,7 +259,7 @@ project('ooxml') {
implementation files('../../ooxml-lib/ooxml-security-1.1.jar')
testImplementation "junit:junit:${junitVersion}"
- testImplementation 'org.mockito:mockito-core:3.2.4'
+ testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation 'org.xmlunit:xmlunit-core:2.5.1'
testImplementation 'org.reflections:reflections:0.9.11'
testImplementation project(path: ':main', configuration: 'tests')
@@ -358,13 +361,13 @@ project('scratchpad') {
dependencies {
implementation project(':main')
- implementation 'commons-codec:commons-codec:1.13'
- implementation 'org.apache.commons:commons-math3:3.6.1'
+ implementation "commons-codec:commons-codec:${commonsCodecVersion}"
+ implementation "org.apache.commons:commons-math3:${commonsMathVersion}"
// cyclic-dependency here: implementation project(':ooxml')
testImplementation "junit:junit:${junitVersion}"
- testImplementation 'org.mockito:mockito-core:3.2.4'
+ testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation project(path: ':main', configuration: 'tests')
}
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1874036&r1=1874035&r2=1874036&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Fri Feb 14 23:00:49 2020
@@ -247,9 +247,9 @@ under the License.
<property name="ooxml.xmlbeans.jar"
location="${ooxml.lib}/xmlbeans-3.1.0.jar"/>
<property name="ooxml.xmlbeans.url"
value="https://repository.apache.org/content/repositories/releases/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0.jar"/>
- <property name="ooxml.commons-compress.jar"
location="${main.lib}/commons-compress-1.19.jar"/>
+ <property name="ooxml.commons-compress.jar"
location="${main.lib}/commons-compress-1.20.jar"/>
<property name="ooxml.commons-compress.url"
-
value="${repository.m2}/maven2/org/apache/commons/commons-compress/1.19/commons-compress-1.19.jar"/>
+
value="${repository.m2}/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar"/>
<!-- jars in the ooxml-test-lib directory, see the fetch-ooxml-jars
target-->
<property name="ooxml.test.reflections.jar"
location="${ooxml.test.lib}/reflections.jar"/>
@@ -655,9 +655,7 @@ under the License.
<include name="commons-codec-1.10*"/>
<include name="commons-codec-1.11*"/>
<include name="commons-codec-1.12*"/>
- <include name="commons-compress-1.16*"/>
- <include name="commons-compress-1.17*"/>
- <include name="commons-compress-1.18*"/>
+ <include name="commons-compress-1.1*"/>
<include name="commons-collections4-4.1*"/>
<include name="commons-collections4-4.2*"/>
<include name="commons-collections4-4.3*"/>
Modified: poi/trunk/maven/poi-ooxml.pom
URL:
http://svn.apache.org/viewvc/poi/trunk/maven/poi-ooxml.pom?rev=1874036&r1=1874035&r2=1874036&view=diff
==============================================================================
--- poi/trunk/maven/poi-ooxml.pom (original)
+++ poi/trunk/maven/poi-ooxml.pom Fri Feb 14 23:00:49 2020
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.19</version>
+ <version>1.20</version>
</dependency>
<dependency>
<groupId>com.github.virtuald</groupId>
Modified: poi/trunk/sonar/ooxml/pom.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml/pom.xml?rev=1874036&r1=1874035&r2=1874036&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml/pom.xml (original)
+++ poi/trunk/sonar/ooxml/pom.xml Fri Feb 14 23:00:49 2020
@@ -152,7 +152,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.19</version>
+ <version>1.20</version>
</dependency>
<dependency>
<groupId>com.github.virtuald</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
