Merge pull request #62 from com-pas/develop

Merge branch 'develop' into master
com-pas · Sep 7, 2021 · 0e2b435 · 0e2b435
2 parents 33f300e + a04450d
commit 0e2b435
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 18 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,40 @@
+# SPDX-FileCopyrightText: 2021 Alliander N.V.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+version: 2
+
+registries:
+  maven-github:
+    type: maven-repository
+    url: https://maven.pkg.github.com/com-pas/*
+    username: OWNER
+    password: ${{ secrets.DB_GITHUB_PACKAGES }}
+
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 5
+
+  # Maintain dependencies for Maven
+  - package-ecosystem: "maven"
+    directory: "/"
+    registries:
+      - maven-github
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 5
+    ignore:
+      # Next two dependencies shouldn't be upgrade, because Quarkus isn't using newer version of EL.
+      - dependency-name: org.hibernate.validator:hibernate-validator
+        versions: [ "[7.0,)" ]
+      - dependency-name: org.glassfish:jakarta.el
+        versions: [ "[4.0,)" ]
+      # Next two dependencies shouldn't be upgrade, because RestEasy isn't using newer version. (2.3.X)
+      - dependency-name: jakarta.xml.bind:jakarta.xml.bind-api
+        versions: [ "[3.0,)" ]
+      - dependency-name: com.sun.xml.bind:jaxb-impl
+        versions: [ "[3.0,)" ]
diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
@@ -15,9 +15,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 1.11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2.3.0
       with:
-        java-version: 1.11
+        distribution: 'zulu'
+        java-version: '11'
     - name: Create custom Maven Settings.xml
       uses: whelk-io/maven-settings-xml-action@v18
       with:

diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml
@@ -21,10 +21,11 @@ jobs:
         shell: bash
         # 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##*/})"
-      - uses: actions/setup-java@v2
+      - name: Set up JDK 1.11
+        uses: actions/setup-java@v2.3.0
         with:
+          distribution: 'zulu'
           java-version: '11'
-          distribution: 'adopt'
       - name: Create custom Maven Settings.xml
         uses: whelk-io/maven-settings-xml-action@v18
         with:

diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml
@@ -14,18 +14,19 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 1.11
+        uses: actions/setup-java@v2.3.0
         with:
-          java-version: 11
+          distribution: 'zulu'
+          java-version: '11'
       - name: Cache SonarCloud packages
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Maven packages
-        uses: actions/cache@v1
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/pom.xml b/pom.xml
@@ -19,12 +19,12 @@ SPDX-License-Identifier: Apache-2.0
         <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <compas.scl.xsd.version>0.0.1</compas.scl.xsd.version>
-        <slf4j.version>1.7.31</slf4j.version>
-        <jackson.version>2.12.4</jackson.version>
+        <compas.scl.xsd.version>0.0.2</compas.scl.xsd.version>
+        <slf4j.version>1.7.32</slf4j.version>
+        <jackson.version>2.12.5</jackson.version>
         <jaxb.bind.version>2.3.3</jaxb.bind.version>
         <junit.jupiter.version>5.7.2</junit.jupiter.version>
-        <mockito-junit-jupiter.version>3.11.2</mockito-junit-jupiter.version>
+        <mockito-junit-jupiter.version>3.12.4</mockito-junit-jupiter.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>
 
@@ -96,7 +96,7 @@ SPDX-License-Identifier: Apache-2.0
             <dependency>
                 <groupId>org.glassfish</groupId>
                 <artifactId>jakarta.el</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.4</version>
                 <scope>test</scope>
             </dependency>
 
@@ -114,7 +114,7 @@ SPDX-License-Identifier: Apache-2.0
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
-                <version>2.1</version>
+                <version>2.1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
@@ -218,7 +218,7 @@ SPDX-License-Identifier: Apache-2.0
                 <plugin>
                     <groupId>org.jboss.jandex</groupId>
                     <artifactId>jandex-maven-plugin</artifactId>
-                    <version>1.1.0</version>
+                    <version>1.2.0</version>
                     <executions>
                         <execution>
                             <id>make-index</id>
@@ -240,7 +240,7 @@ SPDX-License-Identifier: Apache-2.0
                 <sonar.language>java</sonar.language>
 
                 <!-- JaCoCo Properties -->
-                <jacoco.version>0.8.6</jacoco.version>
+                <jacoco.version>0.8.7</jacoco.version>
                 <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
             </properties>
 
@@ -288,7 +288,7 @@ SPDX-License-Identifier: Apache-2.0
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-source-plugin</artifactId>
-                            <version>3.2.0</version>
+                            <version>3.2.1</version>
                             <executions>
                                 <execution>
                                     <id>attach-sources</id>