Skip to content

Commit 5d9ee2a

Browse files
committed
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 <[email protected]> Deprecate java 11 and add support for java 21 Signed-off-by: Spolti <[email protected]>
1 parent 75d3af3 commit 5d9ee2a

File tree

8 files changed

+43
-33
lines changed

8 files changed

+43
-33
lines changed

.github/workflows/main-merge-java-17.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ jobs:
1515
with:
1616
java-version: 17
1717
- name: Test with Maven
18-
run: mvn clean package --no-transfer-progress --file pom.xml
18+
run: mvn clean package --no-transfer-progress --file pom.xml -Dnet.bytebuddy.experimental=true
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ReBot - Java 11
1+
name: ReBot - Java 21
22

33
on:
44
push:
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v2
13-
- name: Set up JDK 11
13+
- name: Set up JDK 21
1414
uses: actions/setup-java@v1
1515
with:
16-
java-version: 11
16+
java-version: 21
1717
- name: Test with Maven
18-
run: mvn clean package --no-transfer-progress --file pom.xml
18+
run: mvn clean package --no-transfer-progress --file pom.xml -Dnet.bytebuddy.experimental=true

.github/workflows/main-native-merge-java-11.yml renamed to .github/workflows/main-native-merge-java-17.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ReBot - Native Java 11
1+
name: ReBot - Native Java 17
22

33
on:
44
push:
@@ -12,9 +12,9 @@ jobs:
1212
- uses: actions/checkout@v2
1313
- name: Install Dependencies
1414
run: sudo apt-get install -y build-essential libz-dev zlib1g-dev
15-
- name: Set up JDK 11
15+
- name: Set up JDK 17
1616
uses: actions/setup-java@v1
1717
with:
18-
java-version: 11
18+
java-version: 17
1919
- name: package
20-
run: mvn clean package --no-transfer-progress --file pom.xml -Pnative -Dquarkus.native.container-build=true -DskipTests
20+
run: mvn clean package --no-transfer-progress --file pom.xml -Pnative -Dquarkus.native.container-build=true -DskipTests -Dnet.bytebuddy.experimental=true

.github/workflows/native-pull-request-java-11.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: ReBot CI - Native Java 17
2+
3+
on: pull_request
4+
jobs:
5+
test:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v2
9+
- name: Install Dependencies
10+
run: sudo apt-get install -y build-essential libz-dev zlib1g-dev
11+
- name: Set up JDK 17
12+
uses: actions/setup-java@v1
13+
with:
14+
java-version: 17
15+
- name: package
16+
run: -|
17+
mvn clean package --no-transfer-progress --file pom.xml \
18+
-Pnative -Dmaven.javadoc.skip=true -Dquarkus.native.container-build=true \
19+
-DskipTests -Dnet.bytebuddy.experimental=true
20+
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
name: ReBot CI - Java 11
1+
name: ReBot CI - Java 21
22

33
on: pull_request
44
jobs:
55
test:
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v2
9-
- name: Set up JDK 11
9+
- name: Set up JDK 21
1010
uses: actions/setup-java@v1
1111
with:
12-
java-version: 11
12+
java-version: 21
1313
- name: Test with Maven
14-
run: mvn clean test --no-transfer-progress --file pom.xml -Dmaven.javadoc.skip=true
14+
run: mvn clean test --no-transfer-progress --file pom.xml -Dmaven.javadoc.skip=true -Dnet.bytebuddy.experimental=true
1515

.mvn/jvm.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Dnet.bytebuddy.experimental=true

pom.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,12 @@
6363
<version.xyz.rebasing.rebot.plugins>1.0-SNAPSHOT</version.xyz.rebasing.rebot.plugins>
6464
<version.xyz.rebasing.rebot.services>1.0-SNAPSHOT</version.xyz.rebasing.rebot.services>
6565
<version.xyz.rebasing.rebot.api>1.0-SNAPSHOT</version.xyz.rebasing.rebot.api>
66-
<io.quarkus.version>2.8.0.Final</io.quarkus.version>
66+
<io.quarkus.version>2.13.4.Final</io.quarkus.version>
6767
<version.org.kie.kogito>1.20.0.Final</version.org.kie.kogito>
6868
<version.httpclient>4.5.13</version.httpclient>
69-
<version.com.squareup.okhttp3>4.9.3</version.com.squareup.okhttp3>
69+
70+
<version.com.squareup.okhttp3>4.12.0</version.com.squareup.okhttp3>
71+
<version.com.squareup.okio>3.6.0</version.com.squareup.okio>
7072
<version.org.hamcrest.java.hamcrest>2.0.0.0</version.org.hamcrest.java.hamcrest>
7173
<version.junit>4.13.1</version.junit>
7274
<version.org.mockito>2.12.0</version.org.mockito>
@@ -127,7 +129,11 @@
127129
<artifactId>okhttp</artifactId>
128130
<version>${version.com.squareup.okhttp3}</version>
129131
</dependency>
130-
132+
<dependency>
133+
<groupId>com.squareup.okio</groupId>
134+
<artifactId>okio</artifactId>
135+
<version>${version.com.squareup.okio}</version>
136+
</dependency>
131137
<!-- rebot dependencies -->
132138
<dependency>
133139
<groupId>xyz.rebasing</groupId>

0 commit comments

Comments
 (0)