Update gretty to 4 and tomcat to 10

dopplershift · Aug 19, 2024 · 22d97b8 · 22d97b8
1 parent 2f1154a
commit 22d97b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/.github/workflows/tds.yml b/.github/workflows/tds.yml
@@ -8,8 +8,7 @@ jobs:
       matrix:
         java-version: [ 17 ]
         java-vendor: [ 'temurin' ]
-        # test against tomcat 8.5.x and tomcat 9.x
-        servletcontainer: [ 'tomcat85', 'tomcat9' ]
+        servletcontainer: [ 'tomcat10' ]
     steps:
       - uses: actions/checkout@v4
       - name: Build and test with Gradle (${{ matrix.java-vendor }} ${{ matrix.java-version }})

diff --git a/gradle/any/gretty.gradle b/gradle/any/gretty.gradle
@@ -33,10 +33,9 @@ repositories {
 }
 
 // allow servlet container to be configured by setting a system property
-// default to tomcat 8.5.x
 def servletContainerName = System.getProperty('tds.test.gretty.container')
 if (servletContainerName == null || servletContainerName.isEmpty()) {
-  servletContainerName = 'tomcat85'
+  servletContainerName = 'tomcat10'
 }
 
 import org.akhikhl.gretty.AppBeforeIntegrationTestTask
@@ -97,10 +96,3 @@ gretty {
     }
   }
 }
-
-configurations.runtimeClasspath {
-  // When gretty uses tomcat 9, javax.servlet-api gets added to the runtimeClasspath of the projects
-  // to which the plugin is applied. This makes sure we exclude it, which keeps it from getting included
-  // with our war artifacts.
-  exclude group: 'javax.servlet', module: 'javax.servlet-api'
-}
diff --git a/gradle/any/shared-mvn-coords.gradle b/gradle/any/shared-mvn-coords.gradle
@@ -5,7 +5,7 @@ ext {
 
   // plugin version management
   buildPlugins = [:]
-  buildPlugins.gretty = 'org.gretty:gretty:3.0.9'
+  buildPlugins.gretty = 'org.gretty:gretty:4.1.5'
   buildPlugins.shadow = 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
   buildPlugins.sonarqube = 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0'
   buildPlugins.spotless = 'com.diffplug.spotless:spotless-plugin-gradle:4.5.1'