diff --git a/.classpath b/.classpath
index 7da16a871d..d773c80c77 100644
--- a/.classpath
+++ b/.classpath
@@ -41,7 +41,7 @@
-
+
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'
diff --git a/build.xml b/build.xml
index b0a440a04f..010d24edc0 100644
--- a/build.xml
+++ b/build.xml
@@ -218,7 +218,7 @@ under the License.
-
+
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