Skip to content

Commit 55aad09

Browse files
feat: Jakarta migration (#102)
1 parent 194bc18 commit 55aad09

File tree

10 files changed

+50
-32
lines changed

10 files changed

+50
-32
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ jobs:
1818
name: JDK ${{matrix.java-version}} JVM Tests
1919
strategy:
2020
matrix:
21-
java-version: [ 11, 17 ]
21+
java-version: [ 17 ]
22+
fail-fast: false
2223
runs-on: ubuntu-latest
2324
steps:
2425
- uses: actions/checkout@v3
@@ -35,10 +36,11 @@ jobs:
3536
runs-on: ubuntu-latest
3637
strategy:
3738
matrix:
38-
java-version: [ 11, 17 ]
39+
java-version: [ 17 ]
40+
fail-fast: false
3941
steps:
4042
- uses: actions/checkout@v3
41-
- name: Set up JDK 11
43+
- name: Set up JDK
4244
uses: actions/setup-java@v3
4345
with:
4446
java-version: ${{ matrix.java-version }}
@@ -54,13 +56,14 @@ jobs:
5456
runs-on: ubuntu-latest
5557
strategy:
5658
matrix:
57-
quarkus-version: [ 2.14.3.Final, 2.12.3.Final ]
59+
quarkus-version: [ 3.0.1.Final ]
60+
fail-fast: false
5861
steps:
5962
- uses: actions/checkout@v3
60-
- name: Set up JDK 11
63+
- name: Set up JDK
6164
uses: actions/setup-java@v3
6265
with:
63-
java-version: 11
66+
java-version: 17
6467
distribution: temurin
6568
cache: maven
6669
- name: Maven tests
@@ -73,10 +76,11 @@ jobs:
7376
runs-on: ubuntu-latest
7477
strategy:
7578
matrix:
76-
java-version: [ 11, 17 ]
79+
java-version: [ 17 ]
80+
fail-fast: false
7781
steps:
7882
- uses: actions/checkout@v3
79-
- name: Set up JDK 11
83+
- name: Set up JDK
8084
uses: actions/setup-java@v3
8185
with:
8286
java-version: ${{ matrix.java-version }}
@@ -92,13 +96,14 @@ jobs:
9296
runs-on: ubuntu-latest
9397
strategy:
9498
matrix:
95-
springboot-version: [ 2.7.5, 2.7.0 ]
99+
springboot-version: [ 3.0.0 ]
100+
fail-fast: false
96101
steps:
97102
- uses: actions/checkout@v3
98-
- name: Set up JDK 11
103+
- name: Set up JDK
99104
uses: actions/setup-java@v3
100105
with:
101-
java-version: 11
106+
java-version: 17
102107
distribution: temurin
103108
cache: maven
104109
- name: Maven tests

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ jobs:
4040
- name: Checkout repository
4141
uses: actions/checkout@v3
4242

43+
- name: Set up JDK
44+
uses: actions/setup-java@v3
45+
with:
46+
java-version: 17
47+
distribution: temurin
48+
4349
# Initializes the CodeQL tools for scanning.
4450
- name: Initialize CodeQL
4551
uses: github/codeql-action/init@v2

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/setup-java@v3
3232
with:
3333
distribution: "temurin"
34-
java-version: 11
34+
java-version: 17
3535
server-id: ossrh
3636
server-username: MAVEN_USERNAME
3737
server-password: MAVEN_PASSWORD
@@ -48,7 +48,7 @@ jobs:
4848
# - uses: actions/setup-java@v3
4949
# with:
5050
# distribution: "temurin"
51-
# java-version: 11
51+
# java-version: 17
5252
# gpg-passphrase: MAVEN_GPG_PASSPHRASE
5353
# - name: GitHub Release
5454
# run: mvn --batch-mode clean compile source:jar javadoc:jar deploy -P github,release -DskipTests

.github/workflows/snaphots.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-java@v3
1919
with:
2020
distribution: "temurin"
21-
java-version: 11
21+
java-version: 17
2222
cache: maven
2323
- name: Build with Maven
2424
run: mvn verify
@@ -35,7 +35,7 @@ jobs:
3535
- uses: actions/setup-java@v3
3636
with:
3737
distribution: "temurin"
38-
java-version: 11
38+
java-version: 17
3939
cache: maven
4040
server-id: ossrh
4141
server-username: MAVEN_USERNAME

.github/workflows/sonar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-java@v3
1919
with:
2020
distribution: "temurin"
21-
java-version: 11
21+
java-version: 17
2222
cache: maven
2323
- name: Build with Maven and Coverage/Sonar
2424
run: mvn verify -P coverage,sonar

core/pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@
4747
</dependencyManagement>
4848

4949
<dependencies>
50+
<!-- TODO Remove this dependency when-->
51+
<dependency>
52+
<groupId>jakarta.xml.bind</groupId>
53+
<artifactId>jakarta.xml.bind-api</artifactId>
54+
<version>3.0.1</version>
55+
</dependency>
56+
5057
<dependency>
5158
<groupId>org.projectlombok</groupId>
5259
<artifactId>lombok</artifactId>
@@ -144,7 +151,7 @@
144151
<plugin>
145152
<groupId>org.apache.cxf</groupId>
146153
<artifactId>cxf-codegen-plugin</artifactId>
147-
<version>3.5.5</version>
154+
<version>4.0.0</version>
148155
<executions>
149156
<execution>
150157
<phase>generate-sources</phase>

core/src/main/java/io/github/project/openubl/xsender/camel/utils/CamelUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.w3c.dom.Document;
3232
import org.w3c.dom.Element;
3333

34-
import javax.activation.DataHandler;
35-
import javax.activation.DataSource;
34+
import jakarta.activation.DataHandler;
35+
import jakarta.activation.DataSource;
3636
import javax.xml.namespace.QName;
3737
import java.util.Arrays;
3838
import java.util.Base64;

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<packaging>pom</packaging>
3131

3232
<properties>
33-
<maven.compiler.source>11</maven.compiler.source>
34-
<maven.compiler.target>11</maven.compiler.target>
33+
<maven.compiler.source>17</maven.compiler.source>
34+
<maven.compiler.target>17</maven.compiler.target>
3535
<maven.compiler.release>11</maven.compiler.release>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -45,9 +45,9 @@
4545
<license.dir>${basedir}</license.dir>
4646

4747
<lombok.version>1.18.26</lombok.version>
48-
<quarkus.version>2.16.6.Final</quarkus.version>
49-
<camel.version>3.20.3</camel.version>
50-
<springboot.version>2.7.9</springboot.version>
48+
<quarkus.version>3.0.2.Final</quarkus.version>
49+
<camel.version>4.0.0-M3</camel.version>
50+
<springboot.version>3.0.6</springboot.version>
5151
</properties>
5252

5353
<url>https://project-openubl.github.io/</url>

quarkus-extension/integration-tests/src/main/java/io/github/project/openubl/quarkus/xsender/it/QuarkusXSenderResource.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
import org.apache.camel.CamelExecutionException;
3131
import org.apache.camel.ProducerTemplate;
3232

33-
import javax.enterprise.context.ApplicationScoped;
34-
import javax.inject.Inject;
35-
import javax.ws.rs.POST;
36-
import javax.ws.rs.Path;
33+
import jakarta.enterprise.context.ApplicationScoped;
34+
import jakarta.inject.Inject;
35+
import jakarta.ws.rs.POST;
36+
import jakarta.ws.rs.Path;
3737
import java.io.InputStream;
3838

3939
import static io.github.project.openubl.xsender.camel.utils.CamelUtils.getBillConsultService;

quarkus-extension/runtime/src/main/java/io/github/project/openubl/quarkus/xsender/XSender.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import io.github.project.openubl.xsender.camel.routes.CxfEndpointConfiguration;
2121
import org.apache.camel.component.cxf.jaxws.CxfEndpoint;
2222

23-
import javax.enterprise.context.ApplicationScoped;
24-
import javax.enterprise.inject.Produces;
25-
import javax.inject.Inject;
26-
import javax.inject.Named;
23+
import jakarta.enterprise.context.ApplicationScoped;
24+
import jakarta.enterprise.inject.Produces;
25+
import jakarta.inject.Inject;
26+
import jakarta.inject.Named;
2727

2828
public class XSender {
2929

0 commit comments

Comments
 (0)