You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2020/09/25 19:39:50 UTC
svn commit: r1882026 - in /poi/trunk: build.gradle build.xml
sonar/excelant/pom.xml sonar/integration-test/pom.xml sonar/ooxml/pom.xml
sonar/pom.xml
Author: centic
Date: Fri Sep 25 19:39:49 2020
New Revision: 1882026
URL: http://svn.apache.org/viewvc?rev=1882026&view=rev
Log:
Update third party libraries in pom.xml and build.gradle, update JaCoCo to 0.8.6
Maven build should work onw, but Gradle is still broken by the poi-ant-contrib library
Also remove outdated third party libraries
Modified:
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/sonar/excelant/pom.xml
poi/trunk/sonar/integration-test/pom.xml
poi/trunk/sonar/ooxml/pom.xml
poi/trunk/sonar/pom.xml
Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1882026&r1=1882025&r2=1882026&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Fri Sep 25 19:39:49 2020
@@ -45,8 +45,8 @@ configurations {
dependencies {
antLibs("junit:junit:4.13")
- antLibs("org.apache.ant:ant-junit:1.10.4")
- antLibs("org.apache.ant:ant-junit4:1.10.4")
+ antLibs("org.apache.ant:ant-junit:1.10.8")
+ antLibs("org.apache.ant:ant-junit4:1.10.8")
}
ant.taskdef(name: "junit",
@@ -152,7 +152,7 @@ subprojects {
}
jacoco {
- toolVersion = '0.8.5'
+ toolVersion = '0.8.6'
}
// ensure the build-dir exists
@@ -301,7 +301,7 @@ project('excelant') {
sourceSets.test.java.srcDirs = ['../../src/excelant/testcases']
dependencies {
- compile 'org.apache.ant:ant:1.10.4'
+ compile 'org.apache.ant:ant:1.10.8'
compile project(':main')
compile project(':ooxml')
@@ -323,7 +323,7 @@ project('integrationtest') {
sourceSets.test.java.srcDirs = ['../../src/integrationtest']
dependencies {
- compile 'org.apache.ant:ant:1.10.4'
+ compile 'org.apache.ant:ant:1.10.8'
compile project(':main')
compile project(':ooxml')
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1882026&r1=1882025&r2=1882026&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Fri Sep 25 19:39:49 2020
@@ -311,7 +311,7 @@ under the License.
<dependency prefix="ooxml.test.javassist" artifact="org.javassist:javassist:3.27.0-GA" usage="ooxml-tests"/>
<!-- coverage libs -->
- <dependency prefix="jacoco" artifact="org.jacoco:jacoco:0.8.5" usage="util" packaging="zip"/>
+ <dependency prefix="jacoco" artifact="org.jacoco:jacoco:0.8.6" usage="util" packaging="zip"/>
<dependency prefix="asm" artifact="org.ow2.asm:asm:9.0-beta" usage="util"/>
<dependency prefix="asm-commons" artifact="org.ow2.asm:asm-commons:9.0-beta" usage="util"/>
<dependency prefix="asm-tree" artifact="org.ow2.asm:asm-tree:9.0-beta" usage="util"/>
@@ -592,9 +592,34 @@ under the License.
<delete dir="compile-lib" failonerror="false"/>
<delete dir="ooxml-lib" failonerror="false"/>
<delete dir="ooxml-testlib" failonerror="false"/>
- <delete dir="${basedir}/lib" includes="*.jar" failonerror="false"/>
- <delete failonerror="false">
- <fileset dir="lib/main-tests" includes="hamcrest-core*"/>
+ <delete verbose="true" failonerror="false">
+ <fileset dir="${basedir}/lib" includes="*.jar"/>
+ <fileset dir="${basedir}/lib/excelant">
+ <include name="ant*-1.10.1.jar"/>
+ </fileset>
+ <fileset dir="${basedir}/lib/main-tests">
+ <include name="mockito-core-3.2.4.jar"/>
+ <include name="hamcrest-core*"/>
+ </fileset>
+ <fileset dir="${basedir}/lib/ooxml">
+ <include name="xmlbeans-3.1.0.jar"/>
+ </fileset>
+ <fileset dir="${basedir}/lib/ooxml-provided">
+ <include name="bcpkix-jdk15on-1.65.jar"/>
+ <include name="bcprov-ext-jdk15on-1.65.jar"/>
+ </fileset>
+ <fileset dir="${basedir}/lib/ooxml-tests">
+ <include name="guava-20.0.jar"/>
+ </fileset>
+ <fileset dir="${basedir}/lib/util">
+ <include name="asm*7.2.jar"/>
+ </fileset>
+ <fileset dir="${basedir}/lib/util">
+ <include name="jacoco-0.8.5.zip"/>
+ </fileset>
+ <fileset dir="${basedir}/lib/excelant">
+ <include name="ant*1.10.1.jar"/>
+ </fileset>
</delete>
<condition property="jars.present">
Modified: poi/trunk/sonar/excelant/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/excelant/pom.xml?rev=1882026&r1=1882025&r2=1882026&view=diff
==============================================================================
--- poi/trunk/sonar/excelant/pom.xml (original)
+++ poi/trunk/sonar/excelant/pom.xml Fri Sep 25 19:39:49 2020
@@ -29,12 +29,12 @@
</goals>
<configuration>
<outputDirectory>${basedir}/src/main/java</outputDirectory>
- <resources>
+ <resources>
<resource>
<directory>../../src/excelant/java</directory>
</resource>
- </resources>
- </configuration>
+ </resources>
+ </configuration>
</execution>
<execution>
<id>copy-resources</id>
@@ -45,12 +45,12 @@
</goals>
<configuration>
<outputDirectory>${basedir}/src/main/resources</outputDirectory>
- <resources>
+ <resources>
<resource>
<directory>../../src/excelant/resources</directory>
</resource>
- </resources>
- </configuration>
+ </resources>
+ </configuration>
</execution>
<execution>
<id>copy-tests</id>
@@ -61,12 +61,12 @@
</goals>
<configuration>
<outputDirectory>${basedir}/src/test/java</outputDirectory>
- <resources>
+ <resources>
<resource>
<directory>../../src/excelant/testcases</directory>
</resource>
- </resources>
- </configuration>
+ </resources>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -82,7 +82,7 @@
</fileset>
</filesets>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.1</version>
+ <version>1.10.8</version>
</dependency>
</dependencies>
</project>
Modified: poi/trunk/sonar/integration-test/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/integration-test/pom.xml?rev=1882026&r1=1882025&r2=1882026&view=diff
==============================================================================
--- poi/trunk/sonar/integration-test/pom.xml (original)
+++ poi/trunk/sonar/integration-test/pom.xml Fri Sep 25 19:39:49 2020
@@ -96,20 +96,20 @@
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
- <version>0.9.11</version>
+ <version>0.9.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>1.19</version>
+ <version>1.25</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.7</version>
+ <version>1.10.8</version>
<scope>test</scope>
</dependency>
Modified: poi/trunk/sonar/ooxml/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml/pom.xml?rev=1882026&r1=1882025&r2=1882026&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml/pom.xml (original)
+++ poi/trunk/sonar/ooxml/pom.xml Fri Sep 25 19:39:49 2020
@@ -137,17 +137,17 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.65</version>
+ <version>1.66</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.65</version>
+ <version>1.66</version>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
- <version>2.1.5</version>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -169,20 +169,20 @@
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
- <version>0.9.11</version>
+ <version>0.9.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>1.19</version>
+ <version>1.25</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
- <version>1.19</version>
+ <version>1.25</version>
<scope>test</scope>
</dependency>
@@ -190,7 +190,7 @@
<!-- don't add it to the distribution -->
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-all</artifactId>
- <version>1.11</version>
+ <version>1.13</version>
</dependency>
</dependencies>
</project>
Modified: poi/trunk/sonar/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/pom.xml?rev=1882026&r1=1882025&r2=1882026&view=diff
==============================================================================
--- poi/trunk/sonar/pom.xml (original)
+++ poi/trunk/sonar/pom.xml Fri Sep 25 19:39:49 2020
@@ -81,10 +81,10 @@
<sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<!-- define some of the third-party or plugin-versions globally to use the same in all modules -->
- <xmlbeans.version>3.1.0</xmlbeans.version>
+ <xmlbeans.version>4.0.0</xmlbeans.version>
<junit.version>4.13</junit.version>
- <xmlunit.version>2.6.3</xmlunit.version>
- <mockito.version>2.13.0</mockito.version>
+ <xmlunit.version>2.7.0</xmlunit.version>
+ <mockito.version>3.5.0</mockito.version>
<maven.plugin.resources.version>3.1.0</maven.plugin.resources.version>
<maven.plugin.jar.version>3.2.0</maven.plugin.jar.version>
<maven.plugin.clean.version>3.1.0</maven.plugin.clean.version>
@@ -145,7 +145,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.5</version>
+ <version>0.8.6</version>
<executions>
<execution>
<goals>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org