Merge pull request #186 from gretty-gradle-plugin/feature/jetty11

Support Jetty 11
gretty-gradle-plugin · Nov 16, 2020 · d356edb · d356edb
2 parents ecb6746 + 18a14f8
commit d356edb
Show file tree

Hide file tree

Showing 28 changed files with 1,125 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,11 +2,11 @@ language: groovy
 matrix:
   include:
   - jdk: openjdk11
-    env: TEST_ALL_CONTAINERS="['tomcat10']" GRADLE_VERSION="5.6.4"
+    env: TEST_ALL_CONTAINERS="['tomcat10','jetty11']" GRADLE_VERSION="5.6.4"
   - jdk: openjdk15
-    env: TEST_ALL_CONTAINERS="['tomcat10']" GRADLE_VERSION="6.6.1"
+    env: TEST_ALL_CONTAINERS="['tomcat10','jetty11']" GRADLE_VERSION="6.6.1"
   - jdk: openjdk11
-    env: TEST_ALL_CONTAINERS="['tomcat10']" GRADLE_VERSION="6.6.1"
+    env: TEST_ALL_CONTAINERS="['tomcat10','jetty11']" GRADLE_VERSION="6.6.1"
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 cache:

diff --git a/gradle.properties b/gradle.properties
@@ -7,8 +7,8 @@ developerName = Andrey Hihlovskiy
 license = MIT
 group = org.gretty
 version = 4.0.0-SNAPSHOT
-jetty10_version = 10.0.0.alpha2
-jetty10_servlet_api_version = 5.0.0-M1
+jetty11_version = 11.0.0.beta3
+jetty11_servlet_api_version = 5.0.0
 tomcat10_version = 10.0.0-M9
 tomcat10_servlet_api_version = 5.0.0-M1
 asm_version = 9.0

diff --git a/integrationTests/settings.gradle b/integrationTests/settings.gradle
@@ -6,16 +6,15 @@ include 'helloGrettySecure'
 include 'helloGrettyOverlay'
 include 'helloJersey'
 include 'extraResourceBases'
-include 'filterWebApp'
+include 'filterWebapp'
 include 'testAnnotations'
 include 'testAnnotationsOverlay'
 include 'testDependency'
 include 'testDuplicatingResources'
 include 'testInitParameter'
-// FIXME Jetty 10 servlet container is not implemented yet (#162)
-// include 'testJettyContextConfig'
-// include 'testJettyRandomPorts'
-// include 'testJettyServerConfig'
+include 'testJettyContextConfig'
+include 'testJettyRandomPorts'
+include 'testJettyServerConfig'
 include 'testTomcatContextConfig'
 include 'testTomcatRandomPorts'
 include 'testTomcatServerConfig'

diff --git a/integrationTests/testJettyContextConfig/build.gradle b/integrationTests/testJettyContextConfig/build.gradle
@@ -10,5 +10,4 @@ dependencies {
 }
 
 defineIntegrationTest()
-// FIXME (#162)
-// testAll.dependsOn defineIntegrationTestAllContainers(['jetty10'])
+testAll.dependsOn defineIntegrationTestAllContainers(['jetty11'])
diff --git a/integrationTests/testJettyContextConfig/src/main/webapp/WEB-INF/jetty-env.xml b/integrationTests/testJettyContextConfig/src/main/webapp/WEB-INF/jetty-env.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
  <Configure class="org.eclipse.jetty.webapp.WebAppContext">
    <Set name="contextPath">/abc</Set>
 </Configure>
diff --git a/integrationTests/testJettyRandomPorts/build.gradle b/integrationTests/testJettyRandomPorts/build.gradle
@@ -16,5 +16,4 @@ gretty {
 }
 
 defineIntegrationTest()
-// FIXME (#162)
-// testAll.dependsOn defineIntegrationTestAllContainers(['jetty10'])
+testAll.dependsOn defineIntegrationTestAllContainers(['jetty11'])
diff --git a/integrationTests/testJettyRandomPorts/src/main/webapp/WEB-INF/jetty-env.xml b/integrationTests/testJettyRandomPorts/src/main/webapp/WEB-INF/jetty-env.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
  <Configure class="org.eclipse.jetty.webapp.WebAppContext">
    <Set name="contextPath">/abc</Set>
 </Configure>
diff --git a/integrationTests/testJettyServerConfig/build.gradle b/integrationTests/testJettyServerConfig/build.gradle
@@ -10,5 +10,4 @@ dependencies {
 }
 
 defineIntegrationTest()
-// FIXME (#162)
-// testAll.dependsOn defineIntegrationTestAllContainers([''jetty10'])
+testAll.dependsOn defineIntegrationTestAllContainers(['jetty11'])
diff --git a/integrationTests/testJettyServerConfig/jetty/jetty.xml b/integrationTests/testJettyServerConfig/jetty/jetty.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Get name="ThreadPool">
     <Set name="minThreads">10</Set>

diff --git a/libs/gretty-core/build.gradle b/libs/gretty-core/build.gradle
@@ -19,8 +19,8 @@ dependencies {
 tasks.processResources {
   def props = [
     grettyVersion: project.version,
-    jetty10Version: project.jetty10_version,
-    jetty10ServletApiVersion: project.jetty10_servlet_api_version,
+    jetty11Version: project.jetty11_version,
+    jetty11ServletApiVersion: project.jetty11_servlet_api_version,
     tomcat10Version: project.tomcat10_version,
     tomcat10ServletApiVersion: project.tomcat10_servlet_api_version,
     springBootVersion: project.springBootVersion,

diff --git a/libs/gretty-core/src/main/resources/org/akhikhl/gretty/Externalized.properties b/libs/gretty-core/src/main/resources/org/akhikhl/gretty/Externalized.properties
@@ -1,6 +1,6 @@
 grettyVersion=@grettyVersion@
-jetty10Version=@jetty10Version@
-jetty10ServletApiVersion=@jetty10ServletApiVersion@
+jetty11Version=@jetty11Version@
+jetty11ServletApiVersion=@jetty11ServletApiVersion@
 tomcat10Version=@tomcat10Version@
 tomcat10ServletApiVersion=@tomcat10ServletApiVersion@
 springBootVersion=@springBootVersion@

diff --git a/libs/gretty-runner-jetty11/build.gradle b/libs/gretty-runner-jetty11/build.gradle
@@ -0,0 +1,23 @@
+apply from: rootProject.file('common.gradle')
+
+configurations {
+  compile {
+    exclude group: 'org.eclipse.jetty.orbit', module: 'javax.servlet'
+  }
+}
+
+dependencies {
+  compile project(':libs:gretty-runner-jetty')
+  compile "jakarta.servlet:jakarta.servlet-api:$jetty11_servlet_api_version"
+  compile "org.eclipse.jetty:jetty-server:$jetty11_version"
+  compile "org.eclipse.jetty:jetty-servlet:$jetty11_version"
+  compile "org.eclipse.jetty:jetty-webapp:$jetty11_version"
+  compile "org.eclipse.jetty:jetty-security:$jetty11_version"
+  compile "org.eclipse.jetty:apache-jsp:$jetty11_version"
+  compile "org.eclipse.jetty:jetty-annotations:$jetty11_version"
+  compile "org.eclipse.jetty:jetty-plus:$jetty11_version"
+  compile "org.eclipse.jetty.websocket:websocket-jakarta-server:$jetty11_version"
+  compile "org.eclipse.jetty.websocket:websocket-jetty-server:$jetty11_version"
+  compile "org.ow2.asm:asm:$asm_version"
+  compile "org.ow2.asm:asm-commons:$asm_version"
+}