Upgrade sample test builds to latest versions

.github/workflows/ci-build.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
       - run: "./gradlew quickCheck"

.github/workflows/cross-version-tests.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
       - run: "./gradlew test${{ matrix.gradleVersion }}"

.github/workflows/gh-pages.yml

@@ -19,20 +19,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup Pages
-        uses: actions/configure-pages@v5
-      - name: Set up JDK 11
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v4
+      - uses: actions/configure-pages@v5
+      - uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 11
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v4
+          java-version: 17
+      - uses: gradle/actions/setup-gradle@v4
       - run: "./gradlew :asciidoctor --no-configuration-cache"
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+      - uses: actions/upload-pages-artifact@v3
         with:
           path: "./build/docs/asciidoc"
 

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
       - run: "./gradlew :publishPlugin --no-configuration-cache"

build.gradle.kts

@@ -9,7 +9,7 @@ group = "org.gradlex"
 version = "2.2"
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(11) // to run tests that use Android with 11
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
 }
 
 tasks.withType<JavaCompile>().configureEach {

renovate.json

@@ -3,5 +3,8 @@
   "extends": [
     "config:recommended"
   ],
-  "ignorePaths": ["samples/**"]
+  "ignorePaths": [
+    "samples/sample-alignment/**",
+    "samples/sample-javax-and-jakarta/**"
+  ]
 }

src/test/groovy/org/gradlex/jvm/dependency/conflict/test/CustomizationTest.groovy

@@ -42,7 +42,7 @@ class CustomizationTest extends Specification {
                  +--- org.ow2.asm:asm:7.0
                  \\--- org.apache.ant:ant:1.10.3
                       \\--- org.apache.ant:ant-launcher:1.10.3
-        '''.stripIndent()
+            '''.stripIndent()
     }
 
     def "can use own capability resolution strategies through Gradle standard API"() {
@@ -103,7 +103,7 @@ class CustomizationTest extends Specification {
             +--- com.sun.mail:mailapi:1.6.7 -> com.sun.mail:jakarta.mail:1.6.7 (*)
             +--- jakarta.servlet:jakarta.servlet-api:5.0.0
             \\--- org.apache.tomcat:tomcat-servlet-api:10.0.18 -> jakarta.servlet:jakarta.servlet-api:5.0.0
-        '''.stripIndent()
+            '''.stripIndent()
     }
 
     def "can use own capability resolution strategies through DSL"() {
@@ -149,6 +149,6 @@ class CustomizationTest extends Specification {
             +--- com.sun.mail:mailapi:1.6.7 -> com.sun.mail:jakarta.mail:1.6.7 (*)
             +--- jakarta.servlet:jakarta.servlet-api:5.0.0
             \\--- org.apache.tomcat:tomcat-servlet-api:10.0.18 -> jakarta.servlet:jakarta.servlet-api:5.0.0
-        '''.stripIndent()
+            '''.stripIndent()
     }
 }

src/test/groovy/org/gradlex/jvm/dependency/conflict/test/JarOverlapTest.groovy

@@ -89,15 +89,25 @@ class JarOverlapTest extends Specification {
                 return ["jakarta.ejb:jakarta.ejb-api:3.2.6"]
             case JAVAX_EL_API:
                 return ["jakarta.el:jakarta.el-api:3.0.3"]
+            case JAVAX_INJECT_API:
+                return ["jakarta.inject:jakarta.inject-api:1.0.5"]
+            case JAVAX_JSON_API:
+                return ["jakarta.json:jakarta.json-api:1.1.6"]
             case JAVAX_MAIL_API:
                 return ["com.sun.mail:mailapi:1.6.7", "jakarta.mail:jakarta.mail-api:1.6.7", "com.sun.mail:jakarta.mail:1.6.7"]
             case JAVAX_PERSISTENCE_API:
                 return ["jakarta.persistence:jakarta.persistence-api:2.2.3"]
             case JAVAX_SERVLET_API:
                 return ["jakarta.servlet:jakarta.servlet-api:4.0.4", "org.apache.tomcat:servlet-api:6.0.53",
                         "org.apache.tomcat:tomcat-servlet-api:9.0.104", "org.apache.tomcat.embed:tomcat-embed-core:9.0.104"]
+            case JAVAX_SERVLET_JSP:
+                return ["jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6"]
+            case JAVAX_SERVLET_JSTL:
+                return ["jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7"]
             case JAVAX_TRANSACTION_API:
                 return ["jakarta.transaction:jakarta.transaction-api:1.3.3"]
+            case JAVAX_VALIDATION_API:
+                return ["jakarta.validation:jakarta.validation-api:2.0.2"]
             case JAVAX_WEBSOCKET_API_RULE:
                 return ["jakarta.websocket:jakarta.websocket-api:1.1.2", "jakarta.websocket:jakarta.websocket-client-api:1.1.2",
                         "org.apache.tomcat:tomcat-websocket-api:9.0.104", "org.apache.tomcat:tomcat-websocket:9.0.104",

src/test/groovy/org/gradlex/jvm/dependency/conflict/test/SettingsTest.groovy

@@ -66,6 +66,6 @@ class SettingsTest extends Specification {
             +--- com.sun.mail:mailapi:1.6.7 -> com.sun.mail:jakarta.mail:1.6.7 (*)
             +--- jakarta.servlet:jakarta.servlet-api:5.0.0
             \\--- org.apache.tomcat:tomcat-servlet-api:10.0.18 -> jakarta.servlet:jakarta.servlet-api:5.0.0
-        '''.stripIndent()
+            '''.stripIndent()
     }
 }