diff options
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | build.gradle | 7 | ||||
| -rw-r--r-- | build.xml | 2 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/.classpath b/.classpath index 7da16a871d..d773c80c77 100644 --- a/.classpath +++ b/.classpath @@ -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"/> diff --git a/build.gradle b/build.gradle index 0c0bc5eda5..b8628215e3 100644 --- a/build.gradle +++ b/build.gradle @@ -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' @@ -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"/> diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1b16c34a71..622ab64a3c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 |