From 8d3e97c6475d1d97735c9ae77488ed497848f4f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 08:59:55 +0000 Subject: [PATCH 01/36] Bump log4j2.version from 2.19.0 to 2.20.0 Bumps `log4j2.version` from 2.19.0 to 2.20.0. Updates `log4j-api` from 2.19.0 to 2.20.0 - [Release notes](https://github.com/apache/logging-log4j2/releases) - [Changelog](https://github.com/apache/logging-log4j2/blob/release-2.x/CHANGELOG.adoc) - [Commits](https://github.com/apache/logging-log4j2/compare/rel/2.19.0...rel/2.20.0) Updates `log4j-core` from 2.19.0 to 2.20.0 - [Release notes](https://github.com/apache/logging-log4j2/releases) - [Changelog](https://github.com/apache/logging-log4j2/blob/release-2.x/CHANGELOG.adoc) - [Commits](https://github.com/apache/logging-log4j2/compare/rel/2.19.0...rel/2.20.0) --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a07a501..00f9995 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ SPDX-License-Identifier: Apache-2.0 0.12.0 2.16.3.Final - 2.19.0 + 2.20.0 0.9.1 From 6ff4452d19173508201fc1d8b019173ecbfb6b28 Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Tue, 28 Feb 2023 10:51:13 +0100 Subject: [PATCH 02/36] Updated GH Action timeout to 30 minutes Signed-off-by: Pascal Wilbrink --- .github/workflows/build-project.yml | 2 +- .github/workflows/release-project.yml | 2 +- .github/workflows/sonarcloud-analysis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 07d5ade..0f7ae4e 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -17,7 +17,7 @@ jobs: build: name: Build runs-on: ubuntu-latest - timeout-minutes: 15 + timeout-minutes: 30 steps: - name: Checkout diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 32e8a75..51634d7 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -12,7 +12,7 @@ jobs: push_to_registry: name: Build and publish runs-on: ubuntu-latest - timeout-minutes: 15 + timeout-minutes: 30 steps: - name: Checkout diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 16e07c2..70e6464 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -21,7 +21,7 @@ jobs: build: name: SonarCloud runs-on: ubuntu-latest - timeout-minutes: 15 + 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: From c48eb6561f31a5a0f3c9f5459ee6659cd18f5701 Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Mon, 20 Mar 2023 10:13:45 +0100 Subject: [PATCH 03/36] Bumped the `meminitial` and the `maxmem` to fix the OOM exception? Signed-off-by: Pascal Wilbrink --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index a07a501..acad2a5 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,8 @@ SPDX-License-Identifier: Apache-2.0 2.16.3.Final 2.19.0 0.9.1 + 17 + 17 @@ -173,6 +175,8 @@ SPDX-License-Identifier: Apache-2.0 ${compiler-plugin.version} ${maven.compiler.parameters} + 2024m + 4024m From 2afcb8910fbc005824fbe6a909d5706449684f8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 09:23:41 +0000 Subject: [PATCH 04/36] Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.7-1049.1675784874 to 8.7-1085. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/src/main/docker/Dockerfile.jvm | 2 +- app/src/main/docker/Dockerfile.native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index 073679f..52ad7bd 100644 --- a/app/src/main/docker/Dockerfile.jvm +++ b/app/src/main/docker/Dockerfile.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-1049.1675784874 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile.native b/app/src/main/docker/Dockerfile.native index 5bbd0df..e0d19e7 100644 --- a/app/src/main/docker/Dockerfile.native +++ b/app/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049.1675784874 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From 3626d00304e503a309769aa40797296413b5589a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 09:41:57 +0000 Subject: [PATCH 05/36] Bump maven-compiler-plugin from 3.10.1 to 3.11.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91176f9..3acdf1e 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 UTF-8 - 3.10.1 + 3.11.0 3.0.0-M9 3.2.0 From 943f830b05c406624dc5331381a93fd85d2f1ff3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 09:41:58 +0000 Subject: [PATCH 06/36] Bump quarkus.platform.version from 2.16.3.Final to 2.16.4.Final Bumps `quarkus.platform.version` from 2.16.3.Final to 2.16.4.Final. Updates `quarkus-universe-bom` from 2.16.3.Final to 2.16.4.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.16.3.Final...2.16.4.Final) Updates `quarkus-maven-plugin` from 2.16.3.Final to 2.16.4.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91176f9..d7f76e7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ SPDX-License-Identifier: Apache-2.0 0.0.4 0.12.0 - 2.16.3.Final + 2.16.4.Final 2.20.0 0.9.1 17 From 6a34aea6608a2774b5edb1d086b57a44f79c7d58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 12:20:54 +0000 Subject: [PATCH 07/36] Bump surefire-plugin.version from 3.0.0-M9 to 3.0.0 Bumps `surefire-plugin.version` from 3.0.0-M9 to 3.0.0. Updates `maven-surefire-plugin` from 3.0.0-M9 to 3.0.0 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M9...surefire-3.0.0) Updates `maven-failsafe-plugin` from 3.0.0-M9 to 3.0.0 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M9...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3acdf1e..0f99f4f 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 3.11.0 - 3.0.0-M9 + 3.0.0 3.2.0 0.0.4 From 6f4fd44987a80504e065d9c69735e5f3e2a0d088 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 12:36:43 +0000 Subject: [PATCH 08/36] Bump tycho-eclipserun-plugin from 3.0.2 to 3.0.4 Bumps tycho-eclipserun-plugin from 3.0.2 to 3.0.4. --- updated-dependencies: - dependency-name: org.eclipse.tycho.extras:tycho-eclipserun-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- riseclipse/riseclipse-p2-to-m2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riseclipse/riseclipse-p2-to-m2/pom.xml b/riseclipse/riseclipse-p2-to-m2/pom.xml index c5dae4b..dcc7b62 100644 --- a/riseclipse/riseclipse-p2-to-m2/pom.xml +++ b/riseclipse/riseclipse-p2-to-m2/pom.xml @@ -29,7 +29,7 @@ SPDX-License-Identifier: Apache-2.0 org.eclipse.tycho.extras tycho-eclipserun-plugin - 3.0.2 + 3.0.4 ${project.build.directory}/maven/tmp/cbi JavaSE-17 From 2241c9a7d9e946612f2dee965666cf07867db57b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Mar 2023 09:00:50 +0000 Subject: [PATCH 09/36] Bump fr.centralesupelec.edf.riseclipse.main from 1.2.6 to 1.2.7 Bumps [fr.centralesupelec.edf.riseclipse.main](https://github.com/riseclipse/riseclipse-main) from 1.2.6 to 1.2.7. - [Release notes](https://github.com/riseclipse/riseclipse-main/releases) - [Commits](https://github.com/riseclipse/riseclipse-main/compare/riseclipse-main-1.2.6...riseclipse-main-1.2.7) --- updated-dependencies: - dependency-name: io.github.riseclipse:fr.centralesupelec.edf.riseclipse.main dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- riseclipse/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riseclipse/pom.xml b/riseclipse/pom.xml index d83c2b6..d7cf0de 100644 --- a/riseclipse/pom.xml +++ b/riseclipse/pom.xml @@ -36,7 +36,7 @@ SPDX-License-Identifier: Apache-2.0 1.2.19 1.0.0 - 1.2.6 + 1.2.7 1.2.5 ${project.basedir}/riseclipse-p2-to-m2 From 93fc9c4e82fb838982c614af31199c875356ddab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 09:02:15 +0000 Subject: [PATCH 10/36] Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.7-1085 to 8.7-1085.1679482090. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/src/main/docker/Dockerfile.jvm | 2 +- app/src/main/docker/Dockerfile.native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index 52ad7bd..2674819 100644 --- a/app/src/main/docker/Dockerfile.jvm +++ b/app/src/main/docker/Dockerfile.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-1085 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085.1679482090 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile.native b/app/src/main/docker/Dockerfile.native index e0d19e7..568823a 100644 --- a/app/src/main/docker/Dockerfile.native +++ b/app/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085.1679482090 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From e344088356e95ef74a53df160aeced19923f549b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 15:38:48 +0000 Subject: [PATCH 11/36] Bump fr.centralesupelec.edf.riseclipse.iec61850.scl from 1.2.5 to 1.2.6 Bumps [fr.centralesupelec.edf.riseclipse.iec61850.scl](https://github.com/riseclipse/riseclipse-metamodel-scl2003) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/riseclipse/riseclipse-metamodel-scl2003/releases) - [Commits](https://github.com/riseclipse/riseclipse-metamodel-scl2003/compare/riseclipse-metamodel-scl2003-1.2.5...riseclipse-metamodel-scl2003-1.2.6) --- updated-dependencies: - dependency-name: io.github.riseclipse:fr.centralesupelec.edf.riseclipse.iec61850.scl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- riseclipse/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riseclipse/pom.xml b/riseclipse/pom.xml index d7cf0de..e319f70 100644 --- a/riseclipse/pom.xml +++ b/riseclipse/pom.xml @@ -37,7 +37,7 @@ SPDX-License-Identifier: Apache-2.0 1.0.0 1.2.7 - 1.2.5 + 1.2.6 ${project.basedir}/riseclipse-p2-to-m2 From 41c35b61e2684d8cefa0407c8b63169d9d564101 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 15:38:50 +0000 Subject: [PATCH 12/36] Bump quarkus.platform.version from 2.16.4.Final to 2.16.5.Final Bumps `quarkus.platform.version` from 2.16.4.Final to 2.16.5.Final. Updates `quarkus-universe-bom` from 2.16.4.Final to 2.16.5.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.16.4.Final...2.16.5.Final) Updates `quarkus-maven-plugin` from 2.16.4.Final to 2.16.5.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ca7d89..5adaf3f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ SPDX-License-Identifier: Apache-2.0 0.0.4 0.12.0 - 2.16.4.Final + 2.16.5.Final 2.20.0 0.9.1 17 From 1c376cdae1f4f13f2cfa7daf37c797c2e1be7411 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Mar 2023 09:00:55 +0000 Subject: [PATCH 13/36] Bump maven-resources-plugin from 3.3.0 to 3.3.1 Bumps [maven-resources-plugin](https://github.com/apache/maven-resources-plugin) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-resources-plugin/releases) - [Commits](https://github.com/apache/maven-resources-plugin/compare/maven-resources-plugin-3.3.0...maven-resources-plugin-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-resources-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- riseclipse/validator-riseclipse/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riseclipse/validator-riseclipse/pom.xml b/riseclipse/validator-riseclipse/pom.xml index 4e86133..d3ba6b3 100644 --- a/riseclipse/validator-riseclipse/pom.xml +++ b/riseclipse/validator-riseclipse/pom.xml @@ -106,7 +106,7 @@ SPDX-License-Identifier: Apache-2.0 maven-resources-plugin - 3.3.0 + 3.3.1 copy-resources From b1b06938e2da62a0b43adfa44516973ef9fca607 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 09:02:57 +0000 Subject: [PATCH 14/36] Bump jacoco-maven-plugin from 0.8.8 to 0.8.9 Bumps [jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.8 to 0.8.9. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.8...v0.8.9) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5adaf3f..72c22e8 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ SPDX-License-Identifier: Apache-2.0 java - 0.8.8 + 0.8.9 jacoco target/site/jacoco/jacoco.xml, From 75b22923ff4bffa2706a3e20ba48515119d5f992 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 09:01:05 +0000 Subject: [PATCH 15/36] Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.7-1085.1679482090 to 8.7-1107. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/src/main/docker/Dockerfile.jvm | 2 +- app/src/main/docker/Dockerfile.native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index 2674819..efc52a9 100644 --- a/app/src/main/docker/Dockerfile.jvm +++ b/app/src/main/docker/Dockerfile.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-1085.1679482090 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile.native b/app/src/main/docker/Dockerfile.native index 568823a..52c42ee 100644 --- a/app/src/main/docker/Dockerfile.native +++ b/app/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085.1679482090 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From f01b33152dba7b3cabaf1a4307816380d068f4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mu=C3=B1oz?= Date: Wed, 7 Jun 2023 19:14:13 +0200 Subject: [PATCH 16/36] refactor: split SC worflow into build & analysis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan Muñoz --- .github/workflows/sonarcloud-analysis.yml | 170 ++++++++++++---------- .github/workflows/sonarcloud-build.yml | 78 ++++++++++ 2 files changed, 175 insertions(+), 73 deletions(-) create mode 100644 .github/workflows/sonarcloud-build.yml diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 70e6464..8d881b1 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -4,83 +4,107 @@ name: SonarCloud Analysis -on: - push: - branches: - - '**' - pull_request: - branches: - - 'main' - - 'develop' - pull_request_target: - branches: - - 'main' - - 'develop' +on: + workflow_run: + workflows: [SonarCloud Build] + types: [completed] jobs: - build: - name: SonarCloud + sonar-check: runs-on: ubuntu-latest + if: github.event.workflow_run.conclusion == 'success' 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 - submodules: 'true' - - - 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 + submodules: 'true' + - 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-validator \ - -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-validator \ + -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 0000000..10d527b --- /dev/null +++ b/.github/workflows/sonarcloud-build.yml @@ -0,0 +1,78 @@ +# 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 + submodules: 'true' + + - 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 From 0d3c09f0500f4ee44a5609b67240d2c4706001ee Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Tue, 21 Jan 2025 13:04:00 +0100 Subject: [PATCH 17/36] chore: Remove apache license Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- app/src/test/data/ocl/Busbar.ocl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/src/test/data/ocl/Busbar.ocl b/app/src/test/data/ocl/Busbar.ocl index 0b5c87d..fc44fca 100644 --- a/app/src/test/data/ocl/Busbar.ocl +++ b/app/src/test/data/ocl/Busbar.ocl @@ -1,9 +1,3 @@ -/* - ** SPDX-FileCopyrightText: 2022 Alliander N.V. - ** - ** SPDX-License-Identifier: Apache-2.0 - */ - /* ************************************************************************* ** Copyright (c) 2016-2021 CentraleSupélec & EDF. From c7cac0dd8f07a7dd200c7e23ec7c8e491b601c34 Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Tue, 21 Jan 2025 13:04:42 +0100 Subject: [PATCH 18/36] chore: Remove apache license Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- .../validator-riseclipse/src/test/data/ocl/Busbar.ocl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl b/riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl index 0b5c87d..fc44fca 100644 --- a/riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl +++ b/riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl @@ -1,9 +1,3 @@ -/* - ** SPDX-FileCopyrightText: 2022 Alliander N.V. - ** - ** SPDX-License-Identifier: Apache-2.0 - */ - /* ************************************************************************* ** Copyright (c) 2016-2021 CentraleSupélec & EDF. From 58cd1ac1833fe8f9c810f6e7091b32e0883a4890 Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Tue, 21 Jan 2025 13:05:11 +0100 Subject: [PATCH 19/36] chore: Remove apache license Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- .../src/test/resources/ocl-testfiles/example.ocl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/example.ocl b/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/example.ocl index 0b5c87d..fc44fca 100644 --- a/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/example.ocl +++ b/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/example.ocl @@ -1,9 +1,3 @@ -/* - ** SPDX-FileCopyrightText: 2022 Alliander N.V. - ** - ** SPDX-License-Identifier: Apache-2.0 - */ - /* ************************************************************************* ** Copyright (c) 2016-2021 CentraleSupélec & EDF. From 57ade9e50eadbb81ea16d8ae0f7a812cb84c6563 Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Tue, 21 Jan 2025 13:05:58 +0100 Subject: [PATCH 20/36] chore: Remove apache license Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- .../src/test/resources/ocl-testfiles/invalid.ocl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/invalid.ocl b/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/invalid.ocl index a359cf7..c2812e2 100644 --- a/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/invalid.ocl +++ b/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/invalid.ocl @@ -1,9 +1,3 @@ -/* - ** SPDX-FileCopyrightText: 2022 Alliander N.V. - ** - ** SPDX-License-Identifier: Apache-2.0 - */ - /* ************************************************************************* ** Copyright (c) 2016-2021 CentraleSupélec & EDF. From 54dd144faeddffcad341df19505105c0df60048b Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:00:33 +0100 Subject: [PATCH 21/36] chore: Format license Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- app/src/test/data/ocl/Busbar.ocl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/test/data/ocl/Busbar.ocl b/app/src/test/data/ocl/Busbar.ocl index fc44fca..8736aac 100644 --- a/app/src/test/data/ocl/Busbar.ocl +++ b/app/src/test/data/ocl/Busbar.ocl @@ -1,6 +1,6 @@ /* ************************************************************************* -** Copyright (c) 2016-2021 CentraleSupélec & EDF. +** SPDX-FileCopyrightText: Copyright (c) 2016-2021 CentraleSupélec & EDF. ** All rights reserved. This program and the accompanying materials ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at @@ -16,6 +16,8 @@ ** aurelie.dehouck-neveu@edf.fr ** Web site: ** https://riseclipse.github.io/ +** +** SPDX-License-Identifier: Eclipse Public License v2.0 ************************************************************************* */ From 324f909049666318e43e56f082bd6246e0250d1e Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:01:18 +0100 Subject: [PATCH 22/36] chore: Format license Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl b/riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl index fc44fca..8736aac 100644 --- a/riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl +++ b/riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl @@ -1,6 +1,6 @@ /* ************************************************************************* -** Copyright (c) 2016-2021 CentraleSupélec & EDF. +** SPDX-FileCopyrightText: Copyright (c) 2016-2021 CentraleSupélec & EDF. ** All rights reserved. This program and the accompanying materials ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at @@ -16,6 +16,8 @@ ** aurelie.dehouck-neveu@edf.fr ** Web site: ** https://riseclipse.github.io/ +** +** SPDX-License-Identifier: Eclipse Public License v2.0 ************************************************************************* */ From a504ba62dd1dc8c41384b0526fe5d24e61c965c5 Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:01:46 +0100 Subject: [PATCH 23/36] chore: Format license Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- .../src/test/resources/ocl-testfiles/example.ocl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/example.ocl b/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/example.ocl index fc44fca..8736aac 100644 --- a/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/example.ocl +++ b/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/example.ocl @@ -1,6 +1,6 @@ /* ************************************************************************* -** Copyright (c) 2016-2021 CentraleSupélec & EDF. +** SPDX-FileCopyrightText: Copyright (c) 2016-2021 CentraleSupélec & EDF. ** All rights reserved. This program and the accompanying materials ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at @@ -16,6 +16,8 @@ ** aurelie.dehouck-neveu@edf.fr ** Web site: ** https://riseclipse.github.io/ +** +** SPDX-License-Identifier: Eclipse Public License v2.0 ************************************************************************* */ From e9671950af6e89cb4905bfc933d337006287fea1 Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:02:16 +0100 Subject: [PATCH 24/36] chore: Format license Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- .../src/test/resources/ocl-testfiles/invalid.ocl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/invalid.ocl b/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/invalid.ocl index c2812e2..1d65d16 100644 --- a/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/invalid.ocl +++ b/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/invalid.ocl @@ -1,6 +1,6 @@ /* ************************************************************************* -** Copyright (c) 2016-2021 CentraleSupélec & EDF. +** SPDX-FileCopyrightText: Copyright (c) 2016-2021 CentraleSupélec & EDF. ** All rights reserved. This program and the accompanying materials ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at @@ -16,6 +16,8 @@ ** aurelie.dehouck-neveu@edf.fr ** Web site: ** https://riseclipse.github.io/ +** +** SPDX-License-Identifier: Eclipse Public License v2.0 ************************************************************************* */ From e43a9e432de5b17f547c39aefc8cc4c4b6cdabad Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:15:21 +0100 Subject: [PATCH 25/36] chore: Fix license name Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- app/src/test/data/ocl/Busbar.ocl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/test/data/ocl/Busbar.ocl b/app/src/test/data/ocl/Busbar.ocl index 8736aac..09b82e5 100644 --- a/app/src/test/data/ocl/Busbar.ocl +++ b/app/src/test/data/ocl/Busbar.ocl @@ -17,7 +17,7 @@ ** Web site: ** https://riseclipse.github.io/ ** -** SPDX-License-Identifier: Eclipse Public License v2.0 +** SPDX-License-Identifier: Eclipse Public License 2.0 ************************************************************************* */ From b9f26f59f9df035aeb6164f3bf49a15d6a5ec103 Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:31:23 +0100 Subject: [PATCH 26/36] chore: Add eclipse public license to readme Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b2ec46..f7128c8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Maven Build Github Action Status]()](https://github.com/com-pas/compas-scl-validator/actions?query=workflow%3A%22Build+Project%22) From d4e72d1ce952a337b15756802025045d8082b85d Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:32:11 +0100 Subject: [PATCH 27/36] chore: Fix epl license identifier Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- app/src/test/data/ocl/Busbar.ocl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/test/data/ocl/Busbar.ocl b/app/src/test/data/ocl/Busbar.ocl index 09b82e5..6249802 100644 --- a/app/src/test/data/ocl/Busbar.ocl +++ b/app/src/test/data/ocl/Busbar.ocl @@ -17,7 +17,7 @@ ** Web site: ** https://riseclipse.github.io/ ** -** SPDX-License-Identifier: Eclipse Public License 2.0 +** SPDX-License-Identifier: EPL-2.0 ************************************************************************* */ From f60846bcf301d1e884611a3af0f5b941d4da6caa Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:34:56 +0100 Subject: [PATCH 28/36] chore: Fix epl license identifier Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl b/riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl index 8736aac..6249802 100644 --- a/riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl +++ b/riseclipse/validator-riseclipse/src/test/data/ocl/Busbar.ocl @@ -17,7 +17,7 @@ ** Web site: ** https://riseclipse.github.io/ ** -** SPDX-License-Identifier: Eclipse Public License v2.0 +** SPDX-License-Identifier: EPL-2.0 ************************************************************************* */ From b9cf1611b43200e9ba36d684085991a09696e955 Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:35:28 +0100 Subject: [PATCH 29/36] chore: Fix epl license identifier Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- .../src/test/resources/ocl-testfiles/example.ocl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/example.ocl b/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/example.ocl index 8736aac..6249802 100644 --- a/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/example.ocl +++ b/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/example.ocl @@ -17,7 +17,7 @@ ** Web site: ** https://riseclipse.github.io/ ** -** SPDX-License-Identifier: Eclipse Public License v2.0 +** SPDX-License-Identifier: EPL-2.0 ************************************************************************* */ From 7fabc007d6d113d8939637f242ca541499ce8527 Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:35:47 +0100 Subject: [PATCH 30/36] chore: Fix epl license identifier Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- .../src/test/resources/ocl-testfiles/invalid.ocl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/invalid.ocl b/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/invalid.ocl index 1d65d16..e6cc242 100644 --- a/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/invalid.ocl +++ b/riseclipse/validator-riseclipse/src/test/resources/ocl-testfiles/invalid.ocl @@ -17,7 +17,7 @@ ** Web site: ** https://riseclipse.github.io/ ** -** SPDX-License-Identifier: Eclipse Public License v2.0 +** SPDX-License-Identifier: EPL-2.0 ************************************************************************* */ From 69d2ab1fb6f6de95486c853ab6459f83780da082 Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:43:40 +0100 Subject: [PATCH 31/36] chore: Add LICENSE-EPL Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- LICENSE-EPL | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 LICENSE-EPL diff --git a/LICENSE-EPL b/LICENSE-EPL new file mode 100644 index 0000000..78756b5 --- /dev/null +++ b/LICENSE-EPL @@ -0,0 +1,80 @@ +Eclipse Public License - v 2.0 +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS +“Contribution” means: + +a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and +b) in the case of each subsequent Contributor: +i) changes to the Program, and +ii) additions to the Program; +where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works. +“Contributor” means any person or entity that Distributes the Program. + +“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. + +“Program” means the Contributions Distributed in accordance with this Agreement. + +“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors. + +“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. + +“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or Modified Works thereof. + +“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy. + +“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files. + +“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor. + +2. GRANT OF RIGHTS +a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works. +b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. +c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to Distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. +d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. +e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3). +3. REQUIREMENTS +3.1 If a Contributor Distributes the Program in any form, then: + +a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and +b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license: +i) effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; +ii) effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; +iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and +iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3. +3.2 When the Program is Distributed as Source Code: + +a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and +b) a copy of this Agreement must be included with each copy of the Program. +3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (‘notices’) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices. + +4. COMMERCIAL DISTRIBUTION +Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Contributor”) hereby agrees to defend and indemnify every other Contributor (“Indemnified Contributor”) against any losses, damages and costs (collectively “Losses”) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. + +5. NO WARRANTY +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL +If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be Distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to Distribute the Program (including its Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement. + +Exhibit A – Form of Secondary Licenses Notice +“This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.” + +Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses. + +If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice. + +You may add additional accurate notices of copyright ownership. From 66d9f19995312e2c4f1d70d5170ecef957c0c93c Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:55:29 +0100 Subject: [PATCH 32/36] chore: Move epl license Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- LICENSE-EPL => LICENSES/EPL-2.0 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE-EPL => LICENSES/EPL-2.0 (100%) diff --git a/LICENSE-EPL b/LICENSES/EPL-2.0 similarity index 100% rename from LICENSE-EPL rename to LICENSES/EPL-2.0 From 07f7513222083fc9a0db9d8625f91c3fd3b350cd Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:59:47 +0100 Subject: [PATCH 33/36] chore: Fix epl file name Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- LICENSES/{EPL-2.0 => EPL-2.0.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSES/{EPL-2.0 => EPL-2.0.txt} (100%) diff --git a/LICENSES/EPL-2.0 b/LICENSES/EPL-2.0.txt similarity index 100% rename from LICENSES/EPL-2.0 rename to LICENSES/EPL-2.0.txt From 8e25d1103289319fd4fc07f781efc20bc872af42 Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Tue, 15 Jul 2025 15:50:19 +0200 Subject: [PATCH 34/36] doc: Create RELEASE.md Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- RELEASE.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 RELEASE.md diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 0000000..b679748 --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,3 @@ +# Release + +See the official [contributing guide](https://com-pas.github.io/contributing/) on how to [release](https://com-pas.github.io/contributing/RELEASES.html) and [deploy](https://com-pas.github.io/contributing/DEPLOYMENT.html). From 5a7dd5886ab4bbfef95d924033ac28984ed00131 Mon Sep 17 00:00:00 2001 From: Christopher Lepski <139237321+clepski@users.noreply.github.com> Date: Tue, 15 Jul 2025 15:51:01 +0200 Subject: [PATCH 35/36] doc: Create RELEASE.md.license Signed-off-by: Christopher Lepski <139237321+clepski@users.noreply.github.com> --- RELEASE.md.license | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 RELEASE.md.license diff --git a/RELEASE.md.license b/RELEASE.md.license new file mode 100644 index 0000000..9ab6622 --- /dev/null +++ b/RELEASE.md.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 Alliander N.V. + +SPDX-License-Identifier: Apache-2.0 From 2c30b16e0c892226c4e259e14bec3dcf15de7d51 Mon Sep 17 00:00:00 2001 From: Sander Jansen Date: Wed, 16 Jul 2025 09:04:24 +0200 Subject: [PATCH 36/36] Update readme with unmaintained notice Signed-off-by: Sander Jansen --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f7128c8..04f6df3 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ SPDX-License-Identifier: Apache-2.0 or EPL-2.0 Service to validate SCL Files. +**The CoMPAS SCL validator is currently not maintained. It is waiting for a refactor to work properly.** + ## Rest and Websockets versions The validation can be done using both Rest and Websockets as transportation technic.