Merge pull request #173 from com-pas/develop

Creating new release
com-pas · Jan 17, 2022 · d4cecf9 · d4cecf9
2 parents 3a73867 + cdfbae9
commit d4cecf9
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 14 deletions.
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,26 @@
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+changelog:
+  exclude:
+    labels:
+      - wontfix
+      - duplicate
+      - invalid
+  categories:
+    - title: New Features
+      labels:
+        - enhancement
+    - title: Bugfixes
+      labels:
+        - bug
+    - title: Tooling changes
+      labels:
+        - tooling
+    - title: Dependency updates
+      labels:
+        - dependencies
+    - title: Other Changes
+      labels:
+        - "*"
diff --git a/.github/workflows/automate-projects.yml b/.github/workflows/automate-projects.yml
@@ -4,11 +4,13 @@
 
 name: Add issues and pull request to project boards
 
-on: [ issues, pull_request ]
+on: [issues, pull_request, pull_request_target]
 
 jobs:
   github-actions-automate-projects:
     runs-on: ubuntu-latest
+
+    if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
     steps:
       - name: add-new-issues-to-repository-based-project-column
         uses: docker://takanabe/github-actions-automate-projects:v0.0.1
@@ -19,7 +21,7 @@ jobs:
           GITHUB_PROJECT_COLUMN_NAME: To do
       - name: add-new-pull-request-to-repository-based-project-column
         uses: docker://takanabe/github-actions-automate-projects:v0.0.1
-        if: github.event_name == 'pull_request' && github.event.action == 'opened'
+        if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_PROJECT_URL: https://github.com/com-pas/compas-cim-mapping/projects/2
@@ -33,7 +35,7 @@ jobs:
           GITHUB_PROJECT_COLUMN_NAME: To do
       - name: add-new-pull-request-to-organization-based-project-column
         uses: docker://takanabe/github-actions-automate-projects:v0.0.1
-        if: github.event_name == 'pull_request' && github.event.action == 'opened'
+        if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
         env:
           GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
           GITHUB_PROJECT_URL: https://github.com/orgs/com-pas/projects/2

diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
@@ -38,7 +38,7 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Set up JDK 1.11
-        uses: actions/setup-java@v2.4.0
+        uses: actions/setup-java@v2.5.0
         with:
           distribution: 'zulu'
           java-version: '11'

diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml
@@ -41,7 +41,7 @@ jobs:
         # Extra the tagname form the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
         run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
       - name: Set up JDK 1.11
-        uses: actions/setup-java@v2.4.0
+        uses: actions/setup-java@v2.5.0
         with:
           distribution: 'zulu'
           java-version: '11'

diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml
@@ -12,20 +12,24 @@ on:
     branches:
       - 'main'
       - 'develop'
+  pull_request_target:
+    branches:
+      - 'main'
+      - 'develop'
 
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
     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:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-
       - name: Set up JDK 1.11
-        uses: actions/setup-java@v2.4.0
+        uses: actions/setup-java@v2.5.0
         with:
           distribution: 'zulu'
           java-version: '11'
@@ -57,4 +61,5 @@ jobs:
           -Dsonar.projectKey=com-pas_compas-cim-mapping \
           -Dsonar.organization=com-pas \
           -Dsonar.host.url=https://sonarcloud.io \
+          -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \
           clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
diff --git a/MAPPING.md b/MAPPING.md
@@ -11,6 +11,9 @@ There is an IEC document describing the mapping, namely IEC/TS 62361-102, but no
 
 ## Mapping IEC CIM to IEC 61850
 
+**Remark**: In CIM the name is optional, so when the name is not there the ID is used. This is the case for many
+entities described below (``name or id``).
+
 | CIM Class                        | IEC Class                        | Remark    |
 | -------------------------------- | -------------------------------- | --------- |
 | *cim:Substation*                 | *TSubstation*                    |           |

diff --git a/pom.xml b/pom.xml
@@ -20,16 +20,16 @@ SPDX-License-Identifier: Apache-2.0
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <compiler-plugin.version>3.8.1</compiler-plugin.version>
+        <compiler-plugin.version>3.9.0</compiler-plugin.version>
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
         <sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
 
-        <compas.core.version>0.6.0</compas.core.version>
+        <compas.core.version>0.7.0</compas.core.version>
 
-        <quarkus.platform.version>2.4.2.Final</quarkus.platform.version>
+        <quarkus.platform.version>2.6.2.Final</quarkus.platform.version>
         <microprofile-openapi-api.version>3.0</microprofile-openapi-api.version>
-        <slf4j.version>1.7.32</slf4j.version>
-        <powsybl.version>4.5.1</powsybl.version>
+        <slf4j.version>1.7.33</slf4j.version>
+        <powsybl.version>4.6.0</powsybl.version>
         <mapstruct.version>1.4.2.Final</mapstruct.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>
@@ -141,7 +141,7 @@ SPDX-License-Identifier: Apache-2.0
                 <plugin>
                     <groupId>org.jboss.jandex</groupId>
                     <artifactId>jandex-maven-plugin</artifactId>
-                    <version>1.2.1</version>
+                    <version>1.2.2</version>
                     <executions>
                         <execution>
                             <id>make-index</id>
@@ -155,7 +155,7 @@ SPDX-License-Identifier: Apache-2.0
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.2.2</version>
                 </plugin>
             </plugins>
         </pluginManagement>