Skip to content

Commit 692e5ab

Browse files
authored
Update quarkus smoke test app (#12541)
1 parent 3b0e7b8 commit 692e5ab

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

.github/workflows/pr-smoke-test-quarkus-images.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ jobs:
1515
with:
1616
project: ":smoke-tests:images:quarkus"
1717
cache-read-only: true
18-
# Quarkus 2.0+ does not support Java 8
18+
# Quarkus 3.7+ requires Java 17+
1919
skip-java-8: true
20+
skip-java-11: true

.github/workflows/publish-smoke-test-quarkus-images.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ jobs:
1515
with:
1616
project: ":smoke-tests:images:quarkus"
1717
publish: true
18-
# Quarkus 2.0+ does not support Java 8
18+
# Quarkus 3.7+ requires Java 17+
1919
skip-java-8: true
20+
skip-java-11: true
2021

2122
workflow-notification:
2223
needs:

.github/workflows/reusable-smoke-test-images.yml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ on:
2222
skip-java-8:
2323
type: boolean
2424
required: false
25+
skip-java-11:
26+
type: boolean
27+
required: false
2528
skip-java-17:
2629
type: boolean
2730
required: false
@@ -70,6 +73,7 @@ jobs:
7073
run: ./gradlew ${{ inputs.project }}:${{ inputs.publish && 'jib' || 'jibDockerBuild' }} -Ptag=${{ env.TAG }} -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain
7174

7275
- name: Build Java 11 Docker image
76+
if: "!inputs.skip-java-11"
7377
run: ./gradlew ${{ inputs.project }}:${{ inputs.publish && 'jib' || 'jibDockerBuild' }} -Ptag=${{ env.TAG }} -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
7478

7579
- name: Build Java 17 Docker image

smoke-tests/images/quarkus/build.gradle.kts

+5-9
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ plugins {
1717

1818
dependencies {
1919
implementation(enforcedPlatform("io.quarkus:quarkus-bom:3.15.1"))
20-
implementation("io.quarkus:quarkus-resteasy")
20+
implementation("io.quarkus:quarkus-rest")
2121
}
2222

2323
quarkus {
@@ -26,7 +26,8 @@ quarkus {
2626
setFinalName("opentelemetry-quarkus-$version")
2727
}
2828

29-
val targetJDK = project.findProperty("targetJDK") ?: "11"
29+
// Quarkus 3.7+ requires Java 17+
30+
val targetJDK = project.findProperty("targetJDK") ?: "17"
3031

3132
val tag = findProperty("tag")
3233
?: DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(LocalDateTime.now())
@@ -45,18 +46,13 @@ jib {
4546
container {
4647
mainClass = "bogus" // to suppress Jib warning about missing main class
4748
}
48-
pluginExtensions {
49-
pluginExtension {
50-
implementation = "com.google.cloud.tools.jib.gradle.extension.quarkus.JibQuarkusExtension"
51-
}
52-
}
5349
}
5450

5551
tasks {
5652
withType<JavaCompile>().configureEach {
5753
with(options) {
58-
// Quarkus 2.0+ does not support Java 8
59-
release.set(11)
54+
// Quarkus 3.7+ requires Java 17+
55+
release.set(17)
6056
}
6157
}
6258

smoke-tests/images/quarkus/src/main/resources/application.properties

-3
This file was deleted.

0 commit comments

Comments
 (0)