From 2ac5bd031c45c62aa0c772cd7f3fa22ecf6a2010 Mon Sep 17 00:00:00 2001
From: Spolti <filippespolti@gmail.com>
Date: Tue, 24 Dec 2024 16:08:00 -0300
Subject: [PATCH] Upgrade Quarkus to 2.13.4

- Upgrade okhttp to 4.12.0 and okio to 3.6.0
- upgrade quarkus to 2.12.3

Signed-off-by: Spolti <filippespolti@gmail.com>

Deprecate java 11 and add support for java 21

Signed-off-by: Spolti <filippespolti@gmail.com>
---
 ...main-merge-java-11.yml => main-merge-java-21.yml} |  6 +++---
 ...rge-java-11.yml => main-native-merge-java-17.yml} |  6 +++---
 ...t-java-11.yml => native-pull-request-java-17.yml} |  9 +++++----
 ...-request-java-11.yml => pull-request-java-21.yml} |  6 +++---
 .mvn/jvm.config                                      |  1 +
 pom.xml                                              | 12 +++++++++---
 6 files changed, 24 insertions(+), 16 deletions(-)
 rename .github/workflows/{main-merge-java-11.yml => main-merge-java-21.yml} (78%)
 rename .github/workflows/{main-native-merge-java-11.yml => main-native-merge-java-17.yml} (83%)
 rename .github/workflows/{native-pull-request-java-11.yml => native-pull-request-java-17.yml} (65%)
 rename .github/workflows/{pull-request-java-11.yml => pull-request-java-21.yml} (77%)
 create mode 100644 .mvn/jvm.config

diff --git a/.github/workflows/main-merge-java-11.yml b/.github/workflows/main-merge-java-21.yml
similarity index 78%
rename from .github/workflows/main-merge-java-11.yml
rename to .github/workflows/main-merge-java-21.yml
index 53d08ba9..a29b0e5c 100644
--- a/.github/workflows/main-merge-java-11.yml
+++ b/.github/workflows/main-merge-java-21.yml
@@ -1,4 +1,4 @@
-name: ReBot - Java 11
+name: ReBot - Java 21
 
 on:
   push:
@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 21
       - name: Test with Maven
         run: mvn clean package --no-transfer-progress --file pom.xml
\ No newline at end of file
diff --git a/.github/workflows/main-native-merge-java-11.yml b/.github/workflows/main-native-merge-java-17.yml
similarity index 83%
rename from .github/workflows/main-native-merge-java-11.yml
rename to .github/workflows/main-native-merge-java-17.yml
index 66ddb48d..08eb57f0 100644
--- a/.github/workflows/main-native-merge-java-11.yml
+++ b/.github/workflows/main-native-merge-java-17.yml
@@ -1,4 +1,4 @@
-name: ReBot - Native Java 11
+name: ReBot - Native Java 17
 
 on:
   push:
@@ -12,9 +12,9 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install Dependencies
         run: sudo apt-get install -y build-essential libz-dev zlib1g-dev
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: package
         run: mvn clean package --no-transfer-progress --file pom.xml -Pnative -Dquarkus.native.container-build=true -DskipTests
\ No newline at end of file
diff --git a/.github/workflows/native-pull-request-java-11.yml b/.github/workflows/native-pull-request-java-17.yml
similarity index 65%
rename from .github/workflows/native-pull-request-java-11.yml
rename to .github/workflows/native-pull-request-java-17.yml
index 232e5bbc..60a38824 100644
--- a/.github/workflows/native-pull-request-java-11.yml
+++ b/.github/workflows/native-pull-request-java-17.yml
@@ -1,4 +1,4 @@
-name: ReBot CI - Native Java 11
+name: ReBot CI - Native Java 17
 
 on: pull_request
 jobs:
@@ -8,10 +8,11 @@ jobs:
     - uses: actions/checkout@v2
     - name: Install Dependencies
       run: sudo apt-get install -y build-essential libz-dev zlib1g-dev
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: package
-      run: mvn clean package --no-transfer-progress --file pom.xml -Pnative -Dmaven.javadoc.skip=true -Dquarkus.native.container-build=true -DskipTests
+      run: mvn clean package --no-transfer-progress --file pom.xml \
+        -Pnative -Dmaven.javadoc.skip=true -Dquarkus.native.container-build=true -DskipTests
   
diff --git a/.github/workflows/pull-request-java-11.yml b/.github/workflows/pull-request-java-21.yml
similarity index 77%
rename from .github/workflows/pull-request-java-11.yml
rename to .github/workflows/pull-request-java-21.yml
index f80a25c2..cdb0ff57 100644
--- a/.github/workflows/pull-request-java-11.yml
+++ b/.github/workflows/pull-request-java-21.yml
@@ -1,4 +1,4 @@
-name: ReBot CI - Java 11
+name: ReBot CI - Java 21
 
 on: pull_request
 jobs:
@@ -6,10 +6,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 21
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 21
     - name: Test with Maven
       run: mvn clean test --no-transfer-progress --file pom.xml -Dmaven.javadoc.skip=true
   
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 00000000..2f4dc488
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1 @@
+-Dnet.bytebuddy.experimental=true
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4f5f9b47..45165a2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,10 +63,12 @@
     <version.xyz.rebasing.rebot.plugins>1.0-SNAPSHOT</version.xyz.rebasing.rebot.plugins>
     <version.xyz.rebasing.rebot.services>1.0-SNAPSHOT</version.xyz.rebasing.rebot.services>
     <version.xyz.rebasing.rebot.api>1.0-SNAPSHOT</version.xyz.rebasing.rebot.api>
-    <io.quarkus.version>2.8.0.Final</io.quarkus.version>
+    <io.quarkus.version>2.13.4.Final</io.quarkus.version>
     <version.org.kie.kogito>1.20.0.Final</version.org.kie.kogito>
     <version.httpclient>4.5.13</version.httpclient>
-    <version.com.squareup.okhttp3>4.9.3</version.com.squareup.okhttp3>
+
+    <version.com.squareup.okhttp3>4.12.0</version.com.squareup.okhttp3>
+    <version.com.squareup.okio>3.6.0</version.com.squareup.okio>
     <version.org.hamcrest.java.hamcrest>2.0.0.0</version.org.hamcrest.java.hamcrest>
     <version.junit>4.13.1</version.junit>
     <version.org.mockito>2.12.0</version.org.mockito>
@@ -127,7 +129,11 @@
         <artifactId>okhttp</artifactId>
         <version>${version.com.squareup.okhttp3}</version>
       </dependency>
-
+      <dependency>
+        <groupId>com.squareup.okio</groupId>
+        <artifactId>okio</artifactId>
+        <version>${version.com.squareup.okio}</version>
+      </dependency>
       <!-- rebot dependencies -->
       <dependency>
         <groupId>xyz.rebasing</groupId>