diff --git a/.github/workflows/pr-smoke-test-quarkus-images.yml b/.github/workflows/pr-smoke-test-quarkus-images.yml index b61064fb00e2..e36da5ecd82b 100644 --- a/.github/workflows/pr-smoke-test-quarkus-images.yml +++ b/.github/workflows/pr-smoke-test-quarkus-images.yml @@ -15,5 +15,6 @@ jobs: with: project: ":smoke-tests:images:quarkus" cache-read-only: true - # Quarkus 2.0+ does not support Java 8 + # Quarkus 3.7+ requires Java 17+ skip-java-8: true + skip-java-11: true diff --git a/.github/workflows/publish-smoke-test-quarkus-images.yml b/.github/workflows/publish-smoke-test-quarkus-images.yml index 0334e136a3d4..f6f2c6eac4b1 100644 --- a/.github/workflows/publish-smoke-test-quarkus-images.yml +++ b/.github/workflows/publish-smoke-test-quarkus-images.yml @@ -15,8 +15,9 @@ jobs: with: project: ":smoke-tests:images:quarkus" publish: true - # Quarkus 2.0+ does not support Java 8 + # Quarkus 3.7+ requires Java 17+ skip-java-8: true + skip-java-11: true workflow-notification: needs: diff --git a/.github/workflows/reusable-smoke-test-images.yml b/.github/workflows/reusable-smoke-test-images.yml index b0058ccd94ba..8f3857460494 100644 --- a/.github/workflows/reusable-smoke-test-images.yml +++ b/.github/workflows/reusable-smoke-test-images.yml @@ -22,6 +22,9 @@ on: skip-java-8: type: boolean required: false + skip-java-11: + type: boolean + required: false skip-java-17: type: boolean required: false @@ -70,6 +73,7 @@ jobs: run: ./gradlew ${{ inputs.project }}:${{ inputs.publish && 'jib' || 'jibDockerBuild' }} -Ptag=${{ env.TAG }} -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain - name: Build Java 11 Docker image + if: "!inputs.skip-java-11" run: ./gradlew ${{ inputs.project }}:${{ inputs.publish && 'jib' || 'jibDockerBuild' }} -Ptag=${{ env.TAG }} -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain - name: Build Java 17 Docker image diff --git a/smoke-tests/images/quarkus/build.gradle.kts b/smoke-tests/images/quarkus/build.gradle.kts index 890a0bdc846d..9ebd97770857 100644 --- a/smoke-tests/images/quarkus/build.gradle.kts +++ b/smoke-tests/images/quarkus/build.gradle.kts @@ -17,7 +17,7 @@ plugins { dependencies { implementation(enforcedPlatform("io.quarkus:quarkus-bom:3.15.1")) - implementation("io.quarkus:quarkus-resteasy") + implementation("io.quarkus:quarkus-rest") } quarkus { @@ -26,7 +26,8 @@ quarkus { setFinalName("opentelemetry-quarkus-$version") } -val targetJDK = project.findProperty("targetJDK") ?: "11" +// Quarkus 3.7+ requires Java 17+ +val targetJDK = project.findProperty("targetJDK") ?: "17" val tag = findProperty("tag") ?: DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(LocalDateTime.now()) @@ -45,18 +46,13 @@ jib { container { mainClass = "bogus" // to suppress Jib warning about missing main class } - pluginExtensions { - pluginExtension { - implementation = "com.google.cloud.tools.jib.gradle.extension.quarkus.JibQuarkusExtension" - } - } } tasks { withType().configureEach { with(options) { - // Quarkus 2.0+ does not support Java 8 - release.set(11) + // Quarkus 3.7+ requires Java 17+ + release.set(17) } } diff --git a/smoke-tests/images/quarkus/src/main/resources/application.properties b/smoke-tests/images/quarkus/src/main/resources/application.properties deleted file mode 100644 index 5271e05bec32..000000000000 --- a/smoke-tests/images/quarkus/src/main/resources/application.properties +++ /dev/null @@ -1,3 +0,0 @@ -# this is needed until jib supports the new default (fast-jar) -# see https://github.com/GoogleContainerTools/jib-extensions/issues/92 -quarkus.package.type=legacy-jar