Skip to content

feat: Jakarta migration #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -35,10 +36,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [ 11, 17 ]
java-version: [ 17 ]
fail-fast: false
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java-version }}
Expand All @@ -54,13 +56,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
quarkus-version: [ 2.14.3.Final, 2.12.3.Final ]
quarkus-version: [ 3.0.1.Final ]
fail-fast: false
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: Maven tests
Expand All @@ -73,10 +76,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [ 11, 17 ]
java-version: [ 17 ]
fail-fast: false
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java-version }}
Expand All @@ -92,13 +96,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
springboot-version: [ 2.7.5, 2.7.0 ]
springboot-version: [ 3.0.0 ]
fail-fast: false
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: Maven tests
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,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
Expand All @@ -48,7 +48,7 @@ jobs:
# - uses: actions/setup-java@v3
# with:
# distribution: "temurin"
# java-version: 11
# java-version: 17
# gpg-passphrase: MAVEN_GPG_PASSPHRASE
# - name: GitHub Release
# run: mvn --batch-mode clean compile source:jar javadoc:jar deploy -P github,release -DskipTests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snaphots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 9 additions & 2 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>io.github.project-openubl</groupId>
<artifactId>xsender-parent</artifactId>
<version>4.1.6-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -47,6 +47,13 @@
</dependencyManagement>

<dependencies>
<!-- TODO Remove this dependency when-->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>3.0.1</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand Down Expand Up @@ -144,7 +151,7 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>3.5.5</version>
<version>4.0.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;

import javax.activation.DataHandler;
import javax.activation.DataSource;
import jakarta.activation.DataHandler;
import jakarta.activation.DataSource;
import javax.xml.namespace.QName;
import java.util.Arrays;
import java.util.Base64;
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@

<groupId>io.github.project-openubl</groupId>
<artifactId>xsender-parent</artifactId>
<version>4.1.6-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>

<name>XSender - Parent</name>
<description>Java library for sending XML files to SUNAT</description>
<packaging>pom</packaging>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand All @@ -45,9 +45,9 @@
<license.dir>${basedir}</license.dir>

<lombok.version>1.18.26</lombok.version>
<quarkus.version>2.16.6.Final</quarkus.version>
<camel.version>3.20.3</camel.version>
<springboot.version>2.7.9</springboot.version>
<quarkus.version>3.0.2.Final</quarkus.version>
<camel.version>4.0.0-M3</camel.version>
<springboot.version>3.0.6</springboot.version>
</properties>

<url>https://project-openubl.github.io/</url>
Expand Down
2 changes: 1 addition & 1 deletion quarkus-extension/deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>io.github.project-openubl</groupId>
<artifactId>quarkus-xsender-parent</artifactId>
<version>4.1.6-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>quarkus-xsender-deployment</artifactId>
<name>Quarkus XSender - Deployment</name>
Expand Down
2 changes: 1 addition & 1 deletion quarkus-extension/integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>io.github.project-openubl</groupId>
<artifactId>quarkus-xsender-parent</artifactId>
<version>4.1.6-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>quarkus-xsender-integration-tests</artifactId>
<name>Quarkus XSender - Integration Tests</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ProducerTemplate;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import java.io.InputStream;

import static io.github.project.openubl.xsender.camel.utils.CamelUtils.getBillConsultService;
Expand Down
2 changes: 1 addition & 1 deletion quarkus-extension/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>io.github.project-openubl</groupId>
<artifactId>xsender-parent</artifactId>
<version>4.1.6-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion quarkus-extension/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>io.github.project-openubl</groupId>
<artifactId>quarkus-xsender-parent</artifactId>
<version>4.1.6-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>quarkus-xsender</artifactId>
<name>Quarkus XSender - Runtime</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import io.github.project.openubl.xsender.camel.routes.CxfEndpointConfiguration;
import org.apache.camel.component.cxf.jaxws.CxfEndpoint;

import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
import javax.inject.Named;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;
import jakarta.inject.Named;

public class XSender {

Expand Down
2 changes: 1 addition & 1 deletion spring-boot-extension/integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>io.github.project-openubl</groupId>
<artifactId>spring-boot-xsender-parent</artifactId>
<version>4.1.6-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>spring-boot-xsender-integration-tests</artifactId>
<name>Spring Boot XSender - Integration Tests</name>
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-extension/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>io.github.project-openubl</groupId>
<artifactId>xsender-parent</artifactId>
<version>4.1.6-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion spring-boot-extension/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>io.github.project-openubl</groupId>
<artifactId>spring-boot-xsender-parent</artifactId>
<version>4.1.6-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>spring-boot-xsender</artifactId>
<name>Spring Boot XSender - Runtime</name>
Expand Down