Skip to content

Commit e6a59e7

Browse files
feat: Quarkus 3 and Jakarta migration (#229)
1 parent 3d67f23 commit e6a59e7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+207
-174
lines changed

.github/workflows/ci.yml

Lines changed: 24 additions & 3 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
@@ -34,13 +35,33 @@ jobs:
3435
runs-on: ubuntu-latest
3536
steps:
3637
- uses: actions/checkout@v3
37-
- name: Set up JDK 11
38+
- name: Set up JDK
3839
uses: actions/setup-java@v3
3940
with:
40-
java-version: 11
41+
java-version: 17
4142
distribution: temurin
4243
cache: maven
4344
- name: Build with Maven
4445
run: mvn -Pnative install
4546
- name: Build with Maven
4647
run: mvn -Pnative-image install -f quarkus-extension/integration-tests/
48+
49+
quarkus-supported-v:
50+
needs: [ quarkus-extension ]
51+
runs-on: ubuntu-latest
52+
strategy:
53+
matrix:
54+
quarkus-version: [ 3.0.1.Final ]
55+
fail-fast: false
56+
steps:
57+
- uses: actions/checkout@v3
58+
- name: Set up JDK
59+
uses: actions/setup-java@v3
60+
with:
61+
java-version: 17
62+
distribution: temurin
63+
cache: maven
64+
- name: Maven tests
65+
run: mvn -Pnative install
66+
- name: Maven IT tests
67+
run: mvn -Pnative-image install -f quarkus-extension/integration-tests/ -Dquarkus.version=${{ matrix.quarkus-version }}

.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: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ on:
99
next:
1010
description: "Next version"
1111
required: false
12+
branch:
13+
description: "The branch to use when releasing"
14+
required: true
15+
default: "master"
16+
type: string
1217

1318
jobs:
1419
release:
@@ -17,6 +22,7 @@ jobs:
1722
- uses: actions/checkout@v3
1823
with:
1924
fetch-depth: 0
25+
ref: ${{ github.event.inputs.branch }}
2026
- name: Set release version
2127
env:
2228
RELEASE_VERSION: ${{ github.event.inputs.version }}
@@ -31,7 +37,7 @@ jobs:
3137
- uses: actions/setup-java@v3
3238
with:
3339
distribution: "temurin"
34-
java-version: 11
40+
java-version: 17
3541
server-id: ossrh
3642
server-username: MAVEN_USERNAME
3743
server-password: MAVEN_PASSWORD

.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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>io.github.project-openubl</groupId>
2626
<artifactId>xbuilder-parent</artifactId>
27-
<version>2.0.2-SNAPSHOT</version>
27+
<version>3.0.0-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>jakarta.xml.bind</groupId>
8282
<artifactId>jakarta.xml.bind-api</artifactId>
83-
<version>2.3.3</version>
83+
<version>3.0.1</version>
8484
</dependency>
8585
<!-- <dependency>-->
8686
<!-- <groupId>org.glassfish.jaxb</groupId>-->
@@ -106,7 +106,7 @@
106106
<dependency>
107107
<groupId>com.sun.xml.bind</groupId>
108108
<artifactId>jaxb-impl</artifactId>
109-
<version>2.3.8</version>
109+
<version>3.0.0</version>
110110
</dependency>
111111

112112
<dependency>

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/adapters/LocalDateAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package io.github.project.openubl.xbuilder.content.jaxb.adapters;
1818

19-
import javax.xml.bind.annotation.adapters.XmlAdapter;
19+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
2020
import java.time.LocalDate;
2121

2222
public class LocalDateAdapter extends XmlAdapter<String, LocalDate> {

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/adapters/LocalTimeAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package io.github.project.openubl.xbuilder.content.jaxb.adapters;
1818

19-
import javax.xml.bind.annotation.adapters.XmlAdapter;
19+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
2020
import java.time.LocalTime;
2121

2222
public class LocalTimeAdapter extends XmlAdapter<String, LocalTime> {

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLAddress.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import lombok.Data;
2020
import lombok.NoArgsConstructor;
2121

22-
import javax.xml.bind.annotation.XmlAccessType;
23-
import javax.xml.bind.annotation.XmlAccessorType;
24-
import javax.xml.bind.annotation.XmlElement;
25-
import javax.xml.bind.annotation.XmlType;
22+
import jakarta.xml.bind.annotation.XmlAccessType;
23+
import jakarta.xml.bind.annotation.XmlAccessorType;
24+
import jakarta.xml.bind.annotation.XmlElement;
25+
import jakarta.xml.bind.annotation.XmlType;
2626

2727
@XmlAccessorType(XmlAccessType.NONE)
2828
@XmlType(name = "RegistrationAddress")

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLContact.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import lombok.Data;
2020
import lombok.NoArgsConstructor;
2121

22-
import javax.xml.bind.annotation.XmlAccessType;
23-
import javax.xml.bind.annotation.XmlAccessorType;
24-
import javax.xml.bind.annotation.XmlElement;
25-
import javax.xml.bind.annotation.XmlType;
22+
import jakarta.xml.bind.annotation.XmlAccessType;
23+
import jakarta.xml.bind.annotation.XmlAccessorType;
24+
import jakarta.xml.bind.annotation.XmlElement;
25+
import jakarta.xml.bind.annotation.XmlType;
2626

2727
@XmlAccessorType(XmlAccessType.NONE)
2828
@XmlType(name = "Contact")

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCreditNote.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import lombok.EqualsAndHashCode;
2121
import lombok.NoArgsConstructor;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlElement;
26-
import javax.xml.bind.annotation.XmlRootElement;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlElement;
26+
import jakarta.xml.bind.annotation.XmlRootElement;
2727
import java.util.List;
2828

2929
@XmlAccessorType(XmlAccessType.NONE)

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCreditNoteLine.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import lombok.EqualsAndHashCode;
2121
import lombok.NoArgsConstructor;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlAttribute;
26-
import javax.xml.bind.annotation.XmlElement;
27-
import javax.xml.bind.annotation.XmlType;
28-
import javax.xml.bind.annotation.XmlValue;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlAttribute;
26+
import jakarta.xml.bind.annotation.XmlElement;
27+
import jakarta.xml.bind.annotation.XmlType;
28+
import jakarta.xml.bind.annotation.XmlValue;
2929
import java.math.BigDecimal;
3030

3131
@XmlType(name = "CreditNoteDocumentLine")

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCustomer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import lombok.Data;
2020
import lombok.NoArgsConstructor;
2121

22-
import javax.xml.bind.annotation.XmlAccessType;
23-
import javax.xml.bind.annotation.XmlAccessorType;
24-
import javax.xml.bind.annotation.XmlAttribute;
25-
import javax.xml.bind.annotation.XmlElement;
26-
import javax.xml.bind.annotation.XmlType;
27-
import javax.xml.bind.annotation.XmlValue;
22+
import jakarta.xml.bind.annotation.XmlAccessType;
23+
import jakarta.xml.bind.annotation.XmlAccessorType;
24+
import jakarta.xml.bind.annotation.XmlAttribute;
25+
import jakarta.xml.bind.annotation.XmlElement;
26+
import jakarta.xml.bind.annotation.XmlType;
27+
import jakarta.xml.bind.annotation.XmlValue;
2828

2929
@XmlAccessorType(XmlAccessType.NONE)
3030
@XmlType(name = "Customer.Party")

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDebitNote.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import lombok.EqualsAndHashCode;
2121
import lombok.NoArgsConstructor;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlElement;
26-
import javax.xml.bind.annotation.XmlRootElement;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlElement;
26+
import jakarta.xml.bind.annotation.XmlRootElement;
2727
import java.util.List;
2828

2929
@XmlAccessorType(XmlAccessType.NONE)

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDebitNoteLine.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import lombok.EqualsAndHashCode;
2121
import lombok.NoArgsConstructor;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlAttribute;
26-
import javax.xml.bind.annotation.XmlElement;
27-
import javax.xml.bind.annotation.XmlType;
28-
import javax.xml.bind.annotation.XmlValue;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlAttribute;
26+
import jakarta.xml.bind.annotation.XmlElement;
27+
import jakarta.xml.bind.annotation.XmlType;
28+
import jakarta.xml.bind.annotation.XmlValue;
2929
import java.math.BigDecimal;
3030

3131
@XmlType(name = "DebitNoteDocumentLine")

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDespatchAdvice.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import lombok.Data;
2222
import lombok.NoArgsConstructor;
2323

24-
import javax.xml.bind.annotation.XmlAccessType;
25-
import javax.xml.bind.annotation.XmlAccessorType;
26-
import javax.xml.bind.annotation.XmlAttribute;
27-
import javax.xml.bind.annotation.XmlElement;
28-
import javax.xml.bind.annotation.XmlRootElement;
29-
import javax.xml.bind.annotation.XmlType;
30-
import javax.xml.bind.annotation.XmlValue;
31-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
24+
import jakarta.xml.bind.annotation.XmlAccessType;
25+
import jakarta.xml.bind.annotation.XmlAccessorType;
26+
import jakarta.xml.bind.annotation.XmlAttribute;
27+
import jakarta.xml.bind.annotation.XmlElement;
28+
import jakarta.xml.bind.annotation.XmlRootElement;
29+
import jakarta.xml.bind.annotation.XmlType;
30+
import jakarta.xml.bind.annotation.XmlValue;
31+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
3232
import java.math.BigDecimal;
3333
import java.time.LocalDate;
3434
import java.time.LocalTime;

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDespatchAdviceLine.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import lombok.Data;
2020
import lombok.NoArgsConstructor;
2121

22-
import javax.xml.bind.annotation.XmlAccessType;
23-
import javax.xml.bind.annotation.XmlAccessorType;
24-
import javax.xml.bind.annotation.XmlAttribute;
25-
import javax.xml.bind.annotation.XmlElement;
26-
import javax.xml.bind.annotation.XmlType;
27-
import javax.xml.bind.annotation.XmlValue;
22+
import jakarta.xml.bind.annotation.XmlAccessType;
23+
import jakarta.xml.bind.annotation.XmlAccessorType;
24+
import jakarta.xml.bind.annotation.XmlAttribute;
25+
import jakarta.xml.bind.annotation.XmlElement;
26+
import jakarta.xml.bind.annotation.XmlType;
27+
import jakarta.xml.bind.annotation.XmlValue;
2828

2929
@XmlType(name = "DespatchAdviceLine")
3030
@XmlAccessorType(XmlAccessType.NONE)

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLInvoice.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import lombok.EqualsAndHashCode;
2121
import lombok.NoArgsConstructor;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlElement;
26-
import javax.xml.bind.annotation.XmlRootElement;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlElement;
26+
import jakarta.xml.bind.annotation.XmlRootElement;
2727
import java.util.List;
2828

2929
@XmlAccessorType(XmlAccessType.NONE)

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLInvoiceLine.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import lombok.EqualsAndHashCode;
2121
import lombok.NoArgsConstructor;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlAttribute;
26-
import javax.xml.bind.annotation.XmlElement;
27-
import javax.xml.bind.annotation.XmlType;
28-
import javax.xml.bind.annotation.XmlValue;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlAttribute;
26+
import jakarta.xml.bind.annotation.XmlElement;
27+
import jakarta.xml.bind.annotation.XmlType;
28+
import jakarta.xml.bind.annotation.XmlValue;
2929
import java.math.BigDecimal;
3030

3131
@XmlType(name = "InvoiceDocumentLine")

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcion.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import lombok.EqualsAndHashCode;
2121
import lombok.NoArgsConstructor;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlElement;
26-
import javax.xml.bind.annotation.XmlRootElement;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlElement;
26+
import jakarta.xml.bind.annotation.XmlRootElement;
2727
import java.math.BigDecimal;
2828

2929
@XmlAccessorType(XmlAccessType.NONE)

core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionRetencionBase.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
import lombok.Data;
2121
import lombok.NoArgsConstructor;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlAttribute;
26-
import javax.xml.bind.annotation.XmlElement;
27-
import javax.xml.bind.annotation.XmlType;
28-
import javax.xml.bind.annotation.XmlValue;
29-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlAttribute;
26+
import jakarta.xml.bind.annotation.XmlElement;
27+
import jakarta.xml.bind.annotation.XmlType;
28+
import jakarta.xml.bind.annotation.XmlValue;
29+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
3030
import java.math.BigDecimal;
3131
import java.time.LocalDate;
3232

0 commit comments

Comments
 (0)