diff --git a/.github/matrix-jvm-tests.json b/.github/matrix-jvm-tests.json
index 23255ead23846..62eabe7448386 100644
--- a/.github/matrix-jvm-tests.json
+++ b/.github/matrix-jvm-tests.json
@@ -1,11 +1,4 @@
[ {
- "name": "11",
- "java-version": 11,
- "maven_args": "$JVM_TEST_MAVEN_ARGS",
- "maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g",
- "os-name": "ubuntu-latest"
-}
-, {
"name": "17",
"java-version": 17,
"maven_args": "$JVM_TEST_MAVEN_ARGS",
diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml
index 87e5bd84f8eac..4dbb198696c6d 100644
--- a/.github/workflows/ci-actions-incremental.yml
+++ b/.github/workflows/ci-actions-incremental.yml
@@ -83,8 +83,8 @@ jobs:
steps:
- name: Build
run: sleep 30
- build-jdk11:
- name: "Initial JDK 11 Build"
+ build-jdk17:
+ name: "Initial JDK 17 Build"
runs-on: ubuntu-latest
# Skip main in forks
# Skip draft PRs and those with WIP in the subject, rerun as soon as its removed
@@ -108,8 +108,8 @@ jobs:
steps:
- name: Gradle Enterprise environment
run: |
- echo "GE_TAGS=jdk-11" >> "$GITHUB_ENV"
- echo "GE_CUSTOM_VALUES=gh-job-name=Initial JDK 11 Build" >> "$GITHUB_ENV"
+ echo "GE_TAGS=jdk-17" >> "$GITHUB_ENV"
+ echo "GE_CUSTOM_VALUES=gh-job-name=Initial JDK 17 Build" >> "$GITHUB_ENV"
- uses: actions/checkout@v4
with:
# this is important for GIB to work
@@ -118,11 +118,11 @@ jobs:
run: git remote show quarkusio &> /dev/null || git remote add quarkusio https://github.com/quarkusio/quarkus.git
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Generate .m2 cache key
id: m2-cache-key
run: |
@@ -197,7 +197,7 @@ jobs:
uses: actions/upload-artifact@v3
if: ${{ failure() || cancelled() }}
with:
- name: "build-reports-Initial JDK 11 Build"
+ name: "build-reports-Initial JDK 17 Build"
path: |
target/build-report.json
target/gradle-build-scan-url.txt
@@ -207,16 +207,16 @@ jobs:
if: always()
uses: gradle/github-actions/maven-build-scan/save@v1-beta
with:
- job-name: "Initial JDK 11 Build"
+ job-name: "Initial JDK 17 Build"
calculate-test-jobs:
name: Calculate Test Jobs
runs-on: ubuntu-latest
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
- needs: build-jdk11
+ needs: build-jdk17
env:
- GIB_IMPACTED_MODULES: ${{ needs.build-jdk11.outputs.gib_impacted }}
+ GIB_IMPACTED_MODULES: ${{ needs.build-jdk17.outputs.gib_impacted }}
outputs:
native_matrix: ${{ steps.calc-native-matrix.outputs.matrix }}
jvm_matrix: ${{ steps.calc-jvm-matrix.outputs.matrix }}
@@ -280,7 +280,7 @@ jobs:
jvm-tests:
name: JVM Tests - JDK ${{matrix.java.name}}
runs-on: ${{ matrix.java.os-name }}
- needs: [build-jdk11, calculate-test-jobs]
+ needs: [build-jdk17, calculate-test-jobs]
# Skip main in forks
if: "needs.calculate-test-jobs.outputs.run_jvm == 'true' && (github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main'))"
timeout-minutes: 400
@@ -346,7 +346,7 @@ jobs:
with:
path: ~/.m2/repository
# refresh cache every week to avoid unlimited growth
- key: ${{ needs.build-jdk11.outputs.m2-cache-key }}
+ key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
with:
@@ -356,7 +356,7 @@ jobs:
run: tar -xzf m2-io-quarkus.tgz -C ~
- name: Build
# Despite the pre-calculated run_jvm flag, GIB has to be re-run here to figure out the exact submodules to build.
- run: ./mvnw $COMMON_MAVEN_ARGS clean install -Dsurefire.timeout=1200 -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devmode -pl !integration-tests/devtools -Dno-test-kubernetes -pl !docs ${{ matrix.java.maven_args }} ${{ needs.build-jdk11.outputs.gib_args }}
+ run: ./mvnw $COMMON_MAVEN_ARGS clean install -Dsurefire.timeout=1200 -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devmode -pl !integration-tests/devtools -Dno-test-kubernetes -pl !docs ${{ matrix.java.maven_args }} ${{ needs.build-jdk17.outputs.gib_args }}
- name: Clean Gradle temp directory
if: always()
run: devtools/gradle/gradlew --stop && rm -rf devtools/gradle/gradle-extension-plugin/build/tmp
@@ -386,7 +386,7 @@ jobs:
with:
name: "GC log - JDK ${{matrix.java.name}}"
path: |
- **/windows-java-11.txt
+ **/windows-java-17.txt
!**/build/tmp/**
retention-days: 5
- name: Upload build.log (if build failed)
@@ -406,7 +406,7 @@ jobs:
maven-tests:
name: Maven Tests - JDK ${{matrix.java.name}}
runs-on: ${{ matrix.java.os-name }}
- needs: [build-jdk11, calculate-test-jobs]
+ needs: [build-jdk17, calculate-test-jobs]
env:
MAVEN_OPTS: -Xmx2g -XX:MaxMetaspaceSize=1g
# Skip main in forks
@@ -417,13 +417,13 @@ jobs:
matrix:
java:
- {
- name: "11",
- java-version: 11,
+ name: "17",
+ java-version: 17,
os-name: "ubuntu-latest"
}
- {
- name: "11 Windows",
- java-version: 11,
+ name: "17 Windows",
+ java-version: 17,
os-name: "windows-latest"
}
steps:
@@ -445,7 +445,7 @@ jobs:
with:
path: ~/.m2/repository
# refresh cache every week to avoid unlimited growth
- key: ${{ needs.build-jdk11.outputs.m2-cache-key }}
+ key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
with:
@@ -461,7 +461,7 @@ jobs:
- name: Build
# Important: keep -pl ... in sync with "Calculate run flags"!
# Despite the pre-calculated run_jvm flag, GIB has to be re-run here to figure out the exact submodules to build.
- run: ./mvnw $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_ARGS clean install -pl 'integration-tests/maven' -pl 'integration-tests/devmode' ${{ needs.build-jdk11.outputs.gib_args }}
+ run: ./mvnw $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_ARGS clean install -pl 'integration-tests/maven' -pl 'integration-tests/devmode' ${{ needs.build-jdk17.outputs.gib_args }}
- name: Prepare failure archive (if maven failed)
if: failure()
run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
@@ -499,7 +499,7 @@ jobs:
gradle-tests:
name: Gradle Tests - JDK ${{matrix.java.name}}
runs-on: ${{matrix.java.os-name}}
- needs: [build-jdk11, calculate-test-jobs]
+ needs: [build-jdk17, calculate-test-jobs]
env:
# leave more space for the actual gradle execution (which is just wrapped by maven)
MAVEN_OPTS: -Xmx1g
@@ -511,13 +511,13 @@ jobs:
matrix:
java:
- {
- name: "11",
- java-version: 11,
+ name: "17",
+ java-version: 17,
os-name: "ubuntu-latest"
}
- {
- name: "11 Windows",
- java-version: 11,
+ name: "17 Windows",
+ java-version: 17,
os-name: "windows-latest"
}
steps:
@@ -534,7 +534,7 @@ jobs:
with:
path: ~/.m2/repository
# refresh cache every week to avoid unlimited growth
- key: ${{ needs.build-jdk11.outputs.m2-cache-key }}
+ key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
with:
@@ -576,7 +576,7 @@ jobs:
devtools-tests:
name: Devtools Tests - JDK ${{matrix.java.name}}
runs-on: ${{matrix.java.os-name}}
- needs: [build-jdk11, calculate-test-jobs]
+ needs: [build-jdk17, calculate-test-jobs]
# Skip main in forks
if: "needs.calculate-test-jobs.outputs.run_devtools == 'true' && (github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main'))"
timeout-minutes: 60
@@ -585,18 +585,18 @@ jobs:
matrix:
java:
- {
- name: "11",
- java-version: 11,
+ name: "7",
+ java-version: 17,
os-name: "ubuntu-latest"
}
- {
- name: "17",
- java-version: 17,
+ name: "21",
+ java-version: 21,
os-name: "ubuntu-latest"
}
- {
- name: "11 Windows",
- java-version: 11,
+ name: "17 Windows",
+ java-version: 17,
os-name: "windows-latest"
}
steps:
@@ -613,7 +613,7 @@ jobs:
with:
path: ~/.m2/repository
# refresh cache every week to avoid unlimited growth
- key: ${{ needs.build-jdk11.outputs.m2-cache-key }}
+ key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
with:
@@ -659,7 +659,7 @@ jobs:
kubernetes-tests:
name: Kubernetes Tests - JDK ${{matrix.java.name}}
runs-on: ${{matrix.java.os-name}}
- needs: [build-jdk11, calculate-test-jobs]
+ needs: [build-jdk17, calculate-test-jobs]
# Skip main in forks
if: "needs.calculate-test-jobs.outputs.run_kubernetes == 'true' && (github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main'))"
timeout-minutes: 40
@@ -668,18 +668,18 @@ jobs:
matrix:
java:
- {
- name: "11",
- java-version: 11,
+ name: "17",
+ java-version: 17,
os-name: "ubuntu-latest"
}
- {
- name: "17",
- java-version: 17,
+ name: "21",
+ java-version: 21,
os-name: "ubuntu-latest"
}
- {
- name: "11 Windows",
- java-version: 11,
+ name: "17 Windows",
+ java-version: 17,
os-name: "windows-latest"
}
steps:
@@ -696,7 +696,7 @@ jobs:
with:
path: ~/.m2/repository
# refresh cache every week to avoid unlimited growth
- key: ${{ needs.build-jdk11.outputs.m2-cache-key }}
+ key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
with:
@@ -742,7 +742,7 @@ jobs:
quickstarts-tests:
name: Quickstarts Compilation - JDK ${{matrix.java.name}}
runs-on: ${{matrix.java.os-name}}
- needs: [build-jdk11, calculate-test-jobs]
+ needs: [build-jdk17, calculate-test-jobs]
# Skip main in forks
if: "needs.calculate-test-jobs.outputs.run_quickstarts == 'true' && (github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main'))"
timeout-minutes: 90
@@ -766,7 +766,7 @@ jobs:
with:
path: ~/.m2/repository
# refresh cache every week to avoid unlimited growth
- key: ${{ needs.build-jdk11.outputs.m2-cache-key }}
+ key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
with:
@@ -803,7 +803,7 @@ jobs:
virtual-thread-native-tests:
name: Native Tests - Virtual Thread - ${{matrix.category}}
runs-on: ${{matrix.os-name}}
- needs: [build-jdk11, calculate-test-jobs]
+ needs: [build-jdk17, calculate-test-jobs]
# Skip main in forks
if: "needs.calculate-test-jobs.outputs.virtual_threads_matrix != '{}' && (github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main'))"
timeout-minutes: ${{matrix.timeout}}
@@ -823,7 +823,7 @@ jobs:
with:
path: ~/.m2/repository
# refresh cache every week to avoid unlimited growth
- key: ${{ needs.build-jdk11.outputs.m2-cache-key }}
+ key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
with:
@@ -864,7 +864,7 @@ jobs:
tcks-test:
name: MicroProfile TCKs Tests
- needs: [build-jdk11, calculate-test-jobs]
+ needs: [build-jdk17, calculate-test-jobs]
# Skip main in forks
if: "needs.calculate-test-jobs.outputs.run_tcks == 'true' && (github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main'))"
runs-on: ubuntu-latest
@@ -872,7 +872,7 @@ jobs:
steps:
- name: Gradle Enterprise environment
run: |
- echo "GE_TAGS=jdk-11" >> "$GITHUB_ENV"
+ echo "GE_TAGS=jdk-17" >> "$GITHUB_ENV"
echo "GE_CUSTOM_VALUES=gh-job-name=MicroProfile TCKs Tests" >> "$GITHUB_ENV"
- uses: actions/checkout@v4
with:
@@ -882,17 +882,17 @@ jobs:
run: git remote show quarkusio &> /dev/null || git remote add quarkusio https://github.com/quarkusio/quarkus.git
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Restore Maven Repository
uses: actions/cache/restore@v3
with:
path: ~/.m2/repository
# refresh cache every week to avoid unlimited growth
- key: ${{ needs.build-jdk11.outputs.m2-cache-key }}
+ key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
with:
@@ -903,7 +903,7 @@ jobs:
- name: Verify
# Important: keep -pl ... in sync with "Calculate run flags"!
# Despite the pre-calculated run_tcks flag, GIB has to be re-run here to figure out the exact tcks submodules to build.
- run: ./mvnw $COMMON_MAVEN_ARGS -Dtcks -pl tcks -amd clean install ${{ needs.build-jdk11.outputs.gib_args }}
+ run: ./mvnw $COMMON_MAVEN_ARGS -Dtcks -pl tcks -amd clean install ${{ needs.build-jdk17.outputs.gib_args }}
- name: Verify resteasy-reative dependencies
# note: ideally, this would be run _before_ mvnw but that would required building tcks/resteasy-reactive in two steps
run: ./tcks/resteasy-reactive/update-dependencies.sh $COMMON_MAVEN_ARGS
@@ -936,7 +936,7 @@ jobs:
native-tests:
name: Native Tests - ${{matrix.category}}
- needs: [build-jdk11, calculate-test-jobs]
+ needs: [build-jdk17, calculate-test-jobs]
runs-on: ${{matrix.os-name}}
env:
# leave more space for the actual native compilation and execution
@@ -962,11 +962,11 @@ jobs:
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
if: ${{ !startsWith(matrix.os-name, 'windows') }}
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Install cl.exe
if: startsWith(matrix.os-name, 'windows')
uses: ilammy/msvc-dev-cmd@v1
@@ -990,7 +990,7 @@ jobs:
with:
path: ~/.m2/repository
# refresh cache every week to avoid unlimited growth
- key: ${{ needs.build-jdk11.outputs.m2-cache-key }}
+ key: ${{ needs.build-jdk17.outputs.m2-cache-key }}
- name: Download .m2/repository/io/quarkus
uses: actions/download-artifact@v3
with:
@@ -1034,7 +1034,7 @@ jobs:
build-report:
runs-on: ubuntu-latest
name: Build report
- needs: [build-jdk11,jvm-tests,maven-tests,gradle-tests,devtools-tests,kubernetes-tests,quickstarts-tests,tcks-test,native-tests,virtual-thread-native-tests]
+ needs: [build-jdk17,jvm-tests,maven-tests,gradle-tests,devtools-tests,kubernetes-tests,quickstarts-tests,tcks-test,native-tests,virtual-thread-native-tests]
if: always()
steps:
- uses: actions/download-artifact@v3
diff --git a/.github/workflows/ci-fork-mvn-cache.yml b/.github/workflows/ci-fork-mvn-cache.yml
index db85bfce4f145..dd8140e97fc3c 100644
--- a/.github/workflows/ci-fork-mvn-cache.yml
+++ b/.github/workflows/ci-fork-mvn-cache.yml
@@ -29,8 +29,8 @@ concurrency:
env:
LANG: en_US.UTF-8
jobs:
- build-jdk11:
- name: "Quick JDK 11 Build"
+ build-jdk17:
+ name: "Quick JDK 17 Build"
runs-on: ubuntu-latest
# Skip in main repo
if: github.repository != 'quarkusio/quarkus'
@@ -38,11 +38,11 @@ jobs:
- uses: actions/checkout@v4
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Get Date
id: get-date
run: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f69b8e03d8919..2f7c5e36cda32 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -35,7 +35,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: temurin
- java-version: 11
+ java-version: 17
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
@@ -43,14 +43,14 @@ jobs:
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
- # By default, queries listed here will override any specified in a config file.
+ # By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- - if: matrix.language == 'java'
+ - if: matrix.language == 'java'
name: Build Java
run: ./mvnw -B --settings .github/mvn-settings.xml -Dquickly-ci install
diff --git a/.github/workflows/deploy-snapshots.yml b/.github/workflows/deploy-snapshots.yml
index 1db60e3d27755..0f439b840b711 100644
--- a/.github/workflows/deploy-snapshots.yml
+++ b/.github/workflows/deploy-snapshots.yml
@@ -20,11 +20,11 @@ jobs:
ref: main
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Get Date
id: get-date
run: |
diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml
index f230730da8a0c..80e6c455edb4e 100644
--- a/.github/workflows/doc-build.yml
+++ b/.github/workflows/doc-build.yml
@@ -34,11 +34,11 @@ jobs:
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
steps:
- uses: actions/checkout@v4
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Get Date
id: get-date
run: |
diff --git a/.github/workflows/owasp-check.yml b/.github/workflows/owasp-check.yml
index 54503dacca20d..a03900952b881 100644
--- a/.github/workflows/owasp-check.yml
+++ b/.github/workflows/owasp-check.yml
@@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
-
+
steps:
- name: Checkout repository
uses: actions/checkout@v4
@@ -24,7 +24,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Build Java
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 297827d13c47e..33adbbdecaa23 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -19,11 +19,11 @@ jobs:
ref: main
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Create maven repo
run: mkdir -p $HOME/release/repository
- name: Build and Test
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 1b1d221bba2f4..ff016123ba2c1 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -22,7 +22,7 @@
3.11.0
1.9.21
1.9.10
- 2.13.8
+ 2.13.12
4.8.1
${scala-maven-plugin.version}
@@ -1114,12 +1114,12 @@
- 11
+ 17
html
- https://docs.oracle.com/en/java/javase/11/docs/api/
+ https://docs.oracle.com/en/java/javase/17/docs/api/
diff --git a/devtools/cli/src/test/java/io/quarkus/cli/CliProjectGradleTest.java b/devtools/cli/src/test/java/io/quarkus/cli/CliProjectGradleTest.java
index a0ae6007a5de8..354ed4055f511 100644
--- a/devtools/cli/src/test/java/io/quarkus/cli/CliProjectGradleTest.java
+++ b/devtools/cli/src/test/java/io/quarkus/cli/CliProjectGradleTest.java
@@ -400,25 +400,26 @@ public void testCreateArgPassthrough() throws Exception {
}
@Test
- public void testCreateArgJava11() throws Exception {
+ public void testCreateArgJava17() throws Exception {
CliDriver.Result result = CliDriver.execute(workspaceRoot, "create", "app", "--gradle",
"-e", "-B", "--verbose",
- "--java", "11");
+ "--java", "17");
// We don't need to retest this, just need to make sure all the arguments were passed through
Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode, "Expected OK return code." + result);
Path buildGradle = project.resolve("build.gradle");
String buildGradleContent = CliDriver.readFileAsString(buildGradle);
- Assertions.assertTrue(buildGradleContent.contains("sourceCompatibility = JavaVersion.VERSION_11"),
- "Java 11 should be used when specified. Found:\n" + buildGradle);
+
+ Assertions.assertTrue(buildGradleContent.contains("sourceCompatibility = JavaVersion.VERSION_17"),
+ "Java 17 should be used when specified. Found:\n" + buildGradleContent);
}
@Test
- public void testCreateArgJava17() throws Exception {
+ public void testCreateArgJava21() throws Exception {
CliDriver.Result result = CliDriver.execute(workspaceRoot, "create", "app", "--gradle",
"-e", "-B", "--verbose",
- "--java", "17");
+ "--java", "21");
// We don't need to retest this, just need to make sure all the arguments were passed through
Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode, "Expected OK return code." + result);
@@ -426,8 +427,8 @@ public void testCreateArgJava17() throws Exception {
Path buildGradle = project.resolve("build.gradle");
String buildGradleContent = CliDriver.readFileAsString(buildGradle);
- Assertions.assertTrue(buildGradleContent.contains("sourceCompatibility = JavaVersion.VERSION_17"),
- "Java 17 should be used when specified. Found:\n" + buildGradleContent);
+ Assertions.assertTrue(buildGradleContent.contains("sourceCompatibility = JavaVersion.VERSION_21"),
+ "Java 21 should be used when specified. Found:\n" + buildGradleContent);
}
String validateBasicGradleGroovyIdentifiers(Path project, String group, String artifact, String version) throws Exception {
diff --git a/devtools/cli/src/test/java/io/quarkus/cli/CliProjectJBangTest.java b/devtools/cli/src/test/java/io/quarkus/cli/CliProjectJBangTest.java
index 5a48ea499205b..7b585873e9053 100644
--- a/devtools/cli/src/test/java/io/quarkus/cli/CliProjectJBangTest.java
+++ b/devtools/cli/src/test/java/io/quarkus/cli/CliProjectJBangTest.java
@@ -168,34 +168,33 @@ public void testBuildOptions() throws Exception {
}
@Test
- public void testCreateArgJava11() throws Exception {
+ public void testCreateArgJava17() throws Exception {
CliDriver.Result result = CliDriver.execute(workspaceRoot, "create", "app", "--jbang",
"-e", "-B", "--verbose",
- "--java", "11");
+ "--java", "17");
// We don't need to retest this, just need to make sure all the arguments were passed through
Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode, "Expected OK return code." + result);
Path javaMain = validateJBangSourcePackage(project, ""); // no package name
-
String source = CliDriver.readFileAsString(javaMain);
- Assertions.assertTrue(source.contains("//JAVA 11"),
- "Generated source should contain //JAVA 11. Found:\n" + source);
+ Assertions.assertTrue(source.contains("//JAVA 17"),
+ "Generated source should contain //JAVA 17. Found:\n" + source);
}
@Test
- public void testCreateArgJava17() throws Exception {
+ public void testCreateArgJava21() throws Exception {
CliDriver.Result result = CliDriver.execute(workspaceRoot, "create", "app", "--jbang",
"-e", "-B", "--verbose",
- "--java", "17");
+ "--java", "21");
// We don't need to retest this, just need to make sure all the arguments were passed through
Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode, "Expected OK return code." + result);
Path javaMain = validateJBangSourcePackage(project, ""); // no package name
String source = CliDriver.readFileAsString(javaMain);
- Assertions.assertTrue(source.contains("//JAVA 17"),
- "Generated source should contain //JAVA 17. Found:\n" + source);
+ Assertions.assertTrue(source.contains("//JAVA 21"),
+ "Generated source should contain //JAVA 21. Found:\n" + source);
}
void validateBasicIdentifiers(Path project, String group, String artifact, String version) throws Exception {
diff --git a/devtools/cli/src/test/java/io/quarkus/cli/CliProjectMavenTest.java b/devtools/cli/src/test/java/io/quarkus/cli/CliProjectMavenTest.java
index d8782c4f1b0d2..4e86fcf46e1a0 100644
--- a/devtools/cli/src/test/java/io/quarkus/cli/CliProjectMavenTest.java
+++ b/devtools/cli/src/test/java/io/quarkus/cli/CliProjectMavenTest.java
@@ -349,10 +349,10 @@ public void testCreateArgPassthrough() throws Exception {
}
@Test
- public void testCreateArgJava11() throws Exception {
+ public void testCreateArgJava17() throws Exception {
CliDriver.Result result = CliDriver.execute(workspaceRoot, "create", "app",
"-e", "-B", "--verbose",
- "--java", "11");
+ "--java", "17");
// We don't need to retest this, just need to make sure all the arguments were passed through
Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode, "Expected OK return code." + result);
@@ -360,15 +360,15 @@ public void testCreateArgJava11() throws Exception {
Path pom = project.resolve("pom.xml");
String pomContent = CliDriver.readFileAsString(pom);
- Assertions.assertTrue(pomContent.contains("maven.compiler.release>11<"),
- "Java 11 should be used when specified. Found:\n" + pomContent);
+ Assertions.assertTrue(pomContent.contains("maven.compiler.release>17<"),
+ "Java 17 should be used when specified. Found:\n" + pomContent);
}
@Test
- public void testCreateArgJava17() throws Exception {
+ public void testCreateArgJava21() throws Exception {
CliDriver.Result result = CliDriver.execute(workspaceRoot, "create", "app",
"-e", "-B", "--verbose",
- "--java", "17");
+ "--java", "21");
// We don't need to retest this, just need to make sure all the arguments were passed through
Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode, "Expected OK return code." + result);
@@ -376,8 +376,8 @@ public void testCreateArgJava17() throws Exception {
Path pom = project.resolve("pom.xml");
String pomContent = CliDriver.readFileAsString(pom);
- Assertions.assertTrue(pomContent.contains("maven.compiler.release>17<"),
- "Java 17 should be used when specified. Found:\n" + pomContent);
+ Assertions.assertTrue(pomContent.contains("maven.compiler.release>21<"),
+ "Java 21 should be used when specified. Found:\n" + pomContent);
}
@Test
diff --git a/devtools/maven/pom.xml b/devtools/maven/pom.xml
index ef37e2bdde26d..e29c8f896b6fa 100644
--- a/devtools/maven/pom.xml
+++ b/devtools/maven/pom.xml
@@ -15,6 +15,10 @@
Quarkus - Maven Plugin
+
+ 11
+ 11
+
${project.version}
diff --git a/docs/src/main/asciidoc/building-my-first-extension.adoc b/docs/src/main/asciidoc/building-my-first-extension.adoc
index e3a4f2d30aeca..a6423f43aa8dd 100644
--- a/docs/src/main/asciidoc/building-my-first-extension.adoc
+++ b/docs/src/main/asciidoc/building-my-first-extension.adoc
@@ -167,7 +167,7 @@ Your extension is a multi-module project. So let's start by checking out the par
3.11.0
${surefire-plugin.version}
- 11
+ 17
UTF-8
UTF-8
{quarkus-version}
diff --git a/docs/src/main/asciidoc/jreleaser.adoc b/docs/src/main/asciidoc/jreleaser.adoc
index afe40f060fac7..bd60c76532354 100644
--- a/docs/src/main/asciidoc/jreleaser.adoc
+++ b/docs/src/main/asciidoc/jreleaser.adoc
@@ -621,8 +621,8 @@ As a reference, these are the full contents of the `pom.xml`:
${project.build.directory}/distributions
3.11.0
true
- 11
- 11
+ 17
+ 17
UTF-8
UTF-8
quarkus-bom
diff --git a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 60ac4b04c37a8..1cefbfdac67cf 100644
--- a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -10,8 +10,8 @@
3.1.0
3.11.0
true
- 11
- 11
+ 17
+ 17
UTF-8
UTF-8
999-SNAPSHOT
diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 80fb04957d4b0..dbf8f6d16d12e 100644
--- a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -10,8 +10,8 @@
3.1.0
3.11.0
true
- 11
- 11
+ 17
+ 17
UTF-8
UTF-8
999-SNAPSHOT
diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 7a0b9e4544cc1..4cc069988466d 100644
--- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -9,8 +9,8 @@
3.11.0
true
- 11
- 11
+ 17
+ 17
UTF-8
UTF-8
999-SNAPSHOT
diff --git a/extensions/container-image/container-image-docker/deployment/src/test/java/io/quarkus/container/image/docker/deployment/RedHatOpenJDKRuntimeBaseProviderTest.java b/extensions/container-image/container-image-docker/deployment/src/test/java/io/quarkus/container/image/docker/deployment/RedHatOpenJDKRuntimeBaseProviderTest.java
index 6114615670116..bbb55c3e1ec94 100644
--- a/extensions/container-image/container-image-docker/deployment/src/test/java/io/quarkus/container/image/docker/deployment/RedHatOpenJDKRuntimeBaseProviderTest.java
+++ b/extensions/container-image/container-image-docker/deployment/src/test/java/io/quarkus/container/image/docker/deployment/RedHatOpenJDKRuntimeBaseProviderTest.java
@@ -11,16 +11,6 @@ class RedHatOpenJDKRuntimeBaseProviderTest {
private final DockerFileBaseInformationProvider sut = new RedHatOpenJDKRuntimeBaseProvider();
- @Test
- void testImageWithJava11() {
- Path path = getPath("openjdk-11-runtime");
- var result = sut.determine(path);
- assertThat(result).hasValueSatisfying(v -> {
- assertThat(v.getBaseImage()).isEqualTo("registry.access.redhat.com/ubi8/openjdk-11-runtime:1.18");
- assertThat(v.getJavaVersion()).isEqualTo(11);
- });
- }
-
@Test
void testImageWithJava17() {
Path path = getPath("openjdk-17-runtime");
@@ -43,7 +33,7 @@ void testImageWithJava21() {
@Test
void testUnhandled() {
- Path path = getPath("ubi-java11");
+ Path path = getPath("ubi-java17");
var result = sut.determine(path);
assertThat(result).isEmpty();
}
diff --git a/extensions/container-image/container-image-docker/deployment/src/test/java/io/quarkus/container/image/docker/deployment/UbiMinimalBaseProviderTest.java b/extensions/container-image/container-image-docker/deployment/src/test/java/io/quarkus/container/image/docker/deployment/UbiMinimalBaseProviderTest.java
index 29c266279ac38..a1b4b9d6747a4 100644
--- a/extensions/container-image/container-image-docker/deployment/src/test/java/io/quarkus/container/image/docker/deployment/UbiMinimalBaseProviderTest.java
+++ b/extensions/container-image/container-image-docker/deployment/src/test/java/io/quarkus/container/image/docker/deployment/UbiMinimalBaseProviderTest.java
@@ -11,16 +11,6 @@ class UbiMinimalBaseProviderTest {
private final DockerFileBaseInformationProvider sut = new UbiMinimalBaseProvider();
- @Test
- void testImageWithJava11() {
- Path path = getPath("ubi-java11");
- var result = sut.determine(path);
- assertThat(result).hasValueSatisfying(v -> {
- assertThat(v.getBaseImage()).isEqualTo("registry.access.redhat.com/ubi8/ubi-minimal:8.9");
- assertThat(v.getJavaVersion()).isEqualTo(11);
- });
- }
-
@Test
void testImageWithJava17() {
Path path = getPath("ubi-java17");
@@ -43,7 +33,7 @@ void testImageWithJava21() {
@Test
void testUnhandled() {
- Path path = getPath("openjdk-11-runtime");
+ Path path = getPath("openjdk-17-runtime");
var result = sut.determine(path);
assertThat(result).isEmpty();
}
diff --git a/extensions/container-image/container-image-docker/deployment/src/test/resources/openjdk-11-runtime b/extensions/container-image/container-image-docker/deployment/src/test/resources/openjdk-11-runtime
deleted file mode 100644
index eb3b9e643de4c..0000000000000
--- a/extensions/container-image/container-image-docker/deployment/src/test/resources/openjdk-11-runtime
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM registry.access.redhat.com/ubi8/openjdk-11-runtime:1.18
-
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
-
-# Append additional options to the java process, you can add -XshowSettings:vm to also display the heap size.
-ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-
-# We make four distinct layers so if there are application changes the library layers can be re-used
-COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/
-COPY --chown=185 target/quarkus-app/*.jar /deployments/
-COPY --chown=185 target/quarkus-app/app/ /deployments/app/
-COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/
-
-EXPOSE 8080
-USER 185
-
-ENTRYPOINT [ "java", "-jar", "/deployments/quarkus-run.jar" ]
diff --git a/extensions/container-image/container-image-docker/deployment/src/test/resources/openjdk-17-runtime b/extensions/container-image/container-image-docker/deployment/src/test/resources/openjdk-17-runtime
index 14f5d447dbd36..9bc56f98c9d33 100644
--- a/extensions/container-image/container-image-docker/deployment/src/test/resources/openjdk-17-runtime
+++ b/extensions/container-image/container-image-docker/deployment/src/test/resources/openjdk-17-runtime
@@ -1,4 +1,3 @@
-# Use Java 17 base image
FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
diff --git a/extensions/container-image/container-image-docker/deployment/src/test/resources/ubi-java11 b/extensions/container-image/container-image-docker/deployment/src/test/resources/ubi-java11
deleted file mode 100644
index 64397357e0628..0000000000000
--- a/extensions/container-image/container-image-docker/deployment/src/test/resources/ubi-java11
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
-
-ARG JAVA_PACKAGE=java-11-openjdk-headless
-ARG RUN_JAVA_VERSION=1.3.8
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
-# Install java and the run-java script
-# Also set up permissions for user `1001`
-RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
- && microdnf update \
- && microdnf clean all \
- && mkdir /deployments \
- && chown 1001 /deployments \
- && chmod "g+rwX" /deployments \
- && chown 1001:root /deployments \
- && curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
- && chown 1001 /deployments/run-java.sh \
- && chmod 540 /deployments/run-java.sh \
- && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security
-
-# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
-ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-# We make four distinct layers so if there are application changes the library layers can be re-used
-COPY --chown=1001 target/quarkus-app/lib/ /deployments/lib/
-COPY --chown=1001 target/quarkus-app/*.jar /deployments/
-COPY --chown=1001 target/quarkus-app/app/ /deployments/app/
-COPY --chown=1001 target/quarkus-app/quarkus/ /deployments/quarkus/
-
-EXPOSE 8080
-USER 1001
-
-ENTRYPOINT [ "/deployments/run-java.sh" ]
diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/ContainerImageJibConfig.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/ContainerImageJibConfig.java
index b79d0303741fe..8ff58ffc172a7 100644
--- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/ContainerImageJibConfig.java
+++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/ContainerImageJibConfig.java
@@ -18,10 +18,7 @@ public class ContainerImageJibConfig {
*
* When the application is built against Java 21 or higher, {@code registry.access.redhat.com/ubi8/openjdk-21-runtime:1.18}
* is used as the default.
- * When the application is built against Java 17 or higher (but less than 21),
- * {@code registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18}
- * is used as the default.
- * Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11-runtime:1.18} is used as the default.
+ * Otherwise {@code registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18} is used as the default.
*/
@ConfigItem
public Optional baseJvmImage;
diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
index c3cb77ddc4a16..9cc7ec5945ad3 100644
--- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
+++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
@@ -94,7 +94,6 @@ public class JibProcessor {
private static final String JAVA_21_BASE_IMAGE = "registry.access.redhat.com/ubi8/openjdk-21-runtime:1.18";
private static final String JAVA_17_BASE_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18";
- private static final String JAVA_11_BASE_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.18";
private static final String DEFAULT_BASE_IMAGE_USER = "185";
@@ -139,10 +138,7 @@ private String determineBaseJvmImage(ContainerImageJibConfig jibConfig, Compiled
if (javaVersion.isJava21OrHigher() == CompiledJavaVersionBuildItem.JavaVersion.Status.TRUE) {
return JAVA_21_BASE_IMAGE;
}
- if (javaVersion.isJava17OrHigher() == CompiledJavaVersionBuildItem.JavaVersion.Status.TRUE) {
- return JAVA_17_BASE_IMAGE;
- }
- return JAVA_11_BASE_IMAGE;
+ return JAVA_17_BASE_IMAGE;
}
@BuildStep(onlyIf = { IsNormal.class, JibBuild.class }, onlyIfNot = NativeBuild.class)
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/ContainerImageOpenshiftConfig.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/ContainerImageOpenshiftConfig.java
index f049d4a6692fe..c8ad868835b6d 100644
--- a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/ContainerImageOpenshiftConfig.java
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/ContainerImageOpenshiftConfig.java
@@ -15,7 +15,6 @@
@ConfigRoot(name = "openshift", phase = ConfigPhase.BUILD_TIME)
public class ContainerImageOpenshiftConfig {
- public static final String DEFAULT_BASE_JVM_JDK11_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11:1.18";
public static final String DEFAULT_BASE_JVM_JDK17_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17:1.18";
public static final String DEFAULT_BASE_JVM_JDK21_IMAGE = "registry.access.redhat.com/ubi8/openjdk-21:1.18";
@@ -33,11 +32,8 @@ public class ContainerImageOpenshiftConfig {
public static String getDefaultJvmImage(CompiledJavaVersionBuildItem.JavaVersion version) {
if (version.isJava21OrHigher() == CompiledJavaVersionBuildItem.JavaVersion.Status.TRUE) {
return DEFAULT_BASE_JVM_JDK21_IMAGE;
- } else if (version.isJava17OrHigher() == CompiledJavaVersionBuildItem.JavaVersion.Status.TRUE) {
- return DEFAULT_BASE_JVM_JDK17_IMAGE;
- } else {
- return DEFAULT_BASE_JVM_JDK11_IMAGE;
}
+ return DEFAULT_BASE_JVM_JDK17_IMAGE;
}
/**
@@ -53,9 +49,7 @@ public static String getDefaultJvmImage(CompiledJavaVersionBuildItem.JavaVersion
* instead.
* When the application is built against Java 21 or higher, {@code registry.access.redhat.com/ubi8/openjdk-21:1.18}
* is used as the default.
- * When the application is built against Java [17, 20], {@code registry.access.redhat.com/ubi8/openjdk-17:1.18}
- * is used as the default.
- * Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11:1.18} is used as the default.
+ * Otherwise {@code registry.access.redhat.com/ubi8/openjdk-17:1.18} is used as the default.
*/
@ConfigItem
public Optional baseJvmImage;
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iBaseJavaImage.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iBaseJavaImage.java
index 138292aaf28a8..5512d7725407c 100644
--- a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iBaseJavaImage.java
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iBaseJavaImage.java
@@ -8,23 +8,7 @@
public enum S2iBaseJavaImage {
//We only compare `repositories` so registries and tags are stripped
- FABRIC8("fabric8/s2i-java:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH", "JAVA_OPTIONS"),
- OPENJDK_8_RHEL7("redhat-openjdk-18/openjdk18-openshift:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR",
- "JAVA_CLASSPATH", "JAVA_OPTIONS"),
- OPENJDK_8_RHEL8("openjdk/openjdk-8-rhel8:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS"),
- OPENJDK_11_RHEL7("openjdk/openjdk-11-rhel7:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS"),
- OPENJDK_11_RHEL8("openjdk/openjdk-11-rhel8:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS"),
- OPENJ9_8_RHEL7("openj9/openj9-8-rhel7:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS"),
- OPENJ9_8_RHEL8("openj9/openj9-8-rhel8:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS"),
- OPENJ9_11_RHEL7("openj9/openj9-11-rhel7:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS"),
- OPENJ9_11_RHEL8("openj9/openj9-11-rhel8:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS");
+ FABRIC8("fabric8/s2i-java:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH", "JAVA_OPTIONS");
private final String image;
private final String javaMainClassEnvVar;
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iConfig.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iConfig.java
index 0c88e16cba29e..defde810dc8a7 100644
--- a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iConfig.java
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iConfig.java
@@ -12,8 +12,8 @@
@ConfigRoot(phase = ConfigPhase.BUILD_TIME)
public class S2iConfig {
- public static final String DEFAULT_BASE_JVM_JDK11_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11:1.17";
- public static final String DEFAULT_BASE_JVM_JDK17_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17:1.17";
+ public static final String DEFAULT_BASE_JVM_JDK17_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17:1.18";
+ public static final String DEFAULT_BASE_JVM_JDK21_IMAGE = "registry.access.redhat.com/ubi8/openjdk-21:1.18";
public static final String DEFAULT_BASE_NATIVE_IMAGE = "quay.io/quarkus/ubi-quarkus-native-binary-s2i:2.0";
public static final String DEFAULT_NATIVE_TARGET_FILENAME = "application";
@@ -24,11 +24,11 @@ public class S2iConfig {
public static final String FALLBACK_NATIVE_BINARY_DIRECTORY = "/home/quarkus/";
public static String getDefaultJvmImage(CompiledJavaVersionBuildItem.JavaVersion version) {
- switch (version.isJava17OrHigher()) {
+ switch (version.isJava21OrHigher()) {
case TRUE:
- return DEFAULT_BASE_JVM_JDK17_IMAGE;
+ return DEFAULT_BASE_JVM_JDK21_IMAGE;
default:
- return DEFAULT_BASE_JVM_JDK11_IMAGE;
+ return DEFAULT_BASE_JVM_JDK17_IMAGE;
}
}
@@ -41,9 +41,9 @@ public static String getDefaultJvmImage(CompiledJavaVersionBuildItem.JavaVersion
/**
* The base image to be used when a container image is being produced for the jar build.
*
- * When the application is built against Java 17 or higher, {@code registry.access.redhat.com/ubi8/openjdk-17:1.18}
+ * When the application is built against Java 21 or higher, {@code registry.access.redhat.com/ubi8/openjdk-21:1.18}
* is used as the default.
- * Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11:1.18} is used as the default.
+ * Otherwise {@code registry.access.redhat.com/ubi8/openjdk-17:1.18} is used as the default.
*/
@ConfigItem
public Optional baseJvmImage;
diff --git a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/ContainerImageS2iConfig.java b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/ContainerImageS2iConfig.java
index 10e9f127f17b8..ce5b287b3efcb 100644
--- a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/ContainerImageS2iConfig.java
+++ b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/ContainerImageS2iConfig.java
@@ -13,7 +13,6 @@
@ConfigRoot(name = "s2i", phase = ConfigPhase.BUILD_TIME)
public class ContainerImageS2iConfig {
- public static final String DEFAULT_BASE_JVM_JDK11_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11";
public static final String DEFAULT_BASE_JVM_JDK17_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17";
public static final String DEFAULT_BASE_JVM_JDK21_IMAGE = "registry.access.redhat.com/ubi8/openjdk-21";
public static final String DEFAULT_BASE_NATIVE_IMAGE = "quay.io/quarkus/ubi-quarkus-native-binary-s2i:2.0";
@@ -22,10 +21,8 @@ public class ContainerImageS2iConfig {
public static String getDefaultJvmImage(CompiledJavaVersionBuildItem.JavaVersion version) {
if (version.isJava21OrHigher() == CompiledJavaVersionBuildItem.JavaVersion.Status.TRUE) {
return DEFAULT_BASE_JVM_JDK21_IMAGE;
- } else if (version.isJava17OrHigher() == CompiledJavaVersionBuildItem.JavaVersion.Status.TRUE) {
- return DEFAULT_BASE_JVM_JDK17_IMAGE;
} else {
- return DEFAULT_BASE_JVM_JDK11_IMAGE;
+ return DEFAULT_BASE_JVM_JDK17_IMAGE;
}
}
diff --git a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iBaseJavaImage.java b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iBaseJavaImage.java
index 06dbbab34a0af..b32d10f6d72bf 100644
--- a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iBaseJavaImage.java
+++ b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iBaseJavaImage.java
@@ -8,23 +8,7 @@
public enum S2iBaseJavaImage {
//We only compare `repositories` so registries and tags are stripped
- FABRIC8("fabric8/s2i-java:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH", "JAVA_OPTIONS"),
- OPENJDK_8_RHEL7("redhat-openjdk-18/openjdk18-openshift:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR",
- "JAVA_CLASSPATH", "JAVA_OPTIONS"),
- OPENJDK_8_RHEL8("openjdk/openjdk-8-rhel8:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS"),
- OPENJDK_11_RHEL7("openjdk/openjdk-11-rhel7:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS"),
- OPENJDK_11_RHEL8("openjdk/openjdk-11-rhel8:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS"),
- OPENJ9_8_RHEL7("openj9/openj9-8-rhel7:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS"),
- OPENJ9_8_RHEL8("openj9/openj9-8-rhel8:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS"),
- OPENJ9_11_RHEL7("openj9/openj9-11-rhel7:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS"),
- OPENJ9_11_RHEL8("openj9/openj9-11-rhel8:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
- "JAVA_OPTIONS");
+ FABRIC8("fabric8/s2i-java:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH", "JAVA_OPTIONS");
private final String image;
private final String javaMainClassEnvVar;
diff --git a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
index ac168bc8d0116..5ba3107f6e880 100644
--- a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -9,8 +9,8 @@
3.11.0
true
- 11
- 11
+ 17
+ 17
UTF-8
UTF-8
999-SNAPSHOT
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/pom.xml b/extensions/resteasy-reactive/rest-client-reactive/runtime/pom.xml
index f92fe41fad669..46b69aeb98394 100644
--- a/extensions/resteasy-reactive/rest-client-reactive/runtime/pom.xml
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/pom.xml
@@ -106,8 +106,6 @@
${project.version}
-
- 11
diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml
index 9fcf219e160dd..a44ce9b55e3cd 100644
--- a/independent-projects/arc/pom.xml
+++ b/independent-projects/arc/pom.xml
@@ -37,9 +37,6 @@
UTF-8
- 11
- 11
- 11
4.0.1
diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
index d966792760d95..96486a94ac924 100644
--- a/independent-projects/bootstrap/pom.xml
+++ b/independent-projects/bootstrap/pom.xml
@@ -34,9 +34,6 @@
1.3.2
1
UTF-8
- 11
- 11
- 11
3.11.0
3.2.1
3.1.2
diff --git a/independent-projects/enforcer-rules/pom.xml b/independent-projects/enforcer-rules/pom.xml
index 3be3e3b40c112..ae2779ab33089 100644
--- a/independent-projects/enforcer-rules/pom.xml
+++ b/independent-projects/enforcer-rules/pom.xml
@@ -31,9 +31,6 @@
UTF-8
- 11
- 11
- 11
3.2.1
3.1.2
diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml
index 165bdf86493a8..37f160b4f1d25 100644
--- a/independent-projects/extension-maven-plugin/pom.xml
+++ b/independent-projects/extension-maven-plugin/pom.xml
@@ -34,8 +34,8 @@
1.3.2
1
UTF-8
+
11
- 11
11
3.9.5
3.11.0
diff --git a/independent-projects/ide-config/pom.xml b/independent-projects/ide-config/pom.xml
index 4437dc80e4461..2521b993cc08e 100644
--- a/independent-projects/ide-config/pom.xml
+++ b/independent-projects/ide-config/pom.xml
@@ -36,9 +36,6 @@
UTF-8
- 11
- 11
- 11
3.2.1
3.1.2
diff --git a/independent-projects/junit5-virtual-threads/pom.xml b/independent-projects/junit5-virtual-threads/pom.xml
index d30d68dcb74ef..24525d28f2417 100644
--- a/independent-projects/junit5-virtual-threads/pom.xml
+++ b/independent-projects/junit5-virtual-threads/pom.xml
@@ -37,9 +37,6 @@
UTF-8
- 11
- 11
- 11
3.11.0
3.2.1
diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml
index 33c243cd1c009..18ca40c83d8bb 100644
--- a/independent-projects/parent/pom.xml
+++ b/independent-projects/parent/pom.xml
@@ -45,7 +45,9 @@
true
- 11
+ 17
+ 17
+ 17
${maven.compiler.release}
${maven.compiler.release}
${maven.compiler.target}
diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml
index a5822ccf7c1aa..5f7344e86e592 100644
--- a/independent-projects/qute/pom.xml
+++ b/independent-projects/qute/pom.xml
@@ -38,9 +38,6 @@
UTF-8
- 11
- 11
- 11
5.10.0
3.24.2
3.1.6
diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
index 4b60545273467..5d057c14fdcaa 100644
--- a/independent-projects/resteasy-reactive/pom.xml
+++ b/independent-projects/resteasy-reactive/pom.xml
@@ -43,9 +43,6 @@
4.0.1
1.1.5
UTF-8
- 11
- 11
- 11
4.0.1
3.1.6
diff --git a/independent-projects/revapi/pom.xml b/independent-projects/revapi/pom.xml
index 88d0a4eff7910..1913f434d0c3f 100644
--- a/independent-projects/revapi/pom.xml
+++ b/independent-projects/revapi/pom.xml
@@ -8,7 +8,7 @@
999-SNAPSHOT
../parent/pom.xml
-
+
quarkus-revapi-config
Quarkus - Revapi Configuration
999-SNAPSHOT
@@ -30,15 +30,12 @@
3.2.1
3.1.2
- 11
- 11
- 11
true
-
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang
index 27d5f8344f5ab..8651f46005bd1 100755
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang
@@ -7,7 +7,7 @@
#
# The Java version to install when it's not installed on the system yet
-javaVersion=${JBANG_DEFAULT_JAVA_VERSION:-11}
+javaVersion=${JBANG_DEFAULT_JAVA_VERSION:-17}
absolute_path() {
# if the given path to the jbang launcher is absolute (i.e. it is either starting with / or a
@@ -126,7 +126,7 @@ if [[ $os == windows && -f "$abs_jbang_dir/jbang.cmd" && "$(uname -s)" == CYGWIN
fi
if [[ -z "$JBANG_JDK_VENDOR" ]]; then
- if [[ "$javaVersion" -eq 8 || "$javaVersion" -eq 11 || "$javaVersion" -ge 17 ]]; then
+ if [[ "$javaVersion" -eq 8 || "$javaVersion" -eq 11 || "$javaVersion" -eq 17 || "$javaVersion" -eq 21 ]]; then
distro="temurin";
else
distro="aoj"; fi
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/scala/pom.tpl.qute.xml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/scala/pom.tpl.qute.xml
index 94f4093a1e466..d6bbe9a156ab7 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/scala/pom.tpl.qute.xml
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/scala/pom.tpl.qute.xml
@@ -52,12 +52,7 @@
-deprecation
-feature
-explaintypes
- {#if scala.version.startsWith("2.12.")}
- -target:jvm-1.8
- -Ypartial-unification
- {#else}
- -target:jvm-11
- {/if}
+ -release:17
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/JavaVersion.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/JavaVersion.java
index be5bbee89f5d1..ea5149c058c41 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/JavaVersion.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/JavaVersion.java
@@ -62,10 +62,10 @@ public String toString() {
}
// ordering is important here, so let's keep them ordered
- public static final SortedSet JAVA_VERSIONS_LTS = new TreeSet<>(List.of(11, 17, 21));
- public static final int DEFAULT_JAVA_VERSION = 11;
- // we want to maximize the compatibility of extensions with the Quarkus ecosystem so let's stick to 11 by default
- public static final String DEFAULT_JAVA_VERSION_FOR_EXTENSION = "11";
+ public static final SortedSet JAVA_VERSIONS_LTS = new TreeSet<>(List.of(17, 21));
+ public static final int DEFAULT_JAVA_VERSION = 17;
+ // we want to maximize the compatibility of extensions with the Quarkus ecosystem so let's stick to 17 by default
+ public static final String DEFAULT_JAVA_VERSION_FOR_EXTENSION = "17";
public static final int MAX_LTS_SUPPORTED_BY_KOTLIN = 21;
public static final String DETECT_JAVA_RUNTIME_VERSION = "<>";
public static final Pattern JAVA_VERSION_PATTERN = Pattern.compile("(\\d+)(?:\\..*)?");
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/JavaVersionTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/JavaVersionTest.java
index 3e0d82dd75241..45d3ca585bcdf 100644
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/JavaVersionTest.java
+++ b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/JavaVersionTest.java
@@ -20,24 +20,19 @@ public void givenJavaVersion17ShouldReturn17() {
}
@Test
- public void givenJavaVersion16ShouldReturn11() {
- assertEquals("11", computeJavaVersion(JAVA, "16.0.1"));
+ public void givenJavaVersion22ShouldReturn21() {
+ assertEquals("21", computeJavaVersion(JAVA, "22.0.1"));
}
@Test
- public void givenJavaVersion11ShouldReturn11() {
- assertEquals("11", computeJavaVersion(JAVA, "11"));
- }
-
- @Test
- public void givenJavaVersion18ShouldReturn17() {
- assertEquals("17", computeJavaVersion(JAVA, "18"));
+ public void givenJavaVersion21ShouldReturn21() {
+ assertEquals("21", computeJavaVersion(JAVA, "21"));
}
@Test
void shouldProperlyUseMinJavaVersion() {
- assertThat(getCompatibleLTSVersions(new JavaVersion("11"))).isEqualTo(JAVA_VERSIONS_LTS);
- assertThat(getCompatibleLTSVersions(new JavaVersion("17"))).containsExactly(17, 21);
+ assertThat(getCompatibleLTSVersions(new JavaVersion("17"))).isEqualTo(JAVA_VERSIONS_LTS);
+ assertThat(getCompatibleLTSVersions(new JavaVersion("21"))).containsExactly(21);
assertThat(getCompatibleLTSVersions(new JavaVersion("100"))).isEmpty();
assertThat(getCompatibleLTSVersions(JavaVersion.NA)).isEqualTo(JAVA_VERSIONS_LTS);
}
@@ -50,11 +45,12 @@ public void givenAutoDetectShouldReturnAppropriateVersion() {
@Test
public void testDetermineBestLtsVersion() {
- assertEquals(11, determineBestJavaLtsVersion(8));
- assertEquals(11, determineBestJavaLtsVersion(11));
- assertEquals(11, determineBestJavaLtsVersion(12));
+ assertEquals(17, determineBestJavaLtsVersion(8));
+ assertEquals(17, determineBestJavaLtsVersion(11));
assertEquals(17, determineBestJavaLtsVersion(17));
assertEquals(17, determineBestJavaLtsVersion(18));
+ assertEquals(21, determineBestJavaLtsVersion(21));
+ assertEquals(21, determineBestJavaLtsVersion(22));
}
@Test
diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTesting.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTesting.java
index 4f86ced09d98a..a97233c8b1a26 100644
--- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTesting.java
+++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTesting.java
@@ -34,7 +34,7 @@ public static Map getMockedTestInputData(final Map getRealTestInputData(ExtensionCatalog catalog,
data.put(SCALA_MAVEN_PLUGIN_VERSION.key(), quarkusProp.getProperty(ToolsConstants.PROP_SCALA_PLUGIN_VERSION));
data.put(MAVEN_COMPILER_PLUGIN_VERSION.key(), quarkusProp.getProperty(ToolsConstants.PROP_COMPILER_PLUGIN_VERSION));
data.put(MAVEN_SUREFIRE_PLUGIN_VERSION.key(), quarkusProp.getProperty(ToolsConstants.PROP_SUREFIRE_PLUGIN_VERSION));
- data.put(JAVA_VERSION.key(), "11");
+ data.put(JAVA_VERSION.key(), "17");
if (override != null)
data.putAll(override);
return data;
diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java
index e822bd176c4ea..3df62f156b9b5 100644
--- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java
+++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java
@@ -315,13 +315,13 @@ private void checkDockerfilesWithMaven(Path projectDir) {
assertThat(projectDir.resolve("src/main/docker/Dockerfile.jvm")).exists()
.satisfies(checkContains("./mvnw package"))
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.jvm"))
- .satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.18"))//TODO: make a test for java17
+ .satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-17:1.18"))
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))
.satisfies(checkContains("ENTRYPOINT [ \"/opt/jboss/container/java/run/run-java.sh\" ]"));
assertThat(projectDir.resolve("src/main/docker/Dockerfile.legacy-jar")).exists()
.satisfies(checkContains("./mvnw package -Dquarkus.package.type=legacy-jar"))
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.legacy-jar"))
- .satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.18"))
+ .satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-17:1.18"))
.satisfies(checkContains("EXPOSE 8080"))
.satisfies(checkContains("USER 185"))
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))
@@ -341,13 +341,13 @@ private void checkDockerfilesWithGradle(Path projectDir) {
assertThat(projectDir.resolve("src/main/docker/Dockerfile.jvm")).exists()
.satisfies(checkContains("./gradlew build"))
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.jvm"))
- .satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.18"))//TODO: make a test for java17
+ .satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-17:1.18"))
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))
.satisfies(checkContains("ENTRYPOINT [ \"/opt/jboss/container/java/run/run-java.sh\" ]"));
assertThat(projectDir.resolve("src/main/docker/Dockerfile.legacy-jar")).exists()
.satisfies(checkContains("./gradlew build -Dquarkus.package.type=legacy-jar"))
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.legacy-jar"))
- .satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.18"))
+ .satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-17:1.18"))
.satisfies(checkContains("EXPOSE 8080"))
.satisfies(checkContains("USER 185"))
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))
diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml
index 51ef9c95e7f4e..28937572322ef 100644
--- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml
+++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml
@@ -7,7 +7,7 @@
1.0.0-codestart
3.8.1-MOCK
- 11
+ 17
UTF-8
UTF-8
quarkus-mock-bom
diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleNoWrapperGithubAction/.github_workflows_ci.yml b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleNoWrapperGithubAction/.github_workflows_ci.yml
index b91dae4af7558..5126ed7fe1b37 100644
--- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleNoWrapperGithubAction/.github_workflows_ci.yml
+++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleNoWrapperGithubAction/.github_workflows_ci.yml
@@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3
with:
- java-version: 11
+ java-version: 17
distribution: temurin
cache: gradle
- name: Build
diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWrapperGithubAction/.github_workflows_ci.yml b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWrapperGithubAction/.github_workflows_ci.yml
index 214af798d2fbe..2b00bec6d5160 100644
--- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWrapperGithubAction/.github_workflows_ci.yml
+++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWrapperGithubAction/.github_workflows_ci.yml
@@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3
with:
- java-version: 11
+ java-version: 17
distribution: temurin
cache: maven
- name: Build
diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml
index 9871c74a9df19..6abb5fb856874 100644
--- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml
+++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml
@@ -7,7 +7,7 @@
1.0.0-codestart
3.8.1-MOCK
- 11
+ 17
UTF-8
UTF-8
quarkus-mock-bom
diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
index 95c4e1723317a..10b5ed03844e6 100644
--- a/independent-projects/tools/pom.xml
+++ b/independent-projects/tools/pom.xml
@@ -35,9 +35,6 @@
1.3.2
1
UTF-8
- 11
- 11
- 11
3.9.5
@@ -47,7 +44,7 @@
3.11.0
1.6.0
- 2.12.13
+ 2.13.12
4.4.0
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml
index 4107e1c2f5be0..49369c0468cae 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/docker/Dockerfile.jvm b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/docker/Dockerfile.jvm
index 566ba7b5a17bf..6de170527f1ed 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/docker/Dockerfile.jvm
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/docker/Dockerfile.jvm
@@ -23,7 +23,7 @@
###
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
-ARG JAVA_PACKAGE=java-11-openjdk-headless
+ARG JAVA_PACKAGE=java-17-openjdk-headless
ARG RUN_JAVA_VERSION=1.3.8
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
# Install java and the run-java script
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml
index 51b11f2950e77..f6b93fec7d58a 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/pom.xml
index 6f9cbef0fe4c3..902e7e36b521d 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml
index 6c048387d387f..6c34e5253acbc 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml
index 398a54e232883..439ea5e27a654 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/docker/Dockerfile.jvm b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/docker/Dockerfile.jvm
index 566ba7b5a17bf..6de170527f1ed 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/docker/Dockerfile.jvm
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/docker/Dockerfile.jvm
@@ -23,7 +23,7 @@
###
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
-ARG JAVA_PACKAGE=java-11-openjdk-headless
+ARG JAVA_PACKAGE=java-17-openjdk-headless
ARG RUN_JAVA_VERSION=1.3.8
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
# Install java and the run-java script
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml
index 6db37cb78d2d9..0f8604d355bad 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml
index 1c70b1664f0d0..5da922f81f7e8 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartBuildIT.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartBuildIT.java
index 32b90968cf96e..9cccca1c54fbe 100644
--- a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartBuildIT.java
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartBuildIT.java
@@ -120,7 +120,6 @@ private void generateProjectRunTests(String buildToolName, String language, List
final BuildTool buildTool = BuildTool.findTool(buildToolName);
final Map data = getTestInputData(Collections.singletonMap("artifact-id", name));
- // for JVM 8 and 14 this will generate project with java 1.8, for JVM 11 project with java 11
final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
.addData(data)
.buildTool(buildTool)
diff --git a/integration-tests/gradle/src/main/resources/add-extension-multi-module-kts/build.gradle.kts b/integration-tests/gradle/src/main/resources/add-extension-multi-module-kts/build.gradle.kts
index e4862ab443303..3ece50bb7b142 100644
--- a/integration-tests/gradle/src/main/resources/add-extension-multi-module-kts/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/add-extension-multi-module-kts/build.gradle.kts
@@ -26,8 +26,8 @@ subprojects {
apply(plugin = "java")
java {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
tasks {
diff --git a/integration-tests/gradle/src/main/resources/add-extension-multi-module/build.gradle b/integration-tests/gradle/src/main/resources/add-extension-multi-module/build.gradle
index e8fe347d47c79..be2336ebb1cf3 100644
--- a/integration-tests/gradle/src/main/resources/add-extension-multi-module/build.gradle
+++ b/integration-tests/gradle/src/main/resources/add-extension-multi-module/build.gradle
@@ -24,8 +24,8 @@ subprojects {
apply plugin: 'java'
java {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
test {
diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts b/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts
index 5e3808937ce3e..c2b7e6d1cc051 100644
--- a/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts
@@ -34,8 +34,8 @@ group = "org.acme"
version = "1.0.0-SNAPSHOT"
java {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
allOpen {
@@ -46,6 +46,6 @@ allOpen {
}
tasks.withType {
- kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
+ kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
kotlinOptions.javaParameters = true
}
diff --git a/integration-tests/gradle/src/main/resources/grpc-descriptor-set-alternate-output-dir/build.gradle b/integration-tests/gradle/src/main/resources/grpc-descriptor-set-alternate-output-dir/build.gradle
index 57535418f2507..01ed5ced48ab4 100644
--- a/integration-tests/gradle/src/main/resources/grpc-descriptor-set-alternate-output-dir/build.gradle
+++ b/integration-tests/gradle/src/main/resources/grpc-descriptor-set-alternate-output-dir/build.gradle
@@ -24,8 +24,8 @@ group 'org.acme'
version '1.0.0-SNAPSHOT'
java {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
test {
diff --git a/integration-tests/gradle/src/main/resources/grpc-descriptor-set-alternate-output/build.gradle b/integration-tests/gradle/src/main/resources/grpc-descriptor-set-alternate-output/build.gradle
index 57535418f2507..01ed5ced48ab4 100644
--- a/integration-tests/gradle/src/main/resources/grpc-descriptor-set-alternate-output/build.gradle
+++ b/integration-tests/gradle/src/main/resources/grpc-descriptor-set-alternate-output/build.gradle
@@ -24,8 +24,8 @@ group 'org.acme'
version '1.0.0-SNAPSHOT'
java {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
test {
diff --git a/integration-tests/gradle/src/main/resources/grpc-descriptor-set/build.gradle b/integration-tests/gradle/src/main/resources/grpc-descriptor-set/build.gradle
index 57535418f2507..01ed5ced48ab4 100644
--- a/integration-tests/gradle/src/main/resources/grpc-descriptor-set/build.gradle
+++ b/integration-tests/gradle/src/main/resources/grpc-descriptor-set/build.gradle
@@ -24,8 +24,8 @@ group 'org.acme'
version '1.0.0-SNAPSHOT'
java {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
test {
diff --git a/integration-tests/gradle/src/main/resources/grpc-include-project/build.gradle b/integration-tests/gradle/src/main/resources/grpc-include-project/build.gradle
index 57535418f2507..01ed5ced48ab4 100644
--- a/integration-tests/gradle/src/main/resources/grpc-include-project/build.gradle
+++ b/integration-tests/gradle/src/main/resources/grpc-include-project/build.gradle
@@ -24,8 +24,8 @@ group 'org.acme'
version '1.0.0-SNAPSHOT'
java {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
test {
diff --git a/integration-tests/gradle/src/main/resources/multi-module-with-empty-module/build.gradle.kts b/integration-tests/gradle/src/main/resources/multi-module-with-empty-module/build.gradle.kts
index 22c0d009fb62c..87f48bdc76cdd 100644
--- a/integration-tests/gradle/src/main/resources/multi-module-with-empty-module/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/multi-module-with-empty-module/build.gradle.kts
@@ -30,7 +30,7 @@ subprojects {
val quarkusPlatformArtifactId: String by project
val quarkusPlatformVersion: String by project
- val javaVersion = "11"
+ val javaVersion = "17"
dependencies {
"implementation"(enforcedPlatform("$quarkusPlatformGroupId:$quarkusPlatformArtifactId:$quarkusPlatformVersion"))
diff --git a/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/pom.xml b/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/pom.xml
index 30481f7b37455..24c16c370fec2 100644
--- a/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/pom.xml
+++ b/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml b/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml
index 11e69627d833a..8be32af85948a 100644
--- a/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml
+++ b/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml
@@ -9,9 +9,9 @@
1.0-SNAPSHOT
@project.version@
- 11
+ 17
UTF-8
- 11
+ 17
@kotlin.version@
diff --git a/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml b/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml
index 6038adf509dfc..3dda73071c6a6 100644
--- a/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml
+++ b/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml
@@ -9,9 +9,9 @@
@project.version@
- 11
+ 17
UTF-8
- 11
+ 17
@kotlin.version@
diff --git a/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml b/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml
index c3e3b414f7eb7..a477ef7274fe5 100644
--- a/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml
+++ b/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml
@@ -8,9 +8,9 @@
1.0-SNAPSHOT
- 11
+ 17
UTF-8
- 11
+ 17
3.2.2
@kotlin.version@
diff --git a/integration-tests/kotlin/src/test/resources/projects/kotlin-compiler-args/pom.xml b/integration-tests/kotlin/src/test/resources/projects/kotlin-compiler-args/pom.xml
index c264411637c04..c28c5fbdc223f 100644
--- a/integration-tests/kotlin/src/test/resources/projects/kotlin-compiler-args/pom.xml
+++ b/integration-tests/kotlin/src/test/resources/projects/kotlin-compiler-args/pom.xml
@@ -9,9 +9,9 @@
1.0-SNAPSHOT
@project.version@
- 11
+ 17
UTF-8
- 11
+ 17
@kotlin.version@
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml
index 32c73c981697b..caad51d1650d4 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml
index 0e24d8374a39d..fa1e0fe8f0d1e 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml
index fe6451e7fa880..f22eed57d8ef9 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
index cd221c0458b65..de6c5713afd4c 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml
index ebc57fe7f5931..31074411b816b 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml
@@ -9,9 +9,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml
index a61b38cec58b0..a992773921f87 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml
index f6a3236a785ae..8aac50cdfedeb 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml
index f04333673c6f0..d78d280567409 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
index 9835e419f434e..667a46e0355c1 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
index c32baabdc8130..7343f26e67d79 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-with-output-directory-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-with-output-directory-build-and-deploy/pom.xml
index 369de652a1e99..c191bcdacf8dc 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-with-output-directory-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-with-output-directory-build-and-deploy/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.0.0
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithQuarkusAppNameTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithQuarkusAppNameTest.java
index 71f0bc4a5e6d7..00bddeaa06c2d 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithQuarkusAppNameTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithQuarkusAppNameTest.java
@@ -53,7 +53,7 @@ public void assertGeneratedResources() throws IOException {
List openshiftList = DeserializationUtil
.deserializeAsList(kubernetesDir.resolve("openshift.yml"));
assertThat(openshiftList).allSatisfy(h -> {
- assertThat(h.getMetadata().getName()).isIn("ofoo", "foo", "openjdk-11");
+ assertThat(h.getMetadata().getName()).isIn("ofoo", "foo", "openjdk-17");
assertThat(h.getMetadata().getLabels()).contains(entry("app.kubernetes.io/name", "ofoo"),
entry("app.kubernetes.io/version", "1.0-openshift"));
});
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSpecifiedContainerNameTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSpecifiedContainerNameTest.java
index 1008f62907f6d..fa578f7ba2473 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSpecifiedContainerNameTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSpecifiedContainerNameTest.java
@@ -81,7 +81,7 @@ public void assertGeneratedResources() throws IOException {
});
});
- assertThat(h.getMetadata().getName()).isIn("ofoo", "foo", "openjdk-11");
+ assertThat(h.getMetadata().getName()).isIn("ofoo", "foo", "openjdk-17");
assertThat(h.getMetadata().getLabels()).contains(entry("app.kubernetes.io/name", "ofoo"));
});
}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-legacy-sidecar-and-s2i.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-legacy-sidecar-and-s2i.properties
index f293fcce1ccff..8848c5b4df735 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-legacy-sidecar-and-s2i.properties
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-legacy-sidecar-and-s2i.properties
@@ -1,5 +1,5 @@
quarkus.openshift.route.expose=true
-quarkus.s2i.base-jvm-image=my.registry.example/openjdk/openjdk-11-rhel7
+quarkus.s2i.base-jvm-image=my.registry.example/openjdk/openjdk-17-rhel8
quarkus.openshift.containers.sc.image=quay.io/sidecar/image:2.1
quarkus.openshift.containers.sc.image-pull-policy=IfNotPresent
quarkus.openshift.containers.sc.command=ls
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-sidecar-and-s2i.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-sidecar-and-s2i.properties
index f60a7825fec4f..85a695636b57c 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-sidecar-and-s2i.properties
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-sidecar-and-s2i.properties
@@ -1,5 +1,5 @@
quarkus.openshift.route.expose=true
-quarkus.s2i.base-jvm-image=my.registry.example/openjdk/openjdk-11-rhel7
+quarkus.s2i.base-jvm-image=my.registry.example/openjdk/openjdk-17-rhel8
quarkus.openshift.sidecars.sc.image=quay.io/sidecar/image:2.1
quarkus.openshift.sidecars.sc.image-pull-policy=IfNotPresent
quarkus.openshift.sidecars.sc.command=ls
diff --git a/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/pom.xml b/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/pom.xml
index f53561bd00312..c18c0484c10d9 100644
--- a/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/pom.xml
@@ -8,9 +8,9 @@
UTF-8
3.1.2
- 11
+ 17
UTF-8
- 11
+ 17
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java
index 8374d41fe2a17..d493be1b826b6 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java
@@ -458,24 +458,6 @@ public void testProjectGenerationFromScratchWithAppConfigParameter() throws Mave
}
- @Test
- public void testProjectGenerationFromScratchWithJava11() throws MavenInvocationException, IOException {
- testDir = initEmptyProject("projects/project-generation-with-java11");
- assertThat(testDir).isDirectory();
- invoker = initInvoker(testDir);
-
- Properties properties = new Properties();
- properties.put("javaVersion", "11");
-
- InvocationResult result = setup(properties);
- assertThat(result.getExitCode()).isZero();
-
- testDir = new File(testDir, "code-with-quarkus");
- assertThat(new File(testDir, "pom.xml")).isFile();
- assertThat(FileUtils.readFileToString(new File(testDir, "pom.xml"), "UTF-8"))
- .contains("maven.compiler.release>11<");
- }
-
@Test
public void testProjectGenerationFromScratchWithJava17() throws MavenInvocationException, IOException {
testDir = initEmptyProject("projects/project-generation-with-java17");
@@ -512,25 +494,6 @@ public void testProjectGenerationFromScratchWithJava21() throws MavenInvocationE
.contains("maven.compiler.release>21<");
}
- @Test
- public void testProjectGenerationFromScratchWithGradleJava11() throws MavenInvocationException, IOException {
- testDir = initEmptyProject("projects/project-generation-with-gradle-java11");
- assertThat(testDir).isDirectory();
- invoker = initInvoker(testDir);
-
- Properties properties = new Properties();
- properties.put("javaVersion", "11");
- properties.put("buildTool", "gradle");
-
- InvocationResult result = setup(properties);
- assertThat(result.getExitCode()).isZero();
-
- testDir = new File(testDir, "code-with-quarkus");
- assertThat(new File(testDir, "build.gradle")).isFile();
- assertThat(FileUtils.readFileToString(new File(testDir, "build.gradle"), "UTF-8"))
- .contains("sourceCompatibility = JavaVersion.VERSION_11");
- }
-
@Test
public void testProjectGenerationFromScratchWithGradleJava17() throws MavenInvocationException, IOException {
testDir = initEmptyProject("projects/project-generation-with-gradle-java17");
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java
index 3cbe292a417fb..bf298c21d3bf0 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java
@@ -337,7 +337,7 @@ public void testCustomOutputDirSetInProfile() throws MavenInvocationException, I
@Test
public void testThatNonExistentSrcDirCanBeAdded() throws MavenInvocationException, IOException {
- testDir = initProject("projects/classic", "projects/project-classic-run-java-change");
+ testDir = initProject("projects/classic", "projects/project-classic-non-existent-src-dir-can-be-added");
File sourceDir = new File(testDir, "src/main/java");
File sourceDirMoved = new File(testDir, "src/main/java-moved");
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/ImageBuildIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/ImageBuildIT.java
index 8c2ea8370fe96..537c81629f547 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/ImageBuildIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/ImageBuildIT.java
@@ -19,14 +19,14 @@ public class ImageBuildIT extends MojoTestBase {
private RunningInvoker running;
private File testDir;
- // We can only test with jib as its the only extension that has 0 dependencies from the system.
+ // We can only test with jib as it's the only extension that has 0 dependencies from the system.
@Test
@EnabledOnOs({ OS.LINUX })
public void testImageBuildWithJib() throws Exception {
Properties buildProperties = new Properties();
buildProperties.put("quarkus.container-image.builder", "jib");
- testDir = initProject("projects/classic");
+ testDir = initProject("projects/classic", "projects/image-build-with-jib");
running = new RunningInvoker(testDir, false);
final MavenProcessInvocationResult result = running.execute(Collections.singletonList("quarkus:image-build"),
Collections.emptyMap(), buildProperties);
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/TestUtils.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/TestUtils.java
index c9d76849403e7..3f1d8e5d15adb 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/TestUtils.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/TestUtils.java
@@ -4,7 +4,7 @@
final class TestUtils {
- private static final long DEFAULT_TIMEOUT = OS.current() == OS.WINDOWS ? 3L : 1L;
+ private static final long DEFAULT_TIMEOUT = OS.current() == OS.WINDOWS ? 3L : 2L;
private TestUtils() {
}
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/pom.xml
index 319dbedf23060..ce1c6a8583ec8 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/pom.xml
@@ -17,8 +17,8 @@
UTF-8
UTF-8
- 11
- 11
+ 17
+ 17
true
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/pom.xml
index 8845208427579..ce69dfc08adb7 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/pom.xml
@@ -17,8 +17,8 @@
UTF-8
UTF-8
- 11
- 11
+ 17
+ 17
true
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/minimal-extension/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/minimal-extension/pom.xml
index d871a8b9c5d15..dc6bcdb39ff84 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/minimal-extension/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/minimal-extension/pom.xml
@@ -17,8 +17,8 @@
UTF-8
UTF-8
- 11
- 11
+ 17
+ 17
true
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/with-grand-parent/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/with-grand-parent/pom.xml
index d5d412671b2f1..3db396312fb52 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/with-grand-parent/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/with-grand-parent/pom.xml
@@ -18,8 +18,8 @@
UTF-8
UTF-8
- 11
- 11
+ 17
+ 17
true
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-current-directory-project/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-current-directory-project/pom.xml
index d617e29e4f8ff..a3aa84bdee7ae 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-current-directory-project/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-current-directory-project/pom.xml
@@ -14,7 +14,7 @@
UTF-8
UTF-8
- 11
+ 17
\${project.version}
\${compiler-plugin.version}
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project-with-jboss-parent/my-ext/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project-with-jboss-parent/my-ext/pom.xml
index cd2cbbf21187c..218d2d5c53e18 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project-with-jboss-parent/my-ext/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project-with-jboss-parent/my-ext/pom.xml
@@ -19,8 +19,8 @@
UTF-8
UTF-8
- 11
- 11
+ 17
+ 17
true
\${project.version}
\${compiler-plugin.version}
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project/my-ext/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project/my-ext/pom.xml
index d617e29e4f8ff..a3aa84bdee7ae 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project/my-ext/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project/my-ext/pom.xml
@@ -14,7 +14,7 @@
UTF-8
UTF-8
- 11
+ 17
\${project.version}
\${compiler-plugin.version}
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/docker/Dockerfile.jvm b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/docker/Dockerfile.jvm
index 1617fd89fa050..fd5272297c2ef 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/docker/Dockerfile.jvm
+++ b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/docker/Dockerfile.jvm
@@ -75,7 +75,7 @@
# accessed directly. (example: "foo.example.com,bar.example.com")
#
###
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.14
+FROM registry.access.redhat.com/ubi8/openjdk-17:1.18
ENV LANGUAGE='en_US:en'
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/docker/Dockerfile.legacy-jar b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/docker/Dockerfile.legacy-jar
index 189ff4eb040e3..95ce7681973c5 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/docker/Dockerfile.legacy-jar
+++ b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/docker/Dockerfile.legacy-jar
@@ -75,7 +75,7 @@
# accessed directly. (example: "foo.example.com,bar.example.com")
#
###
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.14
+FROM registry.access.redhat.com/ubi8/openjdk-17:1.18
ENV LANGUAGE='en_US:en'
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_.github_workflows_build.yml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_.github_workflows_build.yml
index 5da57b27e4dba..b37f375508f20 100644
--- a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_.github_workflows_build.yml
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_.github_workflows_build.yml
@@ -45,11 +45,11 @@ jobs:
if: startsWith(matrix.os, 'windows')
- uses: actions/checkout@v3
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: temurin
- java-version: 11
+ java-version: 17
cache: 'maven'
- name: Build with Maven
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_.github_workflows_quarkus-snapshot.yaml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_.github_workflows_quarkus-snapshot.yaml
index ed1e496f85d6b..a66162f56c867 100644
--- a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_.github_workflows_quarkus-snapshot.yaml
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_.github_workflows_quarkus-snapshot.yaml
@@ -10,7 +10,7 @@ on:
env:
ECOSYSTEM_CI_REPO: quarkusio/quarkus-ecosystem-ci
ECOSYSTEM_CI_REPO_FILE: context.yaml
- JAVA_VERSION: 11
+ JAVA_VERSION: 17
#########################
# Repo specific setting #
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_.github_workflows_release.yml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_.github_workflows_release.yml
index 9576f81ad7c05..2a3577769d630 100644
--- a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_.github_workflows_release.yml
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_.github_workflows_release.yml
@@ -37,11 +37,11 @@ jobs:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: temurin
- java-version: 11
+ java-version: 17
cache: 'maven'
server-id: ossrh
server-username: MAVEN_USERNAME
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml
index 65d094b29b632..5b3cfb537f46c 100644
--- a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml
@@ -24,7 +24,7 @@
3.11.0
- 11
+ 17
UTF-8
UTF-8
2.10.5.Final
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml
index 20efb6a780683..eb38615c379de 100644
--- a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml
@@ -14,7 +14,7 @@
3.11.0
${surefire-plugin.version}
- 11
+ 17
UTF-8
UTF-8
2.10.5.Final
diff --git a/integration-tests/qute/pom.xml b/integration-tests/qute/pom.xml
index 0d3f59bf0d5be..1e6870c1a471f 100644
--- a/integration-tests/qute/pom.xml
+++ b/integration-tests/qute/pom.xml
@@ -8,7 +8,7 @@
999-SNAPSHOT
4.0.0
-
+
quarkus-integration-test-qute
Quarkus - Integration Tests - Qute
Qute integration test module
@@ -109,11 +109,6 @@
org.apache.maven.plugins
maven-compiler-plugin
${compiler-plugin.version}
-
-
- 11
- true
-
io.quarkus
diff --git a/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml b/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml
index 5ece6f2ef1e7c..ee6ed9e3dc340 100644
--- a/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml
+++ b/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml
@@ -8,9 +8,9 @@
1.0-SNAPSHOT
@project.version@
- 11
+ 17
UTF-8
- 11
+ 17
@scala.version@
@scala-maven-plugin.version@
@version.surefire.plugin@
@@ -103,7 +103,7 @@
-deprecation
-feature
-explaintypes
- -target:jvm-11
+ -release:17
diff --git a/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml b/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml
index d814e579300b6..d6ec72e0a9f1e 100644
--- a/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml
+++ b/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml
@@ -10,9 +10,9 @@
@project.version@
- 11
+ 17
UTF-8
- 11
+ 17
@scala.version@
@scala-maven-plugin.version@
@version.surefire.plugin@
@@ -91,7 +91,7 @@
-deprecation
-feature
-explaintypes
- -target:jvm-11
+ -release:17
diff --git a/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml b/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml
index b7ead6173ecc0..1c15f735f9b74 100644
--- a/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml
+++ b/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/external-lib/pom.xml
@@ -10,9 +10,9 @@
@project.version@
- 11
+ 17
UTF-8
- 11
+ 17
@scala.version@
@scala-maven-plugin.version@
3.2.2
@@ -50,7 +50,7 @@
-deprecation
-feature
-explaintypes
- -target:jvm-11
+ -release:17
diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml
index cc098681c0c59..52663a431fa0b 100644
--- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml
+++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml
@@ -9,7 +9,7 @@
${compiler-plugin.version}
false
quarkus-bom
- 11
+ 17
UTF-8
UTF-8
3.1.2
diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml
index aac91a5239cc2..94a911512ac8e 100644
--- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml
+++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml
@@ -9,7 +9,7 @@
${compiler-plugin.version}
false
- 11
+ 17
UTF-8
UTF-8
quarkus-bom
diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml
index eef420dac8589..d18b282118578 100644
--- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml
+++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml
@@ -9,7 +9,7 @@
${compiler-plugin.version}
false
quarkus-bom
- 11
+ 17
UTF-8
UTF-8
3.1.2
diff --git a/pom.xml b/pom.xml
index fc0f5a8d1bd12..95c302a1a7bd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,11 +51,6 @@
- 11
- 11
- 11
- true
-
${env.GRAALVM_HOME}
jdbc:postgresql:hibernate_orm_test
diff --git a/test-framework/devmode-test-utils/pom.xml b/test-framework/devmode-test-utils/pom.xml
index 4311def04cd6e..563f1268f72c9 100644
--- a/test-framework/devmode-test-utils/pom.xml
+++ b/test-framework/devmode-test-utils/pom.xml
@@ -14,6 +14,10 @@
Quarkus - Test Framework - Dev Mode Test Utils
+
+ org.jboss.logging
+ jboss-logging
+
commons-io
commons-io
diff --git a/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeClient.java b/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeClient.java
index 82fe2688d8853..cb71d4e0449f6 100644
--- a/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeClient.java
+++ b/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeClient.java
@@ -19,6 +19,7 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.jboss.logging.Logger;
import io.smallrye.common.os.OS;
@@ -26,6 +27,8 @@ public class DevModeClient {
private static final long DEFAULT_TIMEOUT = OS.current() == OS.WINDOWS ? 3L : 1L;
+ private static final Logger LOG = Logger.getLogger(DevModeClient.class);
+
static long getDefaultTimeout() {
return DEFAULT_TIMEOUT;
}
@@ -180,6 +183,10 @@ public String getHttpResponse(String path, boolean allowError, Supplier
resp.set(content);
return true;
} catch (Exception e) {
+ LOG.error(
+ "An error occurred when DevModeClient accessed " + path
+ + ". It might be a normal testing behavior but logging the exception for information",
+ e);
return false;
}
});
@@ -206,6 +213,10 @@ public boolean getHttpResponse(String path, int expectedStatus, long timeout, Ti
}
return false;
} catch (Exception e) {
+ LOG.error(
+ "An error occurred when DevModeClient accessed " + path
+ + ". It might be a normal testing behavior but logging the exception for information",
+ e);
return false;
}
});
@@ -227,6 +238,10 @@ public boolean getStrictHttpResponse(String path, int expectedStatus) {
//complete no matter what the response code was
return true;
} catch (Exception e) {
+ LOG.error(
+ "An error occurred when DevModeClient accessed " + path
+ + ". It might be a normal testing behavior but logging the exception for information",
+ e);
return false;
}
});