commit a8c041dd580ff37f3e32b0eaafed542f496d5d58
author iadcode <omcode@integradev.com.au> Tue Mar 02 14:15:13 2021 +1100
committer Jens Geyer <jensg@apache.org> Tue Mar 02 20:14:53 2021 +0100
tree cdc55651fd859c00a0683cce1bf462f4a348176b
parent 55c3e4c2eff86b61eae1b098803e72d682bdaafb

Move java dependency tomcat-embed to the crossTest configuration to remove outdated unnecessary compile time dependency.

This closes #2340

For the java libthrift, tomcat-embedded is only used in crossTests, I have moved it to crossTest configuration so the libthrift java package does not require this unnecessary dependency for compilation. Instead, the java-servlet dependency has been reintroduced in compile time. I've also taken this opportunity to update both dependenciesto a later version.

lib/java/gradle.properties

diff --git a/lib/java/gradle.properties b/lib/java/gradle.properties
index b87bdc7..7208807 100644
--- a/lib/java/gradle.properties
+++ b/lib/java/gradle.properties
@@ -28,9 +28,8 @@
 httpclient.version=4.5.10
 httpcore.version=4.4.12
 slf4j.version=1.7.28
-#servlet.version=2.5
-#It contains servlet3
-tomcat.embed.version=8.5.46
+servlet.version=4.0.1
+tomcat.embed.version=9.0.43
 junit.version=4.12
 mockito.version=1.10.19
 javax.annotation.version=1.3.2

lib/java/gradle/environment.gradle

diff --git a/lib/java/gradle/environment.gradle b/lib/java/gradle/environment.gradle
index 965a908..b6cfb21 100644
--- a/lib/java/gradle/environment.gradle
+++ b/lib/java/gradle/environment.gradle
@@ -44,7 +44,7 @@
 // Versions used in this project
 ext.httpclientVersion = property('httpclient.version')
 ext.httpcoreVersion = property('httpcore.version')
-//ext.servletVersion = property('servlet.version')
+ext.servletVersion = property('servlet.version')
 ext.tomcatEmbedVersion = property('tomcat.embed.version')
 ext.slf4jVersion = property('slf4j.version')
 ext.junitVersion = property('junit.version')
@@ -67,8 +67,7 @@
     compile "org.slf4j:slf4j-api:${slf4jVersion}"
     compile "org.apache.httpcomponents:httpclient:${httpclientVersion}"
     compile "org.apache.httpcomponents:httpcore:${httpcoreVersion}"
-    //compile "javax.servlet:servlet-api:${servletVersion}"
-    compile "org.apache.tomcat.embed:tomcat-embed-core:${tomcatEmbedVersion}"
+    compile "javax.servlet:javax.servlet-api:${servletVersion}"
     compile "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}"
 
     testCompile "junit:junit:${junitVersion}"

lib/java/gradle/functionalTests.gradle

diff --git a/lib/java/gradle/functionalTests.gradle b/lib/java/gradle/functionalTests.gradle
index 6a388a6..f00f74b 100644
--- a/lib/java/gradle/functionalTests.gradle
+++ b/lib/java/gradle/functionalTests.gradle
@@ -45,6 +45,7 @@
 }
 
 dependencies {
+    crossTestCompile "org.apache.tomcat.embed:tomcat-embed-core:${tomcatEmbedVersion}"
     crossTestCompile sourceSets.main.output
     crossTestCompile sourceSets.test.output
 }

lib/java/gradle/publishing.gradle

diff --git a/lib/java/gradle/publishing.gradle b/lib/java/gradle/publishing.gradle
index 481fcbc..7be7de4 100644
--- a/lib/java/gradle/publishing.gradle
+++ b/lib/java/gradle/publishing.gradle
@@ -85,7 +85,7 @@
 
     pom.whenConfigured {
         // Fixup the scope for servlet-api to be 'provided' instead of 'compile'
-        dependencies.find { dep -> dep.groupId == 'javax.servlet' && dep.artifactId == 'servlet-api' }.with {
+        dependencies.find { dep -> dep.groupId == 'javax.servlet' && dep.artifactId == 'javax.servlet-api' }.with {
             if(it != null) {
               // it.optional = true
               it.scope = 'provided'