From babf5dd2703aa013402e941e9b6771df60c9dccf Mon Sep 17 00:00:00 2001 From: carlosthe19916 <2582866+carlosthe19916@users.noreply.github.com> Date: Wed, 10 May 2023 14:17:37 +0200 Subject: [PATCH 1/2] Prepare Next version 3.0.x --- core/pom.xml | 2 +- pom.xml | 2 +- quarkus-extension/deployment/pom.xml | 2 +- quarkus-extension/integration-tests/pom.xml | 2 +- quarkus-extension/pom.xml | 2 +- quarkus-extension/runtime/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 15775c0b..2995860c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ io.github.project-openubl xbuilder-parent - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 46d123c3..0d6d2575 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.github.project-openubl xbuilder-parent - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT XBuilder - Parent XBuilder parent diff --git a/quarkus-extension/deployment/pom.xml b/quarkus-extension/deployment/pom.xml index 199ef4f3..2f998af2 100644 --- a/quarkus-extension/deployment/pom.xml +++ b/quarkus-extension/deployment/pom.xml @@ -24,7 +24,7 @@ io.github.project-openubl quarkus-xbuilder-parent - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT quarkus-xbuilder-deployment Quarkus Xbuilder - Deployment diff --git a/quarkus-extension/integration-tests/pom.xml b/quarkus-extension/integration-tests/pom.xml index a02aea69..127f53a6 100644 --- a/quarkus-extension/integration-tests/pom.xml +++ b/quarkus-extension/integration-tests/pom.xml @@ -24,7 +24,7 @@ io.github.project-openubl quarkus-xbuilder-parent - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT quarkus-xbuilder-integration-tests Quarkus Xbuilder - Integration Tests diff --git a/quarkus-extension/pom.xml b/quarkus-extension/pom.xml index cc5c77c4..b6b83b1a 100644 --- a/quarkus-extension/pom.xml +++ b/quarkus-extension/pom.xml @@ -25,7 +25,7 @@ io.github.project-openubl xbuilder-parent - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml diff --git a/quarkus-extension/runtime/pom.xml b/quarkus-extension/runtime/pom.xml index 607feb8e..aadac054 100644 --- a/quarkus-extension/runtime/pom.xml +++ b/quarkus-extension/runtime/pom.xml @@ -24,7 +24,7 @@ io.github.project-openubl quarkus-xbuilder-parent - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT quarkus-xbuilder Quarkus Xbuilder - Runtime From cd38e36981c07bad5cf2c0397ee1d6046da80cd8 Mon Sep 17 00:00:00 2001 From: carlosthe19916 <2582866+carlosthe19916@users.noreply.github.com> Date: Wed, 10 May 2023 22:03:36 +0200 Subject: [PATCH 2/2] Migrate jakarta --- .github/workflows/ci.yml | 27 ++++++++++++++++--- .github/workflows/codeql-analysis.yml | 6 +++++ .github/workflows/release.yml | 8 +++++- .github/workflows/snaphots.yml | 4 +-- .github/workflows/sonar.yml | 2 +- core/pom.xml | 4 +-- .../jaxb/adapters/LocalDateAdapter.java | 2 +- .../jaxb/adapters/LocalTimeAdapter.java | 2 +- .../content/jaxb/models/XMLAddress.java | 8 +++--- .../content/jaxb/models/XMLContact.java | 8 +++--- .../content/jaxb/models/XMLCreditNote.java | 8 +++--- .../jaxb/models/XMLCreditNoteLine.java | 12 ++++----- .../content/jaxb/models/XMLCustomer.java | 12 ++++----- .../content/jaxb/models/XMLDebitNote.java | 8 +++--- .../content/jaxb/models/XMLDebitNoteLine.java | 12 ++++----- .../jaxb/models/XMLDespatchAdvice.java | 16 +++++------ .../jaxb/models/XMLDespatchAdviceLine.java | 12 ++++----- .../content/jaxb/models/XMLInvoice.java | 8 +++--- .../content/jaxb/models/XMLInvoiceLine.java | 12 ++++----- .../content/jaxb/models/XMLPercepcion.java | 8 +++--- .../models/XMLPercepcionRetencionBase.java | 14 +++++----- ...onRetencionSunatDocumentReferenceBase.java | 14 +++++----- .../XMLPercepcionSunatDocumentReference.java | 10 +++---- .../content/jaxb/models/XMLRetention.java | 8 +++--- .../XMLRetentionSunatDocumentReference.java | 10 +++---- .../content/jaxb/models/XMLSalesDocument.java | 14 +++++----- .../jaxb/models/XMLSalesDocumentLine.java | 8 +++--- .../content/jaxb/models/XMLSignature.java | 8 +++--- .../jaxb/models/XMLSummaryDocuments.java | 8 +++--- .../jaxb/models/XMLSummaryDocumentsLine.java | 12 ++++----- .../content/jaxb/models/XMLSunatDocument.java | 10 +++---- .../content/jaxb/models/XMLSupplier.java | 8 +++--- .../content/jaxb/models/XMLSupplierSunat.java | 8 +++--- .../jaxb/models/XMLVoidedDocuments.java | 8 +++--- .../jaxb/models/XMLVoidedDocumentsLine.java | 8 +++--- .../content/jaxb/models/package-info.java | 6 ++--- core/src/test/java/e2e/AbstractTest.java | 2 +- pom.xml | 10 +++---- .../xbuilder/it/QuarkusXbuilderResource.java | 18 ++++++------- .../xbuilder/runtime/DefaultXBuilder.java | 6 ++--- 40 files changed, 201 insertions(+), 168 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39d34ee1..24e43148 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,8 @@ jobs: name: JDK ${{matrix.java-version}} JVM Tests strategy: matrix: - java-version: [ 11, 17 ] + java-version: [ 17 ] + fail-fast: false runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -34,13 +35,33 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: temurin cache: maven - name: Build with Maven run: mvn -Pnative install - name: Build with Maven run: mvn -Pnative-image install -f quarkus-extension/integration-tests/ + + quarkus-supported-v: + needs: [ quarkus-extension ] + runs-on: ubuntu-latest + strategy: + matrix: + quarkus-version: [ 3.0.1.Final ] + fail-fast: false + steps: + - uses: actions/checkout@v3 + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + cache: maven + - name: Maven tests + run: mvn -Pnative install + - name: Maven IT tests + run: mvn -Pnative-image install -f quarkus-extension/integration-tests/ -Dquarkus.version=${{ matrix.quarkus-version }} \ No newline at end of file diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0880f716..2362ce16 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -40,6 +40,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f7c1c0df..6318cf93 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,6 +9,11 @@ on: next: description: "Next version" required: false + branch: + description: "The branch to use when releasing" + required: true + default: "master" + type: string jobs: release: @@ -17,6 +22,7 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 + ref: ${{ github.event.inputs.branch }} - name: Set release version env: RELEASE_VERSION: ${{ github.event.inputs.version }} @@ -31,7 +37,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: "temurin" - java-version: 11 + java-version: 17 server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD diff --git a/.github/workflows/snaphots.yml b/.github/workflows/snaphots.yml index f79f69c7..741a6385 100644 --- a/.github/workflows/snaphots.yml +++ b/.github/workflows/snaphots.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: "temurin" - java-version: 11 + java-version: 17 cache: maven - name: Build with Maven run: mvn verify @@ -35,7 +35,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: "temurin" - java-version: 11 + java-version: 17 cache: maven server-id: ossrh server-username: MAVEN_USERNAME diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 1fffe955..7209c53c 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: "temurin" - java-version: 11 + java-version: 17 cache: maven - name: Build with Maven and Coverage/Sonar run: mvn verify -P coverage,sonar diff --git a/core/pom.xml b/core/pom.xml index 2995860c..3c87eb94 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -80,7 +80,7 @@ jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 + 3.0.1 @@ -106,7 +106,7 @@ com.sun.xml.bind jaxb-impl - 2.3.8 + 3.0.0 diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/adapters/LocalDateAdapter.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/adapters/LocalDateAdapter.java index fc5d5769..40435449 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/adapters/LocalDateAdapter.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/adapters/LocalDateAdapter.java @@ -16,7 +16,7 @@ */ package io.github.project.openubl.xbuilder.content.jaxb.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.LocalDate; public class LocalDateAdapter extends XmlAdapter { diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/adapters/LocalTimeAdapter.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/adapters/LocalTimeAdapter.java index 1e1dcd9d..60fca625 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/adapters/LocalTimeAdapter.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/adapters/LocalTimeAdapter.java @@ -16,7 +16,7 @@ */ package io.github.project.openubl.xbuilder.content.jaxb.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.LocalTime; public class LocalTimeAdapter extends XmlAdapter { diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLAddress.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLAddress.java index 2893ab89..59e951af 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLAddress.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLAddress.java @@ -19,10 +19,10 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.NONE) @XmlType(name = "RegistrationAddress") diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLContact.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLContact.java index e08444f4..c4bf9ab6 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLContact.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLContact.java @@ -19,10 +19,10 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.NONE) @XmlType(name = "Contact") diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCreditNote.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCreditNote.java index 44dacd64..7ecdb9f7 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCreditNote.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCreditNote.java @@ -20,10 +20,10 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; @XmlAccessorType(XmlAccessType.NONE) diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCreditNoteLine.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCreditNoteLine.java index 62955efc..80cb5b7a 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCreditNoteLine.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCreditNoteLine.java @@ -20,12 +20,12 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.math.BigDecimal; @XmlType(name = "CreditNoteDocumentLine") diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCustomer.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCustomer.java index 2c003deb..a92b46a1 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCustomer.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLCustomer.java @@ -19,12 +19,12 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; @XmlAccessorType(XmlAccessType.NONE) @XmlType(name = "Customer.Party") diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDebitNote.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDebitNote.java index ff9fd63f..97ee334a 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDebitNote.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDebitNote.java @@ -20,10 +20,10 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; @XmlAccessorType(XmlAccessType.NONE) diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDebitNoteLine.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDebitNoteLine.java index 9541618d..e9aff993 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDebitNoteLine.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDebitNoteLine.java @@ -20,12 +20,12 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.math.BigDecimal; @XmlType(name = "DebitNoteDocumentLine") diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDespatchAdvice.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDespatchAdvice.java index cd23a0a5..da988f0a 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDespatchAdvice.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDespatchAdvice.java @@ -21,14 +21,14 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalTime; diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDespatchAdviceLine.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDespatchAdviceLine.java index 277caefc..a1ac355f 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDespatchAdviceLine.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLDespatchAdviceLine.java @@ -19,12 +19,12 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; @XmlType(name = "DespatchAdviceLine") @XmlAccessorType(XmlAccessType.NONE) diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLInvoice.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLInvoice.java index 577f929b..536f2bb0 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLInvoice.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLInvoice.java @@ -20,10 +20,10 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; @XmlAccessorType(XmlAccessType.NONE) diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLInvoiceLine.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLInvoiceLine.java index afda7e4a..efd2e671 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLInvoiceLine.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLInvoiceLine.java @@ -20,12 +20,12 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.math.BigDecimal; @XmlType(name = "InvoiceDocumentLine") diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcion.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcion.java index 2952a4de..c5bdf97a 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcion.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcion.java @@ -20,10 +20,10 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.math.BigDecimal; @XmlAccessorType(XmlAccessType.NONE) diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionRetencionBase.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionRetencionBase.java index ea41bc2e..1b7c3a54 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionRetencionBase.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionRetencionBase.java @@ -20,13 +20,13 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionRetencionSunatDocumentReferenceBase.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionRetencionSunatDocumentReferenceBase.java index 0b17dfd1..15ee5264 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionRetencionSunatDocumentReferenceBase.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionRetencionSunatDocumentReferenceBase.java @@ -20,13 +20,13 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionSunatDocumentReference.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionSunatDocumentReference.java index 85743adf..626da9e9 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionSunatDocumentReference.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLPercepcionSunatDocumentReference.java @@ -21,11 +21,11 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLRetention.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLRetention.java index 4628cc0b..35003e2c 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLRetention.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLRetention.java @@ -20,10 +20,10 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.math.BigDecimal; @XmlAccessorType(XmlAccessType.NONE) diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLRetentionSunatDocumentReference.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLRetentionSunatDocumentReference.java index 412eddef..0ccade14 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLRetentionSunatDocumentReference.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLRetentionSunatDocumentReference.java @@ -21,11 +21,11 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSalesDocument.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSalesDocument.java index 972867d4..95193de1 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSalesDocument.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSalesDocument.java @@ -21,13 +21,13 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalTime; diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSalesDocumentLine.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSalesDocumentLine.java index a0930875..c209ca8c 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSalesDocumentLine.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSalesDocumentLine.java @@ -19,10 +19,10 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.math.BigDecimal; import java.util.List; diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSignature.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSignature.java index 5535ce09..045c159e 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSignature.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSignature.java @@ -19,10 +19,10 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.NONE) @XmlType(name = "Signature") diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSummaryDocuments.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSummaryDocuments.java index 8d93f596..531f6685 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSummaryDocuments.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSummaryDocuments.java @@ -20,10 +20,10 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; @XmlAccessorType(XmlAccessType.NONE) diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSummaryDocumentsLine.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSummaryDocumentsLine.java index f1fca806..6a020e97 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSummaryDocumentsLine.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSummaryDocumentsLine.java @@ -19,12 +19,12 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.math.BigDecimal; import java.util.List; diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSunatDocument.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSunatDocument.java index 5c437281..d32c0732 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSunatDocument.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSunatDocument.java @@ -20,11 +20,11 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.time.LocalDate; @XmlType(name = "SunatDocument") diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSupplier.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSupplier.java index a7b7d26c..5b5eb4ac 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSupplier.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSupplier.java @@ -19,10 +19,10 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.NONE) @XmlType(name = "Supplier.Party") diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSupplierSunat.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSupplierSunat.java index 3a811399..d582cafe 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSupplierSunat.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLSupplierSunat.java @@ -19,10 +19,10 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.NONE) @XmlType(name = "SupplierSunat") diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLVoidedDocuments.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLVoidedDocuments.java index 3bb9b8c1..b799e32f 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLVoidedDocuments.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLVoidedDocuments.java @@ -20,10 +20,10 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; @XmlAccessorType(XmlAccessType.NONE) diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLVoidedDocumentsLine.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLVoidedDocumentsLine.java index 2af33ff5..e3e2300b 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLVoidedDocumentsLine.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/XMLVoidedDocumentsLine.java @@ -19,10 +19,10 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlType(name = "VoidedDocumentsLine") @XmlAccessorType(XmlAccessType.NONE) diff --git a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/package-info.java b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/package-info.java index c7e5f8b0..479bd55c 100644 --- a/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/package-info.java +++ b/core/src/main/java/io/github/project/openubl/xbuilder/content/jaxb/models/package-info.java @@ -25,6 +25,6 @@ ) package io.github.project.openubl.xbuilder.content.jaxb.models; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; \ No newline at end of file +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; \ No newline at end of file diff --git a/core/src/test/java/e2e/AbstractTest.java b/core/src/test/java/e2e/AbstractTest.java index 50446d6c..c8e92a81 100644 --- a/core/src/test/java/e2e/AbstractTest.java +++ b/core/src/test/java/e2e/AbstractTest.java @@ -55,7 +55,7 @@ import org.mapstruct.factory.Mappers; import org.xml.sax.InputSource; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import java.io.IOException; import java.io.StringReader; import java.math.BigDecimal; diff --git a/pom.xml b/pom.xml index 0d6d2575..2fd92c47 100644 --- a/pom.xml +++ b/pom.xml @@ -30,9 +30,9 @@ pom - 11 - 11 - 11 + 17 + 17 + 17 UTF-8 UTF-8 @@ -46,9 +46,9 @@ 1.18.26 1.5.4.Final - 2.16.6.Final + 3.0.2.Final 2.9.1 - 4.1.3 + 5.0.0.Beta1 https://project-openubl.github.io/ diff --git a/quarkus-extension/integration-tests/src/main/java/io/github/project/openubl/quarkus/xbuilder/it/QuarkusXbuilderResource.java b/quarkus-extension/integration-tests/src/main/java/io/github/project/openubl/quarkus/xbuilder/it/QuarkusXbuilderResource.java index b8a35b22..289af807 100644 --- a/quarkus-extension/integration-tests/src/main/java/io/github/project/openubl/quarkus/xbuilder/it/QuarkusXbuilderResource.java +++ b/quarkus-extension/integration-tests/src/main/java/io/github/project/openubl/quarkus/xbuilder/it/QuarkusXbuilderResource.java @@ -47,15 +47,15 @@ import org.mapstruct.factory.Mappers; import org.xml.sax.InputSource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import java.io.IOException; import java.io.StringReader; import java.nio.file.Files; diff --git a/quarkus-extension/runtime/src/main/java/io/github/project/openubl/quarkus/xbuilder/runtime/DefaultXBuilder.java b/quarkus-extension/runtime/src/main/java/io/github/project/openubl/quarkus/xbuilder/runtime/DefaultXBuilder.java index c8c982da..cfb24a94 100644 --- a/quarkus-extension/runtime/src/main/java/io/github/project/openubl/quarkus/xbuilder/runtime/DefaultXBuilder.java +++ b/quarkus-extension/runtime/src/main/java/io/github/project/openubl/quarkus/xbuilder/runtime/DefaultXBuilder.java @@ -24,9 +24,9 @@ import io.quarkus.qute.HtmlEscaper; import io.quarkus.qute.Template; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.math.BigDecimal; import java.util.List;