Force use of jakarta servlet api version 6.0.0 in tests for spring mo…

…cks to work
dopplershift · Aug 19, 2024 · 5612371 · 5612371
1 parent c8c1fc2
commit 5612371
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/gradle/any/shared-mvn-coords.gradle b/gradle/any/shared-mvn-coords.gradle
@@ -27,6 +27,8 @@ ext {
   // gradle seems to have issues with the compileOnly configuration, so we need to provide the full maven
   // coordinates for jakarta.servlet-api if the gradle plugin in applied. If we don't, we see errors like this:
   depVersion.jakartaServletApi = '5.0.0'
+  // Spring 6.x servlet mocks require servlet 6 though it can test 5 code
+  depVersion.testJakartaServletApi = '6.0.0'
   depVersion.hibernateValidator = '7.0.0.Final'
   // TODO: figure out way to keep this version in sync with netcdf-java version
   // It is included in the netcdf-java-bom (via netcdf-java-platform), but we can't

diff --git a/tds/build.gradle b/tds/build.gradle
@@ -124,6 +124,12 @@ configurations.testRuntimeOnly {
   exclude group: 'org.apache.logging.log4j'
 }
 
+configurations.testRuntimeClasspath {
+  resolutionStrategy {
+    force "jakarta.servlet:jakarta.servlet-api:${depVersion.testJakartaServletApi}"
+  }
+}
+
 task copyWebappFilesForTests(type: Copy) {
   // Tests expect for certain webapp files to be accessible from the classpath (e.g. WEB-INF/applicationContext.xml).
   from 'src/main/webapp'