diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 579d9d19..bf7e23c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,6 +66,13 @@ jobs: gradle: '8.14.2' toolchainJavaVersion: 21 + - java: 17 + gradle: '9.0.0-rc-1' + + - java: 17 + gradle: '9.0.0-rc-1' + toolchainJavaVersion: 21 + env: TEST_ALL_CONTAINERS: ${{ matrix.container }} GRADLE_VERSION: ${{ matrix.gradle }} @@ -97,7 +104,7 @@ jobs: --warning-mode all \ -PprivateRepoDir=$PRIVATE_REPO \ publishToPrivateRepo - if: "startsWith(env.GRADLE_VERSION, '8.')" + if: ${{ ! startsWith(env.GRADLE_VERSION, '7.') }} working-directory: integrationTests/buildSrc # end workaround diff --git a/libs/gretty/src/main/groovy/org/akhikhl/gretty/ServletContainerConfig.groovy b/libs/gretty/src/main/groovy/org/akhikhl/gretty/ServletContainerConfig.groovy index 2dce5fc1..811722bc 100644 --- a/libs/gretty/src/main/groovy/org/akhikhl/gretty/ServletContainerConfig.groovy +++ b/libs/gretty/src/main/groovy/org/akhikhl/gretty/ServletContainerConfig.groovy @@ -32,7 +32,7 @@ class ServletContainerConfig { boolean alteredDependencies = false File webXmlFile = new File(ProjectUtils.getWebAppDir(proj), 'WEB-INF/web.xml') if(webXmlFile.exists()) { - def webXml = new XmlSlurper().parse(webXmlFile) + def webXml = new groovy.xml.XmlSlurper().parse(webXmlFile) if(webXml.filter.find { it.'filter-class'.text() == 'org.akhikhl.gretty.RedirectFilter' }) { project.dependencies.add 'runtimeOnly', "org.gretty:gretty-filter:${project.ext.grettyVersion}", { exclude group: 'javax.servlet', module: 'servlet-api'