Skip to content

Commit 95b76c8

Browse files
pascalwilbrinkpascalwilbrink
authored
Merge pull request #260 from com-pas/develop
Merge `develop` into `main`
2 parents 706e35c + b2bba45 commit 95b76c8

File tree

54 files changed

+260
-161
lines changed

Some content is hidden

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

54 files changed

+260
-161
lines changed

‎.github/workflows/build-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525

2626
- name: Set up JDK 17
2727
uses: actions/setup-java@v3

‎.github/workflows/release-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
packages: write
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020

2121
- name: Extract tag name
2222
id: extract_tagname

‎.github/workflows/reuse.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
- name: REUSE Compliance Check
16-
uses: fsfe/reuse-action@v1
16+
uses: fsfe/reuse-action@v2

‎.github/workflows/sonarcloud-analysis.yml

Lines changed: 50 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,55 @@
44

55
name: SonarCloud Analysis
66

7-
on:
8-
push:
9-
branches:
10-
- '**'
11-
pull_request:
12-
branches:
13-
- 'main'
14-
- 'develop'
15-
pull_request_target:
16-
branches:
17-
- 'main'
18-
- 'develop'
7+
on:
8+
workflow_run:
9+
workflows: [SonarCloud Build]
10+
types: [completed]
1911

2012
jobs:
21-
build:
22-
name: Build
13+
sonar-check:
2314
runs-on: ubuntu-latest
15+
if: github.event.workflow_run.conclusion == 'success'
2416
timeout-minutes: 15
25-
26-
if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
2717
steps:
28-
- name: Checkout
29-
uses: actions/checkout@v3
18+
- name: echo event
19+
run: cat $GITHUB_EVENT_PATH
20+
- name: Download PR number artifact
21+
if: github.event.workflow_run.event == 'pull_request'
22+
uses: dawidd6/action-download-artifact@v2
23+
with:
24+
workflow: SonarCloud Build
25+
run_id: ${{ github.event.workflow_run.id }}
26+
name: PR_NUMBER
27+
- name: Read PR_NUMBER.txt
28+
if: github.event.workflow_run.event == 'pull_request'
29+
id: pr_number
30+
uses: juliangruber/read-file-action@v1
31+
with:
32+
path: ./PR_NUMBER.txt
33+
- name: Request GitHub API for PR data
34+
if: github.event.workflow_run.event == 'pull_request'
35+
uses: octokit/[email protected]
36+
id: get_pr_data
37+
with:
38+
route: GET /repos/{full_name}/pulls/{number}
39+
number: ${{ steps.pr_number.outputs.content }}
40+
full_name: ${{ github.event.repository.full_name }}
41+
env:
42+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43+
- uses: actions/checkout@v4
3044
with:
45+
repository: ${{ github.event.workflow_run.head_repository.full_name }}
46+
ref: ${{ github.event.workflow_run.head_branch }}
3147
fetch-depth: 0
32-
48+
- name: Checkout base branch
49+
if: github.event.workflow_run.event == 'pull_request'
50+
run: |
51+
git remote add upstream ${{ github.event.repository.clone_url }}
52+
git fetch upstream
53+
git checkout -B ${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} upstream/${{ fromJson(steps.get_pr_data.outputs.data).base.ref }}
54+
git checkout ${{ github.event.workflow_run.head_branch }}
55+
git clean -ffdx && git reset --hard HEAD
3356
- name: Cache SonarCloud packages
3457
uses: actions/cache@v3
3558
with:
@@ -61,25 +84,26 @@ jobs:
6184
output_file: custom_maven_settings.xml
6285
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
6386
- name: Build and analyze (Pull Request)
64-
if: ${{ github.event_name == 'pull_request' || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
87+
if: ${{ github.event.workflow_run.event == 'pull_request' || (github.event.workflow_run.actor == 'dependabot[bot]' && github.event.workflow_run.event == 'pull_request_target') }}
6588
env:
6689
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6790
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
6891
run: |
6992
./mvnw -B -s custom_maven_settings.xml -Psonar \
7093
${{ steps.sonar_env.outputs.sonar_opts }} \
71-
-Dsonar.pullrequest.branch=${{ github.ref_name }} \
72-
-Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \
73-
-Dsonar.pullrequest.base=${{ github.base_ref }} \
74-
-Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} \
94+
-Dsonar.pullrequest.branch=${{ fromJson(steps.get_pr_data.outputs.data).head.ref }} \
95+
-Dsonar.pullrequest.key=${{ fromJson(steps.get_pr_data.outputs.data).number }} \
96+
-Dsonar.pullrequest.base=${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} \
97+
-Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} \
7598
clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
7699
- name: Build and analyze (Push)
77-
if: ${{ github.event_name == 'push' }}
100+
if: ${{ github.event.workflow_run.event == 'push' }}
78101
env:
79102
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
80103
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
81104
run: |
82105
./mvnw -B -s custom_maven_settings.xml -Psonar \
83106
${{ steps.sonar_env.outputs.sonar_opts }} \
84-
-Dsonar.branch.name=${{ github.ref_name }} \
107+
-Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} \
108+
-Dsonar.branch.name=${{ github.event.workflow_run.head_branch }} \
85109
clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar

‎.github/workflows/sonarcloud-build.yml

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# SPDX-FileCopyrightText: 2022 Alliander N.V.
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
name: SonarCloud Build
6+
7+
on:
8+
push:
9+
branches:
10+
- '**'
11+
pull_request:
12+
branches:
13+
- 'main'
14+
- 'develop'
15+
pull_request_target:
16+
branches:
17+
- 'main'
18+
- 'develop'
19+
20+
jobs:
21+
precheck-build:
22+
name: Pre Check Build
23+
runs-on: ubuntu-latest
24+
timeout-minutes: 30
25+
26+
if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
27+
steps:
28+
- name: Checkout
29+
uses: actions/checkout@v4
30+
with:
31+
fetch-depth: 0
32+
33+
- name: Cache SonarCloud packages
34+
uses: actions/cache@v3
35+
with:
36+
path: ~/.sonar/cache
37+
key: ${{ runner.os }}-sonar
38+
restore-keys: ${{ runner.os }}-sonar
39+
- name: Cache Maven packages
40+
uses: actions/cache@v3
41+
with:
42+
path: ~/.m2
43+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
44+
restore-keys: ${{ runner.os }}-m2
45+
46+
- name: Set up JDK 17
47+
uses: actions/setup-java@v3
48+
with:
49+
distribution: 'zulu'
50+
java-version: '17'
51+
52+
- name: Create custom Maven Settings.xml
53+
uses: whelk-io/maven-settings-xml-action@v21
54+
with:
55+
output_file: custom_maven_settings.xml
56+
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
57+
- name: Build and analyze (Pull Request)
58+
if: ${{ github.event_name == 'pull_request' || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
59+
env:
60+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61+
run: |
62+
./mvnw -B -s custom_maven_settings.xml clean verify
63+
- name: Build and analyze (Push)
64+
if: ${{ github.event_name == 'push' }}
65+
env:
66+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67+
run: |
68+
./mvnw -B -s custom_maven_settings.xml clean verify
69+
- name: Save PR number to file
70+
if: github.event_name == 'pull_request'
71+
run: echo ${{ github.event.number }} > PR_NUMBER.txt
72+
- name: Archive PR number
73+
if: github.event_name == 'pull_request'
74+
uses: actions/upload-artifact@v3
75+
with:
76+
name: PR_NUMBER
77+
path: PR_NUMBER.txt

‎commons/pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ SPDX-License-Identifier: Apache-2.0
4848
</dependency>
4949

5050
<dependency>
51-
<groupId>com.sun.xml.bind</groupId>
52-
<artifactId>jaxb-impl</artifactId>
51+
<groupId>org.glassfish.jaxb</groupId>
52+
<artifactId>jaxb-runtime</artifactId>
5353
<scope>provided</scope>
54+
<version>4.0.3</version>
5455
</dependency>
5556

5657
<dependency>
@@ -68,9 +69,9 @@ SPDX-License-Identifier: Apache-2.0
6869
<artifactId>hibernate-validator</artifactId>
6970
<scope>test</scope>
7071
</dependency>
71-
<dependency>
72-
<groupId>org.glassfish</groupId>
73-
<artifactId>jakarta.el</artifactId>
72+
<!--~~(No version provided)~~>--><dependency>
73+
<groupId>org.glassfish.expressly</groupId>
74+
<artifactId>expressly</artifactId>
7475
<scope>test</scope>
7576
</dependency>
7677
<dependency>

‎commons/src/main/java/org/lfenergy/compas/core/commons/MarshallerWrapper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import org.xml.sax.SAXException;
1414

1515
import javax.xml.XMLConstants;
16-
import javax.xml.bind.JAXBContext;
17-
import javax.xml.bind.JAXBException;
18-
import javax.xml.bind.Marshaller;
19-
import javax.xml.bind.Unmarshaller;
16+
import jakarta.xml.bind.JAXBContext;
17+
import jakarta.xml.bind.JAXBException;
18+
import jakarta.xml.bind.Marshaller;
19+
import jakarta.xml.bind.Unmarshaller;
2020
import javax.xml.transform.Result;
2121
import javax.xml.transform.stream.StreamResult;
2222
import javax.xml.transform.stream.StreamSource;

‎commons/src/main/java/org/lfenergy/compas/core/commons/constraint/FilenameValid.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import org.lfenergy.compas.core.commons.constraint.impl.FilenameConstraintValidator;
77

8-
import javax.validation.Constraint;
9-
import javax.validation.Payload;
8+
import jakarta.validation.Constraint;
9+
import jakarta.validation.Payload;
1010
import java.lang.annotation.Documented;
1111
import java.lang.annotation.Retention;
1212
import java.lang.annotation.Target;

‎commons/src/main/java/org/lfenergy/compas/core/commons/constraint/XmlAnyElementValid.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import org.lfenergy.compas.core.commons.constraint.impl.XmlAnyElementConstraintValidator;
77

8-
import javax.validation.Constraint;
9-
import javax.validation.Payload;
8+
import jakarta.validation.Constraint;
9+
import jakarta.validation.Payload;
1010
import java.lang.annotation.Documented;
1111
import java.lang.annotation.Retention;
1212
import java.lang.annotation.Target;

‎commons/src/main/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import org.lfenergy.compas.core.commons.constraint.FilenameValid;
77

8-
import javax.validation.ConstraintValidator;
9-
import javax.validation.ConstraintValidatorContext;
8+
import jakarta.validation.ConstraintValidator;
9+
import jakarta.validation.ConstraintValidatorContext;
1010
import java.util.regex.Matcher;
1111
import java.util.regex.Pattern;
1212

‎commons/src/main/java/org/lfenergy/compas/core/commons/constraint/impl/XmlAnyElementConstraintValidator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import org.lfenergy.compas.core.commons.constraint.XmlAnyElementValid;
99
import org.w3c.dom.Element;
1010

11-
import javax.validation.ConstraintValidator;
12-
import javax.validation.ConstraintValidatorContext;
11+
import jakarta.validation.ConstraintValidator;
12+
import jakarta.validation.ConstraintValidatorContext;
1313
import java.util.List;
1414

1515
/**

‎commons/src/main/java/org/lfenergy/compas/core/commons/model/ErrorMessage.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
// SPDX-License-Identifier: Apache-2.0
44
package org.lfenergy.compas.core.commons.model;
55

6-
import javax.validation.constraints.NotBlank;
7-
import javax.xml.bind.annotation.XmlAccessType;
8-
import javax.xml.bind.annotation.XmlAccessorType;
9-
import javax.xml.bind.annotation.XmlElement;
6+
import jakarta.validation.constraints.NotBlank;
7+
import jakarta.xml.bind.annotation.XmlAccessType;
8+
import jakarta.xml.bind.annotation.XmlAccessorType;
9+
import jakarta.xml.bind.annotation.XmlElement;
1010

1111
import static org.lfenergy.compas.core.commons.CommonConstants.COMPAS_COMMONS_V1_NS_URI;
1212

‎commons/src/main/java/org/lfenergy/compas/core/commons/model/ErrorResponse.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
// SPDX-License-Identifier: Apache-2.0
44
package org.lfenergy.compas.core.commons.model;
55

6-
import javax.validation.Valid;
7-
import javax.xml.bind.annotation.XmlAccessType;
8-
import javax.xml.bind.annotation.XmlAccessorType;
9-
import javax.xml.bind.annotation.XmlElement;
10-
import javax.xml.bind.annotation.XmlRootElement;
6+
import jakarta.validation.Valid;
7+
import jakarta.xml.bind.annotation.XmlAccessType;
8+
import jakarta.xml.bind.annotation.XmlAccessorType;
9+
import jakarta.xml.bind.annotation.XmlElement;
10+
import jakarta.xml.bind.annotation.XmlRootElement;
1111
import java.util.ArrayList;
1212
import java.util.List;
1313

‎commons/src/main/java/org/lfenergy/compas/core/commons/model/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@XmlSchema(xmlns = {@XmlNs(prefix = "compas-commons", namespaceURI = COMPAS_COMMONS_V1_NS_URI)})
55
package org.lfenergy.compas.core.commons.model;
66

7-
import javax.xml.bind.annotation.XmlNs;
8-
import javax.xml.bind.annotation.XmlSchema;
7+
import jakarta.xml.bind.annotation.XmlNs;
8+
import jakarta.xml.bind.annotation.XmlSchema;
99

1010
import static org.lfenergy.compas.core.commons.CommonConstants.COMPAS_COMMONS_V1_NS_URI;

‎commons/src/test/java/org/lfenergy/compas/core/commons/MarshallerWrapperTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import org.lfenergy.compas.core.commons.model.XmlElementAPojo;
99
import org.lfenergy.compas.core.commons.model.XmlElementBPojo;
1010

11-
import javax.xml.bind.Marshaller;
12-
import javax.xml.bind.Unmarshaller;
11+
import jakarta.xml.bind.Marshaller;
12+
import jakarta.xml.bind.Unmarshaller;
1313
import java.util.UUID;
1414

1515
import static org.junit.jupiter.api.Assertions.*;

‎commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/FilenameConstraintValidatorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import org.junit.jupiter.api.Test;
88
import org.lfenergy.compas.core.commons.constraint.FilenameValid;
99

10-
import javax.validation.Validation;
11-
import javax.validation.Validator;
10+
import jakarta.validation.Validation;
11+
import jakarta.validation.Validator;
1212

1313
import static org.junit.jupiter.api.Assertions.assertEquals;
1414
import static org.junit.jupiter.api.Assertions.assertTrue;

‎commons/src/test/java/org/lfenergy/compas/core/commons/constraint/impl/XmlAnyElementConstraintValidatorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import org.w3c.dom.Document;
1010
import org.w3c.dom.Element;
1111

12-
import javax.validation.Validation;
13-
import javax.validation.Validator;
12+
import jakarta.validation.Validation;
13+
import jakarta.validation.Validator;
1414
import javax.xml.parsers.DocumentBuilderFactory;
1515
import javax.xml.parsers.ParserConfigurationException;
1616
import java.util.ArrayList;

‎commons/src/test/java/org/lfenergy/compas/core/commons/model/ObjectFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// SPDX-License-Identifier: Apache-2.0
44
package org.lfenergy.compas.core.commons.model;
55

6-
import javax.xml.bind.JAXBElement;
7-
import javax.xml.bind.annotation.XmlElementDecl;
8-
import javax.xml.bind.annotation.XmlRegistry;
6+
import jakarta.xml.bind.JAXBElement;
7+
import jakarta.xml.bind.annotation.XmlElementDecl;
8+
import jakarta.xml.bind.annotation.XmlRegistry;
99
import javax.xml.namespace.QName;
1010

1111
@XmlRegistry

‎commons/src/test/java/org/lfenergy/compas/core/commons/model/XmlElementAPojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// SPDX-License-Identifier: Apache-2.0
44
package org.lfenergy.compas.core.commons.model;
55

6-
import javax.xml.bind.annotation.*;
6+
import jakarta.xml.bind.annotation.*;
77

88
@XmlAccessorType(XmlAccessType.FIELD)
99
@XmlRootElement(name = "XmlElementAPojo")

0 commit comments

Comments
 (0)