Skip to content

Commit

Permalink
Upgrade Quarkus to 2.13.4
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
spolti committed Dec 24, 2024
1 parent 75d3af3 commit 2ac5bd0
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ReBot - Java 11
name: ReBot - Java 21

on:
push:
Expand All @@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ReBot - Native Java 11
name: ReBot - Native Java 17

on:
push:
Expand All @@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ReBot CI - Native Java 11
name: ReBot CI - Native Java 17

on: pull_request
jobs:
Expand All @@ -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

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: ReBot CI - Java 11
name: ReBot CI - Java 21

on: pull_request
jobs:
test:
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

1 change: 1 addition & 0 deletions .mvn/jvm.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Dnet.bytebuddy.experimental=true
12 changes: 9 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 2ac5bd0

Please sign in to comment.