Remove all references to non-jakarta servlet containers from integrat…

…ion tests (#144)
gretty-gradle-plugin · Sep 17, 2020 · 598a07e · 598a07e
1 parent 7c15c5c
commit 598a07e
Show file tree

Hide file tree

Showing 28 changed files with 30 additions and 70 deletions.
diff --git a/...main/groovy/org/akhikhl/gretty/internal/integrationTests/FarmIntegrationTestPlugin.groovy b/...main/groovy/org/akhikhl/gretty/internal/integrationTests/FarmIntegrationTestPlugin.groovy
@@ -30,12 +30,6 @@ class FarmIntegrationTestPlugin extends BasePlugin {
         integrationTestContainers.retainAll(Eval.me(project.testAllContainers))
       }
 
-      // farmSecure tests not working on Jetty 9.3 and 9.4, see https://github.com/gretty-gradle-plugin/gretty/issues/67
-      if (project.path.startsWith(':farmSecure')) {
-        println "Excluding farmSecure tests from Jetty 9.3/9.4, see https://github.com/gretty-gradle-plugin/gretty/issues/67 ."
-        integrationTestContainers -= ['jetty9.3', 'jetty9.4']
-      }
-
       integrationTestContainers.each { container ->
 
         project.farms.farm container, {

diff --git a/...src/main/groovy/org/akhikhl/gretty/internal/integrationTests/IntegrationTestPlugin.groovy b/...src/main/groovy/org/akhikhl/gretty/internal/integrationTests/IntegrationTestPlugin.groovy
@@ -85,27 +85,10 @@ class IntegrationTestPlugin extends BasePlugin {
       if (!integrationTestContainers)
         integrationTestContainers = ServletContainerConfig.getConfigNames().collect() // returns immutable and we want to filter later
 
-      if (JavaVersion.current().isJava9Compatible()) {
-        // excluding jetty7 and jetty8 under JDK9, can no longer compile JSPs to default 1.5 target,
-        // see https://github.com/gretty-gradle-plugin/gretty/issues/15
-        integrationTestContainers -= ['jetty7', 'jetty8']
-      }
-
-      if (JavaVersion.current().isJava10Compatible()) {
-        // excluding jetty9 under JDK10, can no longer compile JSPs to default 1.7 target,
-        integrationTestContainers -= ['jetty9']
-      }
-
       if (project.hasProperty('testAllContainers') && project.testAllContainers) {
         integrationTestContainers.retainAll(Eval.me(project.testAllContainers))
       }
 
-      // farmSecure tests not working on Jetty 9.3 and 9.4, see https://github.com/gretty-gradle-plugin/gretty/issues/67
-      if (project.path.startsWith(':farmSecure')) {
-        println "Excluding farmSecure tests from Jetty 9.3/9.4, see https://github.com/gretty-gradle-plugin/gretty/issues/67 ."
-        integrationTestContainers -= ['jetty9.3', 'jetty9.4']
-      }
-
       integrationTestContainers.each { String container ->
 
         project.task('integrationTest_' + container, type: Test) { thisTask ->

diff --git a/integrationTests/farmSecure/MyWebApp/build.gradle b/integrationTests/farmSecure/MyWebApp/build.gradle
@@ -11,7 +11,6 @@ dependencies {
 gretty {
   httpEnabled = false
   httpsEnabled = true
-  //servletContainer = 'tomcat8'
   realm = 'auth'
   realmConfigFile = '../security'
   singleSignOn = true

diff --git a/integrationTests/gretty-taglib-example/build.gradle b/integrationTests/gretty-taglib-example/build.gradle
@@ -7,7 +7,6 @@ dependencies {
 }
 
 gretty {
-  servletContainer = 'jetty9'
   contextPath = '/'
 }
 

diff --git a/integrationTests/helloGretty/build.gradle b/integrationTests/helloGretty/build.gradle
@@ -10,9 +10,6 @@ dependencies {
 }
 
 gretty {
-  // Possible servletContainer values are 'jetty7', 'jetty8', 'jetty9', 'tomcat85', 'tomcat9'. Default is 'jetty9'.
-  // servletContainer = 'tomcat8'
-  // httpsEnabled = true
   httpIdleTimeout = 424242
 }
 

diff --git a/integrationTests/helloGrettyOverlay/build.gradle b/integrationTests/helloGrettyOverlay/build.gradle
@@ -5,7 +5,6 @@ apply plugin: 'org.gretty.internal.integrationTests.IntegrationTestPlugin'
 gretty {
   contextPath = '/helloGrettyOverlay'
   overlay ':helloGretty'
-  servletContainer = 'jetty7'
 }
 
 defineIntegrationTest()

diff --git a/integrationTests/helloGrettySecure/build.gradle b/integrationTests/helloGrettySecure/build.gradle
@@ -13,8 +13,6 @@ gretty {
   httpEnabled = false
   httpsEnabled = true
   httpsIdleTimeout = 424242
-  // Possible servletContainer values are 'jetty7', 'jetty8', 'jetty9', 'tomcat85', 'tomcat9'. Default is 'jetty9'.
-  servletContainer = 'jetty9'
   realm 'auth'
   // realmConfigFile is optional. When omitted, 'jetty-realm.properties' or 'tomcat-users.xml' is assumed.
   // If path is relative, the file will be searched in projectDir, build/resources/main and src/main/webapp/WEB-INF.

diff --git a/integrationTests/helloJersey/build.gradle b/integrationTests/helloJersey/build.gradle
@@ -6,7 +6,8 @@ dependencies {
   compile "org.glassfish.jersey.containers:jersey-container-servlet-core:$jersey_version"
   compile "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
   compile 'javax.xml.bind:jaxb-api:2.3.1'
-  integrationTestCompile "javax.servlet:servlet-api:$jetty7_servlet_api_version"
+  // FIXME
+  //integrationTestCompile "javax.servlet:servlet-api:$jetty7_servlet_api_version"
 }
 
 war {

diff --git a/integrationTests/settings.gradle b/integrationTests/settings.gradle
@@ -12,9 +12,10 @@ include 'testAnnotationsOverlay'
 include 'testDependency'
 include 'testDuplicatingResources'
 include 'testInitParameter'
-include 'testJettyContextConfig'
-include 'testJettyRandomPorts'
-include 'testJettyServerConfig'
+// FIXME Jetty 10 servlet container is not implemented yet (#162)
+// include 'testJettyContextConfig'
+// include 'testJettyRandomPorts'
+// include 'testJettyServerConfig'
 include 'testTomcatContextConfig'
 include 'testTomcatRandomPorts'
 include 'testTomcatServerConfig'

diff --git a/integrationTests/spring-boot-farm-secure/spring-boot-app/build.gradle b/integrationTests/spring-boot-farm-secure/spring-boot-app/build.gradle
@@ -12,7 +12,6 @@ gretty {
   springBoot = true
   httpEnabled = false
   httpsEnabled = true
-  servletContainer = 'jetty9'
   realm = 'auth'
   realmConfigFile = '../security'
   singleSignOn = true
@@ -26,7 +25,7 @@ farm {
 
 defineIntegrationTest()
 
-testAll.dependsOn defineFarmIntegrationTestAllContainers(['jetty8', 'jetty9', 'tomcat85', 'tomcat9'], {
+testAll.dependsOn defineFarmIntegrationTestAllContainers({
   webapp project
   webapp ':spring-boot-farm-secure:spring-boot-webservice'
   webapp ':spring-boot-farm-secure:jee-webservice'

diff --git a/integrationTests/spring-boot-farm-secure/spring-boot-webservice/build.gradle b/integrationTests/spring-boot-farm-secure/spring-boot-webservice/build.gradle
@@ -14,4 +14,4 @@ gretty {
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['jetty8', 'jetty9', 'tomcat85', 'tomcat9'])
+testAll.dependsOn defineIntegrationTestAllContainers()
diff --git a/integrationTests/spring-boot-farm/spring-boot-app/build.gradle b/integrationTests/spring-boot-farm/spring-boot-app/build.gradle
@@ -14,7 +14,6 @@ gretty {
 
 farm {
   managedClassReload = true
-  servletContainer = 'jetty8'
   httpPort = 8081
   webapp project
   webapp ':spring-boot-farm:spring-boot-webservice1'
@@ -24,7 +23,7 @@ farm {
 
 defineIntegrationTest()
 
-testAll.dependsOn defineFarmIntegrationTestAllContainers(['jetty8', 'jetty9', 'tomcat85', 'tomcat9'], {
+testAll.dependsOn defineFarmIntegrationTestAllContainers({
   webapp project
   webapp ':spring-boot-farm:spring-boot-webservice1'
   webapp ':spring-boot-farm:spring-boot-webservice2'

diff --git a/integrationTests/spring-boot-farm/spring-boot-webservice1/build.gradle b/integrationTests/spring-boot-farm/spring-boot-webservice1/build.gradle
@@ -10,4 +10,4 @@ gretty {
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['jetty8', 'jetty9', 'tomcat85', 'tomcat9'])
+testAll.dependsOn defineIntegrationTestAllContainers()
diff --git a/integrationTests/spring-boot-farm/spring-boot-webservice2/build.gradle b/integrationTests/spring-boot-farm/spring-boot-webservice2/build.gradle
@@ -10,4 +10,4 @@ gretty {
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['jetty8', 'jetty9', 'tomcat85', 'tomcat9'])
+testAll.dependsOn defineIntegrationTestAllContainers()
diff --git a/integrationTests/spring-boot-simple/build.gradle b/integrationTests/spring-boot-simple/build.gradle
@@ -14,4 +14,4 @@ gretty {
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['jetty8', 'jetty9', 'tomcat85', 'tomcat9'])
+testAll.dependsOn defineIntegrationTestAllContainers()
diff --git a/integrationTests/springBootWebSocket/build.gradle b/integrationTests/springBootWebSocket/build.gradle
@@ -8,8 +8,7 @@ dependencies {
 
 gretty {
   springBoot = true
-  servletContainer = 'tomcat9'
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['jetty9', 'tomcat85', 'tomcat9'])
+testAll.dependsOn defineIntegrationTestAllContainers()
diff --git a/integrationTests/testAnnotations/build.gradle b/integrationTests/testAnnotations/build.gradle
@@ -9,4 +9,4 @@ dependencies {
   compile 'org.apache.velocity:velocity:1.7'
 }
 
-testAll.dependsOn defineIntegrationTestAllContainers(['jetty8', 'jetty9', 'tomcat85', 'tomcat9'])
+testAll.dependsOn defineIntegrationTestAllContainers()
diff --git a/integrationTests/testAnnotationsOverlay/build.gradle b/integrationTests/testAnnotationsOverlay/build.gradle
@@ -6,6 +6,4 @@ gretty {
   overlay ':testAnnotations'
 }
 
-// annotations are not supported in jetty7
-
-testAll.dependsOn defineIntegrationTestAllContainers(['jetty8', 'jetty9', 'tomcat85', 'tomcat9'])
+testAll.dependsOn defineIntegrationTestAllContainers()
diff --git a/integrationTests/testDuplicatingResources/build.gradle b/integrationTests/testDuplicatingResources/build.gradle
@@ -6,12 +6,7 @@ dependencies {
 	compile 'io.reactivex:rxjava:1.1.5'
 }
 
-ext {
-	integrationTestContainers = ['tomcat85', 'tomcat9']
-}
-
 gretty {
-	servletContainer = 'tomcat9'
 	contextPath = '/bug'
 }
 

diff --git a/integrationTests/testJettyContextConfig/build.gradle b/integrationTests/testJettyContextConfig/build.gradle
@@ -10,4 +10,5 @@ dependencies {
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['jetty7', 'jetty8', 'jetty9'])
+// FIXME (#162)
+// testAll.dependsOn defineIntegrationTestAllContainers(['jetty10'])
diff --git a/integrationTests/testJettyRandomPorts/build.gradle b/integrationTests/testJettyRandomPorts/build.gradle
@@ -16,4 +16,5 @@ gretty {
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['jetty7', 'jetty8', 'jetty9'])
+// FIXME (#162)
+// testAll.dependsOn defineIntegrationTestAllContainers(['jetty10'])
diff --git a/integrationTests/testJettyServerConfig/build.gradle b/integrationTests/testJettyServerConfig/build.gradle
@@ -10,4 +10,5 @@ dependencies {
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['jetty7', 'jetty8', 'jetty9'])
+// FIXME (#162)
+// testAll.dependsOn defineIntegrationTestAllContainers([''jetty10'])
diff --git a/integrationTests/testTomcatContextConfig/build.gradle b/integrationTests/testTomcatContextConfig/build.gradle
@@ -10,8 +10,8 @@ dependencies {
 }
 
 gretty {
-  servletContainer = 'tomcat9'
+  servletContainer = 'tomcat10'
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['tomcat85', 'tomcat9'])
+testAll.dependsOn defineIntegrationTestAllContainers(['tomcat10'])
diff --git a/integrationTests/testTomcatRandomPorts/build.gradle b/integrationTests/testTomcatRandomPorts/build.gradle
@@ -10,11 +10,11 @@ dependencies {
 }
 
 gretty {
-  servletContainer = 'tomcat85'
+  servletContainer = 'tomcat10'
   httpPort = getRandomFreePort()
   httpsPort = getRandomFreePort()
   httpsEnabled = true
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['tomcat85', 'tomcat9'])
+testAll.dependsOn defineIntegrationTestAllContainers(['tomcat10'])
diff --git a/integrationTests/testTomcatServerConfig/build.gradle b/integrationTests/testTomcatServerConfig/build.gradle
@@ -10,9 +10,9 @@ dependencies {
 }
 
 gretty {
-  servletContainer = 'tomcat9'
+  servletContainer = 'tomcat10'
   // httpsEnabled = true
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['tomcat85', 'tomcat9'])
+testAll.dependsOn defineIntegrationTestAllContainers(['tomcat10'])
diff --git a/integrationTests/webfragment/build.gradle b/integrationTests/webfragment/build.gradle
@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-  compile 'javax.servlet:javax.servlet-api:3.0.1'
+  compile "jakarta.servlet:jakarta.servlet-api:$tomcat10_servlet_api_version"
   compile 'org.webjars:bootstrap:3.2.0'
   compile 'org.webjars:jquery:2.1.1'
   // We use Velocity for example of template processing within the webapp.

diff --git a/integrationTests/webhost/build.gradle b/integrationTests/webhost/build.gradle
@@ -7,4 +7,4 @@ dependencies {
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['jetty8', 'jetty9', 'tomcat85', 'tomcat9'])
+testAll.dependsOn defineIntegrationTestAllContainers()
diff --git a/integrationTests/websocket/build.gradle b/integrationTests/websocket/build.gradle
@@ -2,14 +2,10 @@ apply plugin: 'war'
 apply plugin: 'org.gretty'
 apply plugin: 'org.gretty.internal.integrationTests.IntegrationTestPlugin'
 
-gretty {
-  servletContainer = 'jetty9'
-}
-
 dependencies {
   compile 'org.webjars:jquery:2.1.1'
   compile 'org.webjars:sockjs-client:0.3.4-1'
 }
 
 defineIntegrationTest()
-testAll.dependsOn defineIntegrationTestAllContainers(['jetty9', 'tomcat85', 'tomcat9'])
+testAll.dependsOn defineIntegrationTestAllContainers()
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ dependencies { @@
     }
     gretty {
-      servletContainer = 'jetty9'
       contextPath = '/'
     }
@@ Expand Down @@