diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index a7d51d65..9ae5a4e6 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -37,7 +37,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Set up JDK 17 uses: actions/setup-java@v3 with: diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index e9fb31d6..7b2d3c3e 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -43,7 +43,7 @@ jobs: java-version: '17' - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub uses: docker/login-action@v2 with: diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index 9ebd56df..aff58480 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -13,4 +13,4 @@ jobs: - name: Checkout uses: actions/checkout@v3 - 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 13c4eb5d..c0364192 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -4,82 +4,106 @@ 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: sonar-check: - name: 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 - 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: 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@v3 + 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: + 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: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: '17' - - name: Set Common Sonar Variables - id: sonar_env - run: | - echo "##[set-output name=sonar_opts;]$(echo -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.projectKey=com-pas_compas-scl-data-service \ - -Dsonar.organization=com-pas )" - - 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 }} - 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 }} \ - clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar - - name: Build and analyze (Push) - if: ${{ github.event_name == '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 }} \ - clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar + - name: Set Common Sonar Variables + id: sonar_env + run: | + echo "##[set-output name=sonar_opts;]$(echo -Dsonar.host.url=https://sonarcloud.io \ + -Dsonar.projectKey=com-pas_compas-scl-data-service \ + -Dsonar.organization=com-pas )" + - 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.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=${{ 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.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.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 00000000..58e78fcd --- /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@v3 + 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/app/src/main/docker/Dockerfile-basex.jvm b/app/src/main/docker/Dockerfile-basex.jvm index 9352dbda..fd96b2d0 100644 --- a/app/src/main/docker/Dockerfile-basex.jvm +++ b/app/src/main/docker/Dockerfile-basex.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile-basex.native b/app/src/main/docker/Dockerfile-basex.native index cd977c67..128860fd 100644 --- a/app/src/main/docker/Dockerfile-basex.native +++ b/app/src/main/docker/Dockerfile-basex.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/app/src/main/docker/Dockerfile-postgresql.jvm b/app/src/main/docker/Dockerfile-postgresql.jvm index 54047858..5c3b583f 100644 --- a/app/src/main/docker/Dockerfile-postgresql.jvm +++ b/app/src/main/docker/Dockerfile-postgresql.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile-postgresql.native b/app/src/main/docker/Dockerfile-postgresql.native index 3f8289f9..b58255e4 100644 --- a/app/src/main/docker/Dockerfile-postgresql.native +++ b/app/src/main/docker/Dockerfile-postgresql.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServiceConfiguration.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServiceConfiguration.java index 2054f037..2452ac21 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServiceConfiguration.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServiceConfiguration.java @@ -7,8 +7,8 @@ import org.lfenergy.compas.core.commons.ElementConverter; import org.lfenergy.compas.scl.data.util.SclDataModelMarshaller; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; /** * Create Beans from other dependencies that are used in the application. diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/exception/CompasNoDataFoundExceptionHandler.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/exception/CompasNoDataFoundExceptionHandler.java index efee3683..6abad8a2 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/exception/CompasNoDataFoundExceptionHandler.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/exception/CompasNoDataFoundExceptionHandler.java @@ -6,9 +6,9 @@ import org.lfenergy.compas.core.commons.model.ErrorResponse; import org.lfenergy.compas.scl.data.exception.CompasNoDataFoundException; -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 CompasNoDataFoundExceptionHandler implements ExceptionMapper { diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/monitoring/LivenessHealthCheck.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/monitoring/LivenessHealthCheck.java index df39ebcf..cc5b64d1 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/monitoring/LivenessHealthCheck.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/monitoring/LivenessHealthCheck.java @@ -7,7 +7,7 @@ import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Liveness; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Liveness @ApplicationScoped diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/monitoring/ReadinessHealthCheck.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/monitoring/ReadinessHealthCheck.java index c75b474f..f082bfed 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/monitoring/ReadinessHealthCheck.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/monitoring/ReadinessHealthCheck.java @@ -7,7 +7,7 @@ import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Readiness; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Readiness @ApplicationScoped diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasCommonResource.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasCommonResource.java index ba63918a..19240f7a 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasCommonResource.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasCommonResource.java @@ -14,12 +14,12 @@ import org.lfenergy.compas.scl.data.rest.v1.model.UserInfoResponse; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.Arrays; import java.util.Comparator; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResource.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResource.java index 5bad7160..fba0497c 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResource.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResource.java @@ -15,11 +15,11 @@ import org.lfenergy.compas.scl.data.service.CompasSclDataService; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; import java.util.UUID; import static org.lfenergy.compas.scl.data.rest.Constants.*; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/CreateRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/CreateRequest.java index 117b35d5..d191d3e4 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/CreateRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/CreateRequest.java @@ -7,11 +7,11 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.lfenergy.compas.core.commons.constraint.FilenameValid; -import javax.validation.constraints.NotBlank; -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.constraints.NotBlank; +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 static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/CreateResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/CreateResponse.java index b7593a22..7c0d0440 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/CreateResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/CreateResponse.java @@ -5,10 +5,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -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 static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequest.java index 32827e8e..a0da8141 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckRequest.java @@ -7,10 +7,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.lfenergy.compas.core.commons.constraint.FilenameValid; -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 static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponse.java index 0cb1ba22..2a33ace9 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/DuplicateNameCheckResponse.java @@ -6,10 +6,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -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 static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/GetResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/GetResponse.java index 89042351..b3fe29f9 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/GetResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/GetResponse.java @@ -6,10 +6,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -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 static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/ListResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/ListResponse.java index d1a8ed99..890c1f03 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/ListResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/ListResponse.java @@ -6,10 +6,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.lfenergy.compas.scl.data.model.Item; -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; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/Type.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/Type.java index 44c12072..6760a790 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/Type.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/Type.java @@ -5,9 +5,9 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/TypeListResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/TypeListResponse.java index 5d34e192..ecd6cd3a 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/TypeListResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/TypeListResponse.java @@ -5,10 +5,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -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.ArrayList; import java.util.List; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UpdateRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UpdateRequest.java index f64bc37c..ffcddac3 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UpdateRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UpdateRequest.java @@ -7,12 +7,12 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.lfenergy.compas.scl.data.model.ChangeSetType; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -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.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +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 static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UpdateResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UpdateResponse.java index a30a3e39..91a6d318 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UpdateResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UpdateResponse.java @@ -6,10 +6,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -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 static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UserInfoResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UserInfoResponse.java index 7047e35c..fff6d999 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UserInfoResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/UserInfoResponse.java @@ -5,10 +5,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -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 static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/VersionsResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/VersionsResponse.java index 251f57e1..aec8acdb 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/VersionsResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/VersionsResponse.java @@ -6,10 +6,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.lfenergy.compas.scl.data.model.HistoryItem; -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; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/package-info.java b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/package-info.java index 08a82499..3250e301 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/package-info.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/rest/v1/model/package-info.java @@ -4,7 +4,7 @@ @XmlSchema(xmlns = {@XmlNs(prefix = "sds", namespaceURI = SCL_DATA_SERVICE_V1_NS_URI)}) package org.lfenergy.compas.scl.data.rest.v1.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.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/CompasSclDataEventHandler.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/CompasSclDataEventHandler.java index 2528e203..b4e46cd8 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/CompasSclDataEventHandler.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/CompasSclDataEventHandler.java @@ -14,8 +14,8 @@ import org.lfenergy.compas.scl.data.websocket.v1.model.GetWsResponse; import org.lfenergy.compas.scl.data.websocket.v1.model.UpdateWsResponse; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * Event Handler used to execute the validation asynchronized. diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/CreateEventRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/CreateEventRequest.java index 2582a2ee..3665ba5e 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/CreateEventRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/CreateEventRequest.java @@ -5,7 +5,7 @@ import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.websocket.Session; +import jakarta.websocket.Session; public class CreateEventRequest { private final Session session; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/GetEventRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/GetEventRequest.java index ea3d4e8b..089a4778 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/GetEventRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/GetEventRequest.java @@ -5,7 +5,7 @@ import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.websocket.Session; +import jakarta.websocket.Session; import java.util.UUID; public class GetEventRequest { diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/GetVersionEventRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/GetVersionEventRequest.java index 1675f37a..ec3f96e6 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/GetVersionEventRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/GetVersionEventRequest.java @@ -6,7 +6,7 @@ import org.lfenergy.compas.scl.data.model.Version; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.websocket.Session; +import jakarta.websocket.Session; import java.util.UUID; public class GetVersionEventRequest { diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/UpdateEventRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/UpdateEventRequest.java index 7442950a..5b81d808 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/UpdateEventRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/event/model/UpdateEventRequest.java @@ -6,7 +6,7 @@ import org.lfenergy.compas.scl.data.model.ChangeSetType; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.websocket.Session; +import jakarta.websocket.Session; import java.util.UUID; public class UpdateEventRequest { diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpoint.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpoint.java index 8962d88c..baae5857 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpoint.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpoint.java @@ -16,12 +16,12 @@ import org.lfenergy.compas.scl.data.websocket.v1.model.CreateWsRequest; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.websocket.*; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.websocket.*; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import static org.lfenergy.compas.core.websocket.WebsocketSupport.handleException; import static org.lfenergy.compas.scl.data.rest.Constants.TYPE_PATH_PARAM; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpoint.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpoint.java index 2d66f1bc..68bf896f 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpoint.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpoint.java @@ -14,12 +14,12 @@ import org.lfenergy.compas.scl.data.websocket.v1.model.GetWsRequest; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.websocket.*; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.websocket.*; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import static org.lfenergy.compas.core.websocket.WebsocketSupport.handleException; import static org.lfenergy.compas.scl.data.rest.Constants.TYPE_PATH_PARAM; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpoint.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpoint.java index 866941fa..ecafcdec 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpoint.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpoint.java @@ -15,12 +15,12 @@ import org.lfenergy.compas.scl.data.websocket.v1.model.GetVersionWsRequest; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.websocket.*; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.websocket.*; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import static org.lfenergy.compas.core.websocket.WebsocketSupport.handleException; import static org.lfenergy.compas.scl.data.rest.Constants.TYPE_PATH_PARAM; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpoint.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpoint.java index d54dfc77..6d9e2449 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpoint.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpoint.java @@ -16,12 +16,12 @@ import org.lfenergy.compas.scl.data.websocket.v1.model.UpdateWsRequest; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.websocket.*; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.websocket.*; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import static org.lfenergy.compas.core.websocket.WebsocketSupport.handleException; import static org.lfenergy.compas.scl.data.rest.Constants.TYPE_PATH_PARAM; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/CreateWsRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/CreateWsRequest.java index 3748261b..ca3de064 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/CreateWsRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/CreateWsRequest.java @@ -6,10 +6,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/CreateWsResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/CreateWsResponse.java index 7a330bc3..513dd2d1 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/CreateWsResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/CreateWsResponse.java @@ -5,10 +5,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/GetVersionWsRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/GetVersionWsRequest.java index e050ce6f..42b9dd92 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/GetVersionWsRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/GetVersionWsRequest.java @@ -6,9 +6,9 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.*; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.xml.bind.annotation.*; import java.util.UUID; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/GetWsRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/GetWsRequest.java index 764807e4..20137500 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/GetWsRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/GetWsRequest.java @@ -6,8 +6,8 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.*; +import jakarta.validation.constraints.NotNull; +import jakarta.xml.bind.annotation.*; import java.util.UUID; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/GetWsResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/GetWsResponse.java index 50c51a4d..441738a8 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/GetWsResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/GetWsResponse.java @@ -6,10 +6,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/UpdateWsRequest.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/UpdateWsRequest.java index b3b42769..de0123a1 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/UpdateWsRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/UpdateWsRequest.java @@ -6,8 +6,8 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.*; +import jakarta.validation.constraints.NotNull; +import jakarta.xml.bind.annotation.*; import java.util.UUID; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/UpdateWsResponse.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/UpdateWsResponse.java index 8e67b561..061630b5 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/UpdateWsResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/UpdateWsResponse.java @@ -6,10 +6,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/package-info.java b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/package-info.java index 68f35f72..a22f4060 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/package-info.java +++ b/app/src/main/java/org/lfenergy/compas/scl/data/websocket/v1/model/package-info.java @@ -4,7 +4,7 @@ @XmlSchema(xmlns = {@XmlNs(prefix = "sds", namespaceURI = SCL_DATA_SERVICE_V1_NS_URI)}) package org.lfenergy.compas.scl.data.websocket.v1.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.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/rest/exception/CompasNoDataFoundExceptionHandlerTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/rest/exception/CompasNoDataFoundExceptionHandlerTest.java index 40179946..5febb27d 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/rest/exception/CompasNoDataFoundExceptionHandlerTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/rest/exception/CompasNoDataFoundExceptionHandlerTest.java @@ -7,7 +7,7 @@ import org.lfenergy.compas.core.commons.model.ErrorResponse; import org.lfenergy.compas.scl.data.exception.CompasNoDataFoundException; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/CompasSclDataEventHandlerTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/CompasSclDataEventHandlerTest.java index 39f9192d..d937f833 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/CompasSclDataEventHandlerTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/CompasSclDataEventHandlerTest.java @@ -24,8 +24,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 java.util.UUID; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/CreateEventRequestTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/CreateEventRequestTest.java index 0c250f5c..60300868 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/CreateEventRequestTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/CreateEventRequestTest.java @@ -11,7 +11,7 @@ import org.lfenergy.compas.scl.extensions.model.SclFileType; import org.mockito.Mockito; -import javax.websocket.Session; +import jakarta.websocket.Session; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/GetEventRequestTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/GetEventRequestTest.java index e9240bcd..461d72ce 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/GetEventRequestTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/GetEventRequestTest.java @@ -11,7 +11,7 @@ import org.lfenergy.compas.scl.extensions.model.SclFileType; import org.mockito.Mockito; -import javax.websocket.Session; +import jakarta.websocket.Session; import java.util.UUID; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/GetVersionEventRequestTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/GetVersionEventRequestTest.java index 1e2a9a29..0ca96c0a 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/GetVersionEventRequestTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/GetVersionEventRequestTest.java @@ -12,7 +12,7 @@ import org.lfenergy.compas.scl.extensions.model.SclFileType; import org.mockito.Mockito; -import javax.websocket.Session; +import jakarta.websocket.Session; import java.util.UUID; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/UpdateEventRequestTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/UpdateEventRequestTest.java index ada45ffc..9c5fa4f4 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/UpdateEventRequestTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/model/UpdateEventRequestTest.java @@ -12,7 +12,7 @@ import org.lfenergy.compas.scl.extensions.model.SclFileType; import org.mockito.Mockito; -import javax.websocket.Session; +import jakarta.websocket.Session; import java.util.UUID; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/AbstractServerEndpointAsReaderTestSupport.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/AbstractServerEndpointAsReaderTestSupport.java index 58722723..0869d846 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/AbstractServerEndpointAsReaderTestSupport.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/AbstractServerEndpointAsReaderTestSupport.java @@ -7,8 +7,8 @@ import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakeException; import io.quarkus.test.security.TestSecurity; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; import java.io.InterruptedIOException; import java.net.URI; import java.util.concurrent.ExecutionException; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/AbstractServerEndpointTestSupport.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/AbstractServerEndpointTestSupport.java index 6a4ad521..f8efb7f2 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/AbstractServerEndpointTestSupport.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/AbstractServerEndpointTestSupport.java @@ -7,10 +7,10 @@ import org.lfenergy.compas.core.commons.model.ErrorResponse; import org.lfenergy.compas.core.websocket.ErrorResponseDecoder; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; import java.io.IOException; import java.net.URI; import java.util.concurrent.LinkedBlockingDeque; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpointAsEditorTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpointAsEditorTest.java index eabfa8e1..5727c067 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpointAsEditorTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpointAsEditorTest.java @@ -14,10 +14,10 @@ import org.lfenergy.compas.scl.data.websocket.v1.model.CreateWsResponse; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; import java.net.URI; import static org.mockito.Mockito.verify; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpointAsEditorTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpointAsEditorTest.java index 101d3ff1..2c32f6f4 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpointAsEditorTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpointAsEditorTest.java @@ -14,10 +14,10 @@ import org.lfenergy.compas.scl.data.websocket.v1.model.GetWsResponse; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; import java.net.URI; import java.util.UUID; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpointAsReaderTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpointAsReaderTest.java index fa63b88a..6e8741f3 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpointAsReaderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpointAsReaderTest.java @@ -14,10 +14,10 @@ import org.lfenergy.compas.scl.data.websocket.v1.model.GetWsResponse; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; import java.net.URI; import java.util.UUID; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpointAsEditorTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpointAsEditorTest.java index 41da1179..40abfce0 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpointAsEditorTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpointAsEditorTest.java @@ -15,10 +15,10 @@ import org.lfenergy.compas.scl.data.websocket.v1.model.GetWsResponse; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; import java.net.URI; import java.util.UUID; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpointAsReaderTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpointAsReaderTest.java index 23037003..bd7e05fe 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpointAsReaderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpointAsReaderTest.java @@ -15,10 +15,10 @@ import org.lfenergy.compas.scl.data.websocket.v1.model.GetWsResponse; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; import java.net.URI; import java.util.UUID; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpointAsEditorTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpointAsEditorTest.java index 04c397f1..b726081e 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpointAsEditorTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpointAsEditorTest.java @@ -15,10 +15,10 @@ import org.lfenergy.compas.scl.data.websocket.v1.model.UpdateWsResponse; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; import java.net.URI; import java.util.UUID; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/CreateWsRequestDecoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/CreateWsRequestDecoderTest.java index f0253a10..25224a43 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/CreateWsRequestDecoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/CreateWsRequestDecoderTest.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.exception.CompasErrorCode.WEBSOCKET_DECODER_ERROR_CODE; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/CreateWsResponseDecoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/CreateWsResponseDecoderTest.java index 3d2e26d5..a1183a44 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/CreateWsResponseDecoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/CreateWsResponseDecoderTest.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.exception.CompasErrorCode.WEBSOCKET_DECODER_ERROR_CODE; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/GetVersionWsRequestDecoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/GetVersionWsRequestDecoderTest.java index 11d957d8..3e685989 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/GetVersionWsRequestDecoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/GetVersionWsRequestDecoderTest.java @@ -9,7 +9,7 @@ import org.lfenergy.compas.core.commons.exception.CompasException; import org.lfenergy.compas.scl.data.model.Version; -import javax.xml.bind.UnmarshalException; +import jakarta.xml.bind.UnmarshalException; import java.util.UUID; import static org.junit.jupiter.api.Assertions.*; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/GetWsRequestDecoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/GetWsRequestDecoderTest.java index 58fcd263..716e8678 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/GetWsRequestDecoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/GetWsRequestDecoderTest.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 java.util.UUID; import static org.junit.jupiter.api.Assertions.*; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/GetWsResponseDecoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/GetWsResponseDecoderTest.java index fe1deb4d..3833e563 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/GetWsResponseDecoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/GetWsResponseDecoderTest.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.exception.CompasErrorCode.WEBSOCKET_DECODER_ERROR_CODE; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/UpdateWsRequestDecoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/UpdateWsRequestDecoderTest.java index 4beb9d89..b9e8b2b4 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/UpdateWsRequestDecoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/UpdateWsRequestDecoderTest.java @@ -9,7 +9,7 @@ import org.lfenergy.compas.core.commons.exception.CompasException; import org.lfenergy.compas.scl.data.model.ChangeSetType; -import javax.xml.bind.UnmarshalException; +import jakarta.xml.bind.UnmarshalException; import java.util.UUID; import static org.junit.jupiter.api.Assertions.*; diff --git a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/UpdateWsResponseDecoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/UpdateWsResponseDecoderTest.java index 55ca2a67..0768c1e2 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/UpdateWsResponseDecoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/decoder/UpdateWsResponseDecoderTest.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.exception.CompasErrorCode.WEBSOCKET_DECODER_ERROR_CODE; diff --git a/pom.xml b/pom.xml index c7cf8a95..760bdee4 100644 --- a/pom.xml +++ b/pom.xml @@ -20,13 +20,12 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 3.11.0 - 3.0.0 + 3.1.0 3.2.0 - 0.12.0 - 2.16.6.Final + 0.16.0 + 3.0.4.Final - 2.3.8 3.1 2.20.0 0.9.1 @@ -59,8 +58,8 @@ SPDX-License-Identifier: Apache-2.0 - io.quarkus - quarkus-universe-bom + io.quarkus.platform + quarkus-bom ${quarkus.platform.version} pom import @@ -108,12 +107,6 @@ SPDX-License-Identifier: Apache-2.0 ${compas.core.version} - - com.sun.xml.bind - jaxb-impl - ${jaxb-impl.version} - - org.eclipse.microprofile.openapi microprofile-openapi-api @@ -210,7 +203,7 @@ SPDX-License-Identifier: Apache-2.0 java - 0.8.9 + 0.8.10 jacoco target/site/jacoco/jacoco.xml, @@ -264,7 +257,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -278,7 +271,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/repository-basex/pom.xml b/repository-basex/pom.xml index c6452608..929add3e 100644 --- a/repository-basex/pom.xml +++ b/repository-basex/pom.xml @@ -37,9 +37,10 @@ SPDX-License-Identifier: Apache-2.0 microprofile-config-api - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime provided + 4.0.2 diff --git a/repository-basex/src/main/java/org/lfenergy/compas/scl/data/basex/client/BaseXClientFactory.java b/repository-basex/src/main/java/org/lfenergy/compas/scl/data/basex/client/BaseXClientFactory.java index 5d97fa53..90b24a94 100644 --- a/repository-basex/src/main/java/org/lfenergy/compas/scl/data/basex/client/BaseXClientFactory.java +++ b/repository-basex/src/main/java/org/lfenergy/compas/scl/data/basex/client/BaseXClientFactory.java @@ -5,8 +5,8 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.io.IOException; @ApplicationScoped diff --git a/repository-basex/src/main/java/org/lfenergy/compas/scl/data/basex/repository/CompasSclDataBaseXRepository.java b/repository-basex/src/main/java/org/lfenergy/compas/scl/data/basex/repository/CompasSclDataBaseXRepository.java index 65f52043..6f55c3db 100644 --- a/repository-basex/src/main/java/org/lfenergy/compas/scl/data/basex/repository/CompasSclDataBaseXRepository.java +++ b/repository-basex/src/main/java/org/lfenergy/compas/scl/data/basex/repository/CompasSclDataBaseXRepository.java @@ -18,9 +18,9 @@ import org.lfenergy.compas.scl.data.util.SclDataModelMarshaller; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import java.io.IOException; import java.io.StringReader; import java.nio.charset.StandardCharsets; @@ -29,8 +29,8 @@ import java.util.List; import java.util.UUID; -import static javax.transaction.Transactional.TxType.REQUIRED; -import static javax.transaction.Transactional.TxType.SUPPORTS; +import static jakarta.transaction.Transactional.TxType.REQUIRED; +import static jakarta.transaction.Transactional.TxType.SUPPORTS; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_NS_URI; import static org.lfenergy.compas.scl.data.exception.CompasSclDataServiceErrorCode.BASEX_COMMAND_ERROR_CODE; diff --git a/repository-postgresql/src/main/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java b/repository-postgresql/src/main/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java index bf1a937f..c127de02 100644 --- a/repository-postgresql/src/main/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java +++ b/repository-postgresql/src/main/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java @@ -13,10 +13,10 @@ import org.lfenergy.compas.scl.data.repository.CompasSclDataRepository; import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import javax.sql.DataSource; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import java.sql.Array; import java.sql.Connection; import java.sql.ResultSet; @@ -26,8 +26,8 @@ import java.util.List; import java.util.UUID; -import static javax.transaction.Transactional.TxType.REQUIRED; -import static javax.transaction.Transactional.TxType.SUPPORTS; +import static jakarta.transaction.Transactional.TxType.REQUIRED; +import static jakarta.transaction.Transactional.TxType.SUPPORTS; import static org.lfenergy.compas.scl.data.exception.CompasSclDataServiceErrorCode.*; @ApplicationScoped diff --git a/repository/pom.xml b/repository/pom.xml index 7919d8df..382a9886 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -32,9 +32,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.2 diff --git a/repository/src/main/java/org/lfenergy/compas/scl/data/model/AbstractItem.java b/repository/src/main/java/org/lfenergy/compas/scl/data/model/AbstractItem.java index d95f901e..2e83973a 100644 --- a/repository/src/main/java/org/lfenergy/compas/scl/data/model/AbstractItem.java +++ b/repository/src/main/java/org/lfenergy/compas/scl/data/model/AbstractItem.java @@ -5,9 +5,9 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/repository/src/main/java/org/lfenergy/compas/scl/data/model/HistoryItem.java b/repository/src/main/java/org/lfenergy/compas/scl/data/model/HistoryItem.java index 49ff814f..ef3b3ec3 100644 --- a/repository/src/main/java/org/lfenergy/compas/scl/data/model/HistoryItem.java +++ b/repository/src/main/java/org/lfenergy/compas/scl/data/model/HistoryItem.java @@ -5,9 +5,9 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.SCL_DATA_SERVICE_V1_NS_URI; diff --git a/repository/src/main/java/org/lfenergy/compas/scl/data/model/Item.java b/repository/src/main/java/org/lfenergy/compas/scl/data/model/Item.java index 32bed0b6..eac23d90 100644 --- a/repository/src/main/java/org/lfenergy/compas/scl/data/model/Item.java +++ b/repository/src/main/java/org/lfenergy/compas/scl/data/model/Item.java @@ -5,9 +5,9 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; import java.util.ArrayList; import java.util.List; diff --git a/repository/src/main/java/org/lfenergy/compas/scl/data/model/ObjectFactory.java b/repository/src/main/java/org/lfenergy/compas/scl/data/model/ObjectFactory.java index 6a87ae89..2fe181ba 100644 --- a/repository/src/main/java/org/lfenergy/compas/scl/data/model/ObjectFactory.java +++ b/repository/src/main/java/org/lfenergy/compas/scl/data/model/ObjectFactory.java @@ -3,9 +3,9 @@ // SPDX-License-Identifier: Apache-2.0 package org.lfenergy.compas.scl.data.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/repository/src/main/java/org/lfenergy/compas/scl/data/model/SclMetaInfo.java b/repository/src/main/java/org/lfenergy/compas/scl/data/model/SclMetaInfo.java index fbbadf33..bc508489 100644 --- a/repository/src/main/java/org/lfenergy/compas/scl/data/model/SclMetaInfo.java +++ b/repository/src/main/java/org/lfenergy/compas/scl/data/model/SclMetaInfo.java @@ -5,8 +5,8 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; @Schema(description = "Meta Info found in the database with all basic information about a SCL.") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/repository/src/main/java/org/lfenergy/compas/scl/data/util/SclDataModelMarshaller.java b/repository/src/main/java/org/lfenergy/compas/scl/data/util/SclDataModelMarshaller.java index 57c3a721..9cf05973 100644 --- a/repository/src/main/java/org/lfenergy/compas/scl/data/util/SclDataModelMarshaller.java +++ b/repository/src/main/java/org/lfenergy/compas/scl/data/util/SclDataModelMarshaller.java @@ -10,9 +10,9 @@ import org.lfenergy.compas.scl.data.model.Item; import org.lfenergy.compas.scl.data.model.SclMetaInfo; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; import java.io.StringReader; diff --git a/repository/src/main/java/org/lfenergy/compas/scl/data/util/SclElementProcessor.java b/repository/src/main/java/org/lfenergy/compas/scl/data/util/SclElementProcessor.java index 88d6db2c..6111dbf4 100644 --- a/repository/src/main/java/org/lfenergy/compas/scl/data/util/SclElementProcessor.java +++ b/repository/src/main/java/org/lfenergy/compas/scl/data/util/SclElementProcessor.java @@ -8,7 +8,7 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; diff --git a/service/src/main/java/org/lfenergy/compas/scl/data/service/CompasSclDataService.java b/service/src/main/java/org/lfenergy/compas/scl/data/service/CompasSclDataService.java index b0f5bfd7..0c1ab397 100644 --- a/service/src/main/java/org/lfenergy/compas/scl/data/service/CompasSclDataService.java +++ b/service/src/main/java/org/lfenergy/compas/scl/data/service/CompasSclDataService.java @@ -17,9 +17,9 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; @@ -28,8 +28,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import static javax.transaction.Transactional.TxType.REQUIRED; -import static javax.transaction.Transactional.TxType.SUPPORTS; +import static jakarta.transaction.Transactional.TxType.REQUIRED; +import static jakarta.transaction.Transactional.TxType.SUPPORTS; import static org.lfenergy.compas.scl.data.SclDataServiceConstants.*; import static org.lfenergy.compas.scl.data.exception.CompasSclDataServiceErrorCode.*; import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsConstants.*;