Skip to content

Commit

Permalink
Q 3.9+ extension renaming, OpenTelemetry whitelisting log
Browse files Browse the repository at this point in the history
  • Loading branch information
Karm committed Mar 22, 2024
1 parent ce63a51 commit e2da2a2
Show file tree
Hide file tree
Showing 11 changed files with 445 additions and 30 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/builder_image_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,16 @@ jobs:
mandrel-builder-image: '22.3-java17'
- quarkus-version: '2.16.12.Final'
mandrel-builder-image: '22.3-java17'
- quarkus-version: '3.2.9.Final'
- quarkus-version: '3.2.11.Final'
mandrel-builder-image: 'jdk-17'
- quarkus-version: '3.5.3'
mandrel-builder-image: 'jdk-21'
- quarkus-version: '3.6.0'
mandrel-builder-image: 'jdk-21'
- quarkus-version: '3.8.3'
mandrel-builder-image: 'jdk-21'
- quarkus-version: '3.9.0.CR2'
mandrel-builder-image: 'jdk-21'
steps:
- uses: actions/checkout@v3
with:
Expand Down
26 changes: 24 additions & 2 deletions .github/workflows/local_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ jobs:
os: 'ubuntu-20.04'
timeout-minutes: 80

- quarkus-version: '3.2.9.Final'
- quarkus-version: '3.2.11.Final'
mandrel-version: '23.0.2.1-Final'
java-version: '17'
os: 'windows-2022'
timeout-minutes: 80
- quarkus-version: '3.2.9.Final'
- quarkus-version: '3.2.11.Final'
mandrel-version: '23.0.2.1-Final'
java-version: '17'
os: 'ubuntu-20.04'
Expand All @@ -102,6 +102,28 @@ jobs:
java-version: '21'
os: 'ubuntu-20.04'
timeout-minutes: 130

- quarkus-version: '3.8.3'
mandrel-version: '23.1.2.0-Final'
java-version: '21'
os: 'windows-2022'
timeout-minutes: 80
- quarkus-version: '3.8.3'
mandrel-version: '23.1.2.0-Final'
java-version: '21'
os: 'ubuntu-20.04'
timeout-minutes: 130

- quarkus-version: '3.9.0.CR2'
mandrel-version: '23.1.2.0-Final'
java-version: '21'
os: 'windows-2022'
timeout-minutes: 80
- quarkus-version: '3.9.0.CR2'
mandrel-version: '23.1.2.0-Final'
java-version: '21'
os: 'ubuntu-20.04'
timeout-minutes: 130
steps:
- uses: actions/checkout@v3
with:
Expand Down
13 changes: 13 additions & 0 deletions apps/jfr-native-image-performance/quarkus_3.9.x.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/apps/jfr-native-image-performance/pom.xml b/apps/jfr-native-image-performance/pom.xml
index 771b835..60df02b 100644
--- a/apps/jfr-native-image-performance/pom.xml
+++ b/apps/jfr-native-image-performance/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-reactive</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
42 changes: 42 additions & 0 deletions apps/quarkus-json/quarkus_3.9.x.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
diff --git a/apps/quarkus-json/pom.xml b/apps/quarkus-json/pom.xml
index 3d5fa5f..b1474e3 100644
--- a/apps/quarkus-json/pom.xml
+++ b/apps/quarkus-json/pom.xml
@@ -32,11 +32,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-reactive</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/apps/quarkus-json/src/main/java/org/acme/ExampleResource.java b/apps/quarkus-json/src/main/java/org/acme/ExampleResource.java
index dfb224d..a37b4a3 100644
--- a/apps/quarkus-json/src/main/java/org/acme/ExampleResource.java
+++ b/apps/quarkus-json/src/main/java/org/acme/ExampleResource.java
@@ -1,12 +1,12 @@
package org.acme;

-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.io.ByteArrayOutputStream;
import java.math.BigInteger;
import java.security.MessageDigest;
Loading

0 comments on commit e2da2a2

Please sign in to comment.