Author: fanningpj
Date: Sat Jun 6 10:02:21 2020
New Revision: 1878542
URL: http://svn.apache.org/viewvc?rev=1878542&view=rev
Log:
upgrade and mockito
Modified:
poi/trunk/.classpath
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/gradle/wrapper/gradle-wrapper.properties
Modified: poi/trunk/.classpath
URL:
http://svn.apache.org/viewvc/poi/trunk/.classpath?rev=1878542&r1=1878541&r2=1878542&view=diff
==============================================================================
--- poi/trunk/.classpath (original)
+++ poi/trunk/.classpath Sat Jun 6 10:02:21 2020
@@ -41,7 +41,7 @@
<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.20.jar"/>
- <classpathentry kind="lib" path="lib/mockito-core-3.2.4.jar"/>
+ <classpathentry kind="lib" path="lib/mockito-core-3.3.3.jar"/>
<classpathentry kind="lib" path="lib/byte-buddy-1.10.1.jar"/>
<classpathentry kind="lib" path="lib/byte-buddy-agent-1.10.1.jar"/>
<classpathentry kind="lib" path="compile-lib/batik-all-1.12.jar"/>
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1878542&r1=1878541&r2=1878542&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Sat Jun 6 10:02:21 2020
@@ -54,7 +54,7 @@ ant.taskdef(name: "junit",
classpath: configurations.antLibs.asPath)
wrapper {
- gradleVersion = '6.1.1'
+ gradleVersion = '6.5'
}
task adjustWrapperPropertiesFile {
@@ -98,7 +98,7 @@ subprojects {
commonsMathVersion = '3.6.1'
japicmpversion = '4.1.2'
junitVersion = '4.13'
- mockitoVersion = '3.2.4'
+ mockitoVersion = '3.3.3'
xmlbeansVersion = '3.1.0'
}
@@ -188,9 +188,6 @@ project('main') {
compile 'commons-logging:commons-logging:1.2'
compile 'org.apache.commons:commons-collections4:4.4'
compile "org.apache.commons:commons-math3:${commonsMathVersion}"
- compile 'javax.xml.bind:jaxb-api:2.3.1'
- compile 'com.sun.xml.bind:jaxb-impl:2.3.2'
- compile 'com.sun.xml.bind:jaxb-core:2.3.0.1'
compile 'javax.activation:activation:1.1.1'
compile 'com.zaxxer:SparseBitSet:1.2'
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1878542&r1=1878541&r2=1878542&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sat Jun 6 10:02:21 2020
@@ -218,7 +218,7 @@ under the License.
<dependency prefix="main.jmhAnnotation"
artifact="org.openjdk.jmh:jmh-generator-annprocess:1.19" usage="main-tests"/>
<dependency prefix="main.hamcrest"
artifact="org.hamcrest:hamcrest-core:1.3" usage="main-tests"/>
<dependency prefix="main.xmlunit"
artifact="org.xmlunit:xmlunit-core:2.5.1" usage="main-tests"/>
- <dependency prefix="main.mockito"
artifact="org.mockito:mockito-core:3.2.4" usage="main-tests"/>
+ <dependency prefix="main.mockito"
artifact="org.mockito:mockito-core:3.3.3" usage="main-tests"/>
<dependency prefix="main.byte-buddy"
artifact="net.bytebuddy:byte-buddy:1.10.1" usage="main-tests"/>
<dependency prefix="main.byte-buddy-agent"
artifact="net.bytebuddy:byte-buddy-agent:1.10.1" usage="main-tests"/>
<dependency prefix="main.objenesis" artifact="org.objenesis:objenesis:2.6"
usage="main-tests"/>
Modified: poi/trunk/gradle/wrapper/gradle-wrapper.properties
URL:
http://svn.apache.org/viewvc/poi/trunk/gradle/wrapper/gradle-wrapper.properties?rev=1878542&r1=1878541&r2=1878542&view=diff
==============================================================================
--- poi/trunk/gradle/wrapper/gradle-wrapper.properties (original)
+++ poi/trunk/gradle/wrapper/gradle-wrapper.properties Sat Jun 6 10:02:21 2020
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
