diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 0923d2a..1192093 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 17 uses: actions/setup-java@v3 diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 1daef8d..5bb3ae0 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -16,7 +16,7 @@ jobs: packages: write steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Extract tag name id: extract_tagname diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index 9ebd56d..b89fda9 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -11,6 +11,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: REUSE Compliance Check - uses: fsfe/reuse-action@v1 + uses: fsfe/reuse-action@v2 diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 938afee..c41a8a4 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -4,32 +4,55 @@ name: SonarCloud Analysis -on: - push: - branches: - - '**' - pull_request: - branches: - - 'main' - - 'develop' - pull_request_target: - branches: - - 'main' - - 'develop' +on: + workflow_run: + workflows: [SonarCloud Build] + types: [completed] jobs: - build: - name: Build + sonar-check: runs-on: ubuntu-latest + if: github.event.workflow_run.conclusion == 'success' timeout-minutes: 15 - - if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} steps: - - name: Checkout - uses: actions/checkout@v3 + - name: echo event + run: cat $GITHUB_EVENT_PATH + - name: Download PR number artifact + if: github.event.workflow_run.event == 'pull_request' + uses: dawidd6/action-download-artifact@v2 + with: + workflow: SonarCloud Build + run_id: ${{ github.event.workflow_run.id }} + name: PR_NUMBER + - name: Read PR_NUMBER.txt + if: github.event.workflow_run.event == 'pull_request' + id: pr_number + uses: juliangruber/read-file-action@v1 + with: + path: ./PR_NUMBER.txt + - name: Request GitHub API for PR data + if: github.event.workflow_run.event == 'pull_request' + uses: octokit/request-action@v2.x + id: get_pr_data + with: + route: GET /repos/{full_name}/pulls/{number} + number: ${{ steps.pr_number.outputs.content }} + full_name: ${{ github.event.repository.full_name }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v4 with: + repository: ${{ github.event.workflow_run.head_repository.full_name }} + ref: ${{ github.event.workflow_run.head_branch }} fetch-depth: 0 - + - name: Checkout base branch + if: github.event.workflow_run.event == 'pull_request' + run: | + git remote add upstream ${{ github.event.repository.clone_url }} + git fetch upstream + git checkout -B ${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} upstream/${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} + git checkout ${{ github.event.workflow_run.head_branch }} + git clean -ffdx && git reset --hard HEAD - name: Cache SonarCloud packages uses: actions/cache@v3 with: @@ -61,25 +84,26 @@ jobs: output_file: custom_maven_settings.xml servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' - name: Build and analyze (Pull Request) - if: ${{ github.event_name == 'pull_request' || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} + if: ${{ github.event.workflow_run.event == 'pull_request' || (github.event.workflow_run.actor == 'dependabot[bot]' && github.event.workflow_run.event == 'pull_request_target') }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | ./mvnw -B -s custom_maven_settings.xml -Psonar \ ${{ steps.sonar_env.outputs.sonar_opts }} \ - -Dsonar.pullrequest.branch=${{ github.ref_name }} \ - -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \ - -Dsonar.pullrequest.base=${{ github.base_ref }} \ - -Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} \ + -Dsonar.pullrequest.branch=${{ fromJson(steps.get_pr_data.outputs.data).head.ref }} \ + -Dsonar.pullrequest.key=${{ fromJson(steps.get_pr_data.outputs.data).number }} \ + -Dsonar.pullrequest.base=${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} \ + -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} \ clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar - name: Build and analyze (Push) - if: ${{ github.event_name == 'push' }} + if: ${{ github.event.workflow_run.event == 'push' }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | ./mvnw -B -s custom_maven_settings.xml -Psonar \ ${{ steps.sonar_env.outputs.sonar_opts }} \ - -Dsonar.branch.name=${{ github.ref_name }} \ + -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} \ + -Dsonar.branch.name=${{ github.event.workflow_run.head_branch }} \ clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar diff --git a/.github/workflows/sonarcloud-build.yml b/.github/workflows/sonarcloud-build.yml new file mode 100644 index 0000000..7228a74 --- /dev/null +++ b/.github/workflows/sonarcloud-build.yml @@ -0,0 +1,77 @@ +# SPDX-FileCopyrightText: 2022 Alliander N.V. +# +# SPDX-License-Identifier: Apache-2.0 + +name: SonarCloud Build + +on: + push: + branches: + - '**' + pull_request: + branches: + - 'main' + - 'develop' + pull_request_target: + branches: + - 'main' + - 'develop' + +jobs: + precheck-build: + name: Pre Check Build + runs-on: ubuntu-latest + timeout-minutes: 30 + + if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Cache SonarCloud packages + uses: actions/cache@v3 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + - name: Cache Maven packages + uses: actions/cache@v3 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: '17' + + - name: Create custom Maven Settings.xml + uses: whelk-io/maven-settings-xml-action@v21 + with: + output_file: custom_maven_settings.xml + servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' + - name: Build and analyze (Pull Request) + if: ${{ github.event_name == 'pull_request' || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + ./mvnw -B -s custom_maven_settings.xml clean verify + - name: Build and analyze (Push) + if: ${{ github.event_name == 'push' }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + ./mvnw -B -s custom_maven_settings.xml clean verify + - name: Save PR number to file + if: github.event_name == 'pull_request' + run: echo ${{ github.event.number }} > PR_NUMBER.txt + - name: Archive PR number + if: github.event_name == 'pull_request' + uses: actions/upload-artifact@v3 + with: + name: PR_NUMBER + path: PR_NUMBER.txt diff --git a/commons/pom.xml b/commons/pom.xml index d97af42..1c7e5cb 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -48,9 +48,10 @@ SPDX-License-Identifier: Apache-2.0 - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime provided + 4.0.3 @@ -68,9 +69,9 @@ SPDX-License-Identifier: Apache-2.0 hibernate-validator test - - org.glassfish - jakarta.el + + org.glassfish.expressly + expressly test diff --git a/commons/src/main/java/org/lfenergy/compas/core/commons/MarshallerWrapper.java b/commons/src/main/java/org/lfenergy/compas/core/commons/MarshallerWrapper.java index 9343c12..4d291cd 100644 --- a/commons/src/main/java/org/lfenergy/compas/core/commons/MarshallerWrapper.java +++ b/commons/src/main/java/org/lfenergy/compas/core/commons/MarshallerWrapper.java @@ -13,10 +13,10 @@ import org.xml.sax.SAXException; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.Result; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; diff --git a/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/FilenameValid.java b/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/FilenameValid.java index 5ee06c4..ca46a05 100644 --- a/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/FilenameValid.java +++ b/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/FilenameValid.java @@ -5,8 +5,8 @@ import org.lfenergy.compas.core.commons.constraint.impl.FilenameConstraintValidator; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/XmlAnyElementValid.java b/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/XmlAnyElementValid.java index 0ab14e5..116feac 100644 --- a/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/XmlAnyElementValid.java +++ b/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/XmlAnyElementValid.java @@ -5,8 +5,8 @@ import org.lfenergy.compas.core.commons.constraint.impl.XmlAnyElementConstraintValidator; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidator.java b/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidator.java index 68ad0a2..d248f07 100644 --- a/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidator.java +++ b/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidator.java @@ -5,8 +5,8 @@ import org.lfenergy.compas.core.commons.constraint.FilenameValid; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/impl/XmlAnyElementConstraintValidator.java b/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/impl/XmlAnyElementConstraintValidator.java index 385dbad..26d8c0d 100644 --- a/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/impl/XmlAnyElementConstraintValidator.java +++ b/commons/src/main/java/org/lfenergy/compas/core/commons/constraint/impl/XmlAnyElementConstraintValidator.java @@ -8,8 +8,8 @@ import org.lfenergy.compas.core.commons.constraint.XmlAnyElementValid; import org.w3c.dom.Element; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import java.util.List; /** diff --git a/commons/src/main/java/org/lfenergy/compas/core/commons/model/ErrorMessage.java b/commons/src/main/java/org/lfenergy/compas/core/commons/model/ErrorMessage.java index 9d4c2ea..f767a50 100644 --- a/commons/src/main/java/org/lfenergy/compas/core/commons/model/ErrorMessage.java +++ b/commons/src/main/java/org/lfenergy/compas/core/commons/model/ErrorMessage.java @@ -3,10 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.core.commons.model; -import javax.validation.constraints.NotBlank; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.validation.constraints.NotBlank; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; import static org.lfenergy.compas.core.commons.CommonConstants.COMPAS_COMMONS_V1_NS_URI; diff --git a/commons/src/main/java/org/lfenergy/compas/core/commons/model/ErrorResponse.java b/commons/src/main/java/org/lfenergy/compas/core/commons/model/ErrorResponse.java index 7297610..2c2789e 100644 --- a/commons/src/main/java/org/lfenergy/compas/core/commons/model/ErrorResponse.java +++ b/commons/src/main/java/org/lfenergy/compas/core/commons/model/ErrorResponse.java @@ -3,11 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.core.commons.model; -import javax.validation.Valid; -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.validation.Valid; +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.ArrayList; import java.util.List; diff --git a/commons/src/main/java/org/lfenergy/compas/core/commons/model/package-info.java b/commons/src/main/java/org/lfenergy/compas/core/commons/model/package-info.java index 2ff93ff..630a323 100644 --- a/commons/src/main/java/org/lfenergy/compas/core/commons/model/package-info.java +++ b/commons/src/main/java/org/lfenergy/compas/core/commons/model/package-info.java @@ -4,7 +4,7 @@ @XmlSchema(xmlns = {@XmlNs(prefix = "compas-commons", namespaceURI = COMPAS_COMMONS_V1_NS_URI)}) package org.lfenergy.compas.core.commons.model; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlSchema; import static org.lfenergy.compas.core.commons.CommonConstants.COMPAS_COMMONS_V1_NS_URI; diff --git a/commons/src/test/java/org/lfenergy/compas/core/commons/MarshallerWrapperTest.java b/commons/src/test/java/org/lfenergy/compas/core/commons/MarshallerWrapperTest.java index d38fdd8..a320658 100644 --- a/commons/src/test/java/org/lfenergy/compas/core/commons/MarshallerWrapperTest.java +++ b/commons/src/test/java/org/lfenergy/compas/core/commons/MarshallerWrapperTest.java @@ -8,8 +8,8 @@ import org.lfenergy.compas.core.commons.model.XmlElementAPojo; import org.lfenergy.compas.core.commons.model.XmlElementBPojo; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import java.util.UUID; import static org.junit.jupiter.api.Assertions.*; diff --git a/commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidatorTest.java b/commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidatorTest.java index 2a73a6b..0386d33 100644 --- a/commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidatorTest.java +++ b/commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidatorTest.java @@ -7,8 +7,8 @@ import org.junit.jupiter.api.Test; import org.lfenergy.compas.core.commons.constraint.FilenameValid; -import javax.validation.Validation; -import javax.validation.Validator; +import jakarta.validation.Validation; +import jakarta.validation.Validator; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/XmlAnyElementConstraintValidatorTest.java b/commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/XmlAnyElementConstraintValidatorTest.java index 63bcc31..7a9af21 100644 --- a/commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/XmlAnyElementConstraintValidatorTest.java +++ b/commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/XmlAnyElementConstraintValidatorTest.java @@ -9,8 +9,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.validation.Validation; -import javax.validation.Validator; +import jakarta.validation.Validation; +import jakarta.validation.Validator; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import java.util.ArrayList; diff --git a/commons/src/test/java/org/lfenergy/compas/core/commons/model/ObjectFactory.java b/commons/src/test/java/org/lfenergy/compas/core/commons/model/ObjectFactory.java index c7f697c..6bc6172 100644 --- a/commons/src/test/java/org/lfenergy/compas/core/commons/model/ObjectFactory.java +++ b/commons/src/test/java/org/lfenergy/compas/core/commons/model/ObjectFactory.java @@ -3,9 +3,9 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.core.commons.model; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; @XmlRegistry diff --git a/commons/src/test/java/org/lfenergy/compas/core/commons/model/XmlElementAPojo.java b/commons/src/test/java/org/lfenergy/compas/core/commons/model/XmlElementAPojo.java index d260acd..5791895 100644 --- a/commons/src/test/java/org/lfenergy/compas/core/commons/model/XmlElementAPojo.java +++ b/commons/src/test/java/org/lfenergy/compas/core/commons/model/XmlElementAPojo.java @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.core.commons.model; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; @XmlAccessorType(XmlAccessType.FIELD) @XmlRootElement(name = "XmlElementAPojo") diff --git a/commons/src/test/java/org/lfenergy/compas/core/commons/model/XmlElementBPojo.java b/commons/src/test/java/org/lfenergy/compas/core/commons/model/XmlElementBPojo.java index c1fb9fe..af292c7 100644 --- a/commons/src/test/java/org/lfenergy/compas/core/commons/model/XmlElementBPojo.java +++ b/commons/src/test/java/org/lfenergy/compas/core/commons/model/XmlElementBPojo.java @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.core.commons.model; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "XmlElementBPojo") diff --git a/commons/src/test/java/org/lfenergy/compas/core/commons/model/package-info.java b/commons/src/test/java/org/lfenergy/compas/core/commons/model/package-info.java index 6919523..4842b1a 100644 --- a/commons/src/test/java/org/lfenergy/compas/core/commons/model/package-info.java +++ b/commons/src/test/java/org/lfenergy/compas/core/commons/model/package-info.java @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2021 Alliander N.V. // // SPDX-License-Identifier: Apache-2.0 -@XmlSchema(namespace = "https://www.lfenergy.org/compas/example", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "https://www.lfenergy.org/compas/example", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.lfenergy.compas.core.commons.model; -import javax.xml.bind.annotation.XmlSchema; \ No newline at end of file +import jakarta.xml.bind.annotation.XmlSchema; \ No newline at end of file diff --git a/pom.xml b/pom.xml index a45eafc..13e8c9a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,7 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 0.0.4 - 2.16.6.Final - 2.3.8 + 3.4.1 2.20.0 0.9.1 @@ -54,8 +53,8 @@ SPDX-License-Identifier: Apache-2.0 - io.quarkus - quarkus-universe-bom + io.quarkus.platform + quarkus-bom ${quarkus.platform.version} pom import @@ -77,12 +76,6 @@ SPDX-License-Identifier: Apache-2.0 ${compas.scl.xsd.version} - - com.sun.xml.bind - jaxb-impl - ${jaxb.bind.version} - - javax.ws.rs javax.ws.rs-api @@ -119,14 +112,14 @@ SPDX-License-Identifier: Apache-2.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.15.3 + com.helger.maven + jaxb40-maven-plugin + 0.16.1 org.jvnet.jaxb2_commons jaxb2-namespace-prefix - 1.3 + 2.0 @@ -154,7 +147,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.1.2 @@ -180,7 +173,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 attach-javadocs diff --git a/rest-commons/pom.xml b/rest-commons/pom.xml index d092a6c..689da47 100644 --- a/rest-commons/pom.xml +++ b/rest-commons/pom.xml @@ -24,8 +24,9 @@ SPDX-License-Identifier: Apache-2.0 - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 diff --git a/rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/CompasExceptionHandler.java b/rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/CompasExceptionHandler.java index 4f1fb03..1f23e6d 100644 --- a/rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/CompasExceptionHandler.java +++ b/rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/CompasExceptionHandler.java @@ -8,9 +8,9 @@ import org.lfenergy.compas.core.commons.exception.CompasException; import org.lfenergy.compas.core.commons.model.ErrorResponse; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class CompasExceptionHandler implements ExceptionMapper { diff --git a/rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/ConstraintViolationExceptionHandler.java b/rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/ConstraintViolationExceptionHandler.java index 88e45bf..8c4ebf2 100644 --- a/rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/ConstraintViolationExceptionHandler.java +++ b/rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/ConstraintViolationExceptionHandler.java @@ -7,10 +7,10 @@ import org.apache.logging.log4j.Logger; import org.lfenergy.compas.core.commons.model.ErrorResponse; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.VALIDATION_ERROR; diff --git a/rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/GenericExceptionHandler.java b/rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/GenericExceptionHandler.java index fdc5ca5..86b939f 100644 --- a/rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/GenericExceptionHandler.java +++ b/rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/GenericExceptionHandler.java @@ -7,9 +7,9 @@ import org.apache.logging.log4j.Logger; import org.lfenergy.compas.core.commons.model.ErrorResponse; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.UNKNOWN_EXCEPTION_ERROR; diff --git a/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/CompasExceptionHandlerTest.java b/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/CompasExceptionHandlerTest.java index aec1d9d..8c114d9 100644 --- a/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/CompasExceptionHandlerTest.java +++ b/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/CompasExceptionHandlerTest.java @@ -7,7 +7,7 @@ import org.lfenergy.compas.core.commons.exception.CompasException; import org.lfenergy.compas.core.commons.model.ErrorResponse; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.NO_CLASS_LOADER_ERROR_CODE; diff --git a/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/ConstraintViolationExceptionHandlerTest.java b/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/ConstraintViolationExceptionHandlerTest.java index 47cdb0d..34594fe 100644 --- a/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/ConstraintViolationExceptionHandlerTest.java +++ b/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/ConstraintViolationExceptionHandlerTest.java @@ -9,12 +9,12 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Path; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Path; import java.util.HashSet; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.VALIDATION_ERROR; diff --git a/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/GenericExceptionHandlerTest.java b/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/GenericExceptionHandlerTest.java index 1fbb0dd..1eac51a 100644 --- a/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/GenericExceptionHandlerTest.java +++ b/rest-commons/src/test/java/org/lfenergy/compas/core/rest/exception/GenericExceptionHandlerTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.lfenergy.compas.core.commons.model.ErrorResponse; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.UNKNOWN_EXCEPTION_ERROR; diff --git a/scl-extension/pom.xml b/scl-extension/pom.xml index 340445b..62edbab 100644 --- a/scl-extension/pom.xml +++ b/scl-extension/pom.xml @@ -53,9 +53,8 @@ SPDX-License-Identifier: Apache-2.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.15.3 + com.helger.maven + jaxb40-maven-plugin xjc diff --git a/scl-extension/src/main/bindings/scl-extensions.xjb b/scl-extension/src/main/bindings/scl-extensions.xjb index 374006f..318abc7 100644 --- a/scl-extension/src/main/bindings/scl-extensions.xjb +++ b/scl-extension/src/main/bindings/scl-extensions.xjb @@ -5,8 +5,8 @@ SPDX-FileCopyrightText: 2021 Alliander N.V. SPDX-License-Identifier: Apache-2.0 --> + xmlns:jxb="https://jakarta.ee/xml/ns/jaxb" + version="3.0"> diff --git a/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/AbstractCompasExtensionsManager.java b/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/AbstractCompasExtensionsManager.java index 667c168..00963fa 100644 --- a/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/AbstractCompasExtensionsManager.java +++ b/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/AbstractCompasExtensionsManager.java @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.scl.extensions.commons; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import java.util.List; import java.util.Optional; diff --git a/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/model/SclFileType.java b/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/model/SclFileType.java index 99300e9..f1115f7 100644 --- a/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/model/SclFileType.java +++ b/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/model/SclFileType.java @@ -3,8 +3,8 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.scl.extensions.model; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsConstants.COMPAS_EXTENSION_NS_URI; diff --git a/scl-extension/src/test/java/org/lfenergy/compas/scl/extensions/commons/AbstractCompasExtensionsManagerTest.java b/scl-extension/src/test/java/org/lfenergy/compas/scl/extensions/commons/AbstractCompasExtensionsManagerTest.java index fe5cc27..67ed37d 100644 --- a/scl-extension/src/test/java/org/lfenergy/compas/scl/extensions/commons/AbstractCompasExtensionsManagerTest.java +++ b/scl-extension/src/test/java/org/lfenergy/compas/scl/extensions/commons/AbstractCompasExtensionsManagerTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import java.util.ArrayList; import java.util.List; diff --git a/scl2003/pom.xml b/scl2003/pom.xml index dc79416..c443f8c 100644 --- a/scl2003/pom.xml +++ b/scl2003/pom.xml @@ -40,9 +40,10 @@ SPDX-License-Identifier: Apache-2.0 jakarta.xml.bind-api - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime provided + 4.0.3 @@ -94,8 +95,8 @@ SPDX-License-Identifier: Apache-2.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + com.helger.maven + jaxb40-maven-plugin org.lfenergy.compas.scl2003.model ${project.build.directory}/xsd/SCL2003 diff --git a/scl2003/src/main/bindings/scl2003.xjb b/scl2003/src/main/bindings/scl2003.xjb index 11e9b78..5e7c75b 100644 --- a/scl2003/src/main/bindings/scl2003.xjb +++ b/scl2003/src/main/bindings/scl2003.xjb @@ -4,8 +4,8 @@ SPDX-FileCopyrightText: 2021 Alliander N.V. SPDX-License-Identifier: Apache-2.0 --> - diff --git a/scl2003/src/main/java/org/lfenergy/compas/scl2003/commons/CompasExtensionsManager.java b/scl2003/src/main/java/org/lfenergy/compas/scl2003/commons/CompasExtensionsManager.java index ef8826f..6a7802d 100644 --- a/scl2003/src/main/java/org/lfenergy/compas/scl2003/commons/CompasExtensionsManager.java +++ b/scl2003/src/main/java/org/lfenergy/compas/scl2003/commons/CompasExtensionsManager.java @@ -10,7 +10,7 @@ import org.lfenergy.compas.scl2003.model.SCL; import org.lfenergy.compas.scl2003.model.TPrivate; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import java.util.Optional; import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsConstants.COMPAS_SCL_EXTENSION_TYPE; diff --git a/scl2003/src/main/java/org/lfenergy/compas/scl2003/commons/Scl2003MarshallerWrapper.java b/scl2003/src/main/java/org/lfenergy/compas/scl2003/commons/Scl2003MarshallerWrapper.java index bbf4fa8..ec2e8e3 100644 --- a/scl2003/src/main/java/org/lfenergy/compas/scl2003/commons/Scl2003MarshallerWrapper.java +++ b/scl2003/src/main/java/org/lfenergy/compas/scl2003/commons/Scl2003MarshallerWrapper.java @@ -6,8 +6,8 @@ import org.lfenergy.compas.core.commons.MarshallerWrapper; import org.lfenergy.compas.scl2003.model.SCL; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; public class Scl2003MarshallerWrapper extends MarshallerWrapper { public Scl2003MarshallerWrapper(Unmarshaller jaxbUnmarshaller, Marshaller jaxbMarshaller) { diff --git a/scl2007b/pom.xml b/scl2007b/pom.xml index 99fb07b..29141da 100644 --- a/scl2007b/pom.xml +++ b/scl2007b/pom.xml @@ -40,9 +40,10 @@ SPDX-License-Identifier: Apache-2.0 jakarta.xml.bind-api - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime provided + 4.0.3 @@ -94,8 +95,8 @@ SPDX-License-Identifier: Apache-2.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + com.helger.maven + jaxb40-maven-plugin org.lfenergy.compas.scl2007b.model ${project.build.directory}/xsd/SCL2007B diff --git a/scl2007b/src/main/bindings/scl2007b.xjb b/scl2007b/src/main/bindings/scl2007b.xjb index 1c75f69..20116ed 100644 --- a/scl2007b/src/main/bindings/scl2007b.xjb +++ b/scl2007b/src/main/bindings/scl2007b.xjb @@ -4,8 +4,8 @@ SPDX-FileCopyrightText: 2021 Alliander N.V. SPDX-License-Identifier: Apache-2.0 --> - diff --git a/scl2007b/src/main/java/org/lfenergy/compas/scl2007b/commons/CompasExtensionsManager.java b/scl2007b/src/main/java/org/lfenergy/compas/scl2007b/commons/CompasExtensionsManager.java index e4b48a2..857e271 100644 --- a/scl2007b/src/main/java/org/lfenergy/compas/scl2007b/commons/CompasExtensionsManager.java +++ b/scl2007b/src/main/java/org/lfenergy/compas/scl2007b/commons/CompasExtensionsManager.java @@ -10,7 +10,7 @@ import org.lfenergy.compas.scl2007b.model.SCL; import org.lfenergy.compas.scl2007b.model.TPrivate; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import java.util.Optional; import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsConstants.COMPAS_SCL_EXTENSION_TYPE; diff --git a/scl2007b/src/main/java/org/lfenergy/compas/scl2007b/commons/Scl2007bMarshallerWrapper.java b/scl2007b/src/main/java/org/lfenergy/compas/scl2007b/commons/Scl2007bMarshallerWrapper.java index a63ec3f..d7fbe3c 100644 --- a/scl2007b/src/main/java/org/lfenergy/compas/scl2007b/commons/Scl2007bMarshallerWrapper.java +++ b/scl2007b/src/main/java/org/lfenergy/compas/scl2007b/commons/Scl2007bMarshallerWrapper.java @@ -6,8 +6,8 @@ import org.lfenergy.compas.core.commons.MarshallerWrapper; import org.lfenergy.compas.scl2007b.model.SCL; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; public class Scl2007bMarshallerWrapper extends MarshallerWrapper { public Scl2007bMarshallerWrapper(Unmarshaller jaxbUnmarshaller, Marshaller jaxbMarshaller) { diff --git a/scl2007b4/pom.xml b/scl2007b4/pom.xml index b706542..c16b864 100644 --- a/scl2007b4/pom.xml +++ b/scl2007b4/pom.xml @@ -40,9 +40,10 @@ SPDX-License-Identifier: Apache-2.0 jakarta.xml.bind-api - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime provided + 4.0.3 @@ -94,8 +95,8 @@ SPDX-License-Identifier: Apache-2.0 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + com.helger.maven + jaxb40-maven-plugin org.lfenergy.compas.scl2007b4.model ${project.build.directory}/xsd/SCL2007B4 diff --git a/scl2007b4/src/main/bindings/scl2007b4.xjb b/scl2007b4/src/main/bindings/scl2007b4.xjb index 2134bd9..cfff23b 100644 --- a/scl2007b4/src/main/bindings/scl2007b4.xjb +++ b/scl2007b4/src/main/bindings/scl2007b4.xjb @@ -4,8 +4,8 @@ SPDX-FileCopyrightText: 2021 Alliander N.V. SPDX-License-Identifier: Apache-2.0 --> - diff --git a/scl2007b4/src/main/java/org/lfenergy/compas/scl2007b4/commons/CompasExtensionsManager.java b/scl2007b4/src/main/java/org/lfenergy/compas/scl2007b4/commons/CompasExtensionsManager.java index e54da46..dd12725 100644 --- a/scl2007b4/src/main/java/org/lfenergy/compas/scl2007b4/commons/CompasExtensionsManager.java +++ b/scl2007b4/src/main/java/org/lfenergy/compas/scl2007b4/commons/CompasExtensionsManager.java @@ -10,7 +10,7 @@ import org.lfenergy.compas.scl2007b4.model.SCL; import org.lfenergy.compas.scl2007b4.model.TPrivate; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import java.util.Optional; import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsConstants.COMPAS_SCL_EXTENSION_TYPE; diff --git a/scl2007b4/src/main/java/org/lfenergy/compas/scl2007b4/commons/Scl2007b4MarshallerWrapper.java b/scl2007b4/src/main/java/org/lfenergy/compas/scl2007b4/commons/Scl2007b4MarshallerWrapper.java index c078d2f..32ac10f 100644 --- a/scl2007b4/src/main/java/org/lfenergy/compas/scl2007b4/commons/Scl2007b4MarshallerWrapper.java +++ b/scl2007b4/src/main/java/org/lfenergy/compas/scl2007b4/commons/Scl2007b4MarshallerWrapper.java @@ -6,8 +6,8 @@ import org.lfenergy.compas.core.commons.MarshallerWrapper; import org.lfenergy.compas.scl2007b4.model.SCL; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; public class Scl2007b4MarshallerWrapper extends MarshallerWrapper { public Scl2007b4MarshallerWrapper(Unmarshaller jaxbUnmarshaller, Marshaller jaxbMarshaller) { diff --git a/websocket-commons/pom.xml b/websocket-commons/pom.xml index be47d14..9e634a6 100644 --- a/websocket-commons/pom.xml +++ b/websocket-commons/pom.xml @@ -24,8 +24,8 @@ SPDX-License-Identifier: Apache-2.0 - jakarta.websocket - jakarta.websocket-api + io.quarkus + quarkus-websockets @@ -39,9 +39,10 @@ SPDX-License-Identifier: Apache-2.0 - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime provided + 4.0.3 diff --git a/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/AbstractDecoder.java b/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/AbstractDecoder.java index b485a62..f3c4cf7 100644 --- a/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/AbstractDecoder.java +++ b/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/AbstractDecoder.java @@ -3,8 +3,8 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.core.websocket; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; /** * Simple abstract class to save some boilerplate code with common implementations. diff --git a/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/AbstractEncoder.java b/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/AbstractEncoder.java index 6b633ae..c084137 100644 --- a/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/AbstractEncoder.java +++ b/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/AbstractEncoder.java @@ -3,8 +3,8 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.core.websocket; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; /** * Simple abstract class to save some boilerplate code with common implementations. diff --git a/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/WebsocketHandler.java b/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/WebsocketHandler.java index fdbcb0b..3099475 100644 --- a/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/WebsocketHandler.java +++ b/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/WebsocketHandler.java @@ -7,7 +7,7 @@ import org.apache.logging.log4j.Logger; import org.lfenergy.compas.core.commons.model.ErrorResponse; -import javax.websocket.Session; +import jakarta.websocket.Session; import static org.lfenergy.compas.core.websocket.WebsocketSupport.handleException; diff --git a/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/WebsocketSupport.java b/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/WebsocketSupport.java index fc29229..e6ab83a 100644 --- a/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/WebsocketSupport.java +++ b/websocket-commons/src/main/java/org/lfenergy/compas/core/websocket/WebsocketSupport.java @@ -6,9 +6,9 @@ import org.lfenergy.compas.core.commons.exception.CompasException; import org.lfenergy.compas.core.commons.model.ErrorResponse; -import javax.validation.ConstraintViolationException; -import javax.websocket.Session; -import javax.xml.bind.JAXBContext; +import jakarta.validation.ConstraintViolationException; +import jakarta.websocket.Session; +import jakarta.xml.bind.JAXBContext; import java.io.StringReader; import java.io.StringWriter; diff --git a/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/ErrorResponseDecoderTest.java b/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/ErrorResponseDecoderTest.java index 8b1d387..189439f 100644 --- a/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/ErrorResponseDecoderTest.java +++ b/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/ErrorResponseDecoderTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.lfenergy.compas.core.commons.exception.CompasException; -import javax.xml.bind.UnmarshalException; +import jakarta.xml.bind.UnmarshalException; import static org.junit.jupiter.api.Assertions.*; import static org.lfenergy.compas.core.commons.CommonConstants.COMPAS_COMMONS_V1_NS_URI; diff --git a/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/WebsocketHandlerTest.java b/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/WebsocketHandlerTest.java index 986dbed..500024b 100644 --- a/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/WebsocketHandlerTest.java +++ b/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/WebsocketHandlerTest.java @@ -11,8 +11,8 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import javax.websocket.RemoteEndpoint; -import javax.websocket.Session; +import jakarta.websocket.RemoteEndpoint; +import jakarta.websocket.Session; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.WEBSOCKET_GENERAL_ERROR_CODE; diff --git a/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/WebsocketSupportTest.java b/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/WebsocketSupportTest.java index d40c969..c5713f1 100644 --- a/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/WebsocketSupportTest.java +++ b/websocket-commons/src/test/java/org/lfenergy/compas/core/websocket/WebsocketSupportTest.java @@ -11,11 +11,11 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Path; -import javax.websocket.RemoteEndpoint; -import javax.websocket.Session; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Path; +import jakarta.websocket.RemoteEndpoint; +import jakarta.websocket.Session; import java.util.Set; import static org.junit.jupiter.api.Assertions.*;