Upgrade to JDK 17

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

.github/workflows/build-project.yml

@@ -37,11 +37,11 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
-      - name: Set up JDK 1.11
+      - name: Set up JDK 17
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - name: Create custom Maven Settings.xml
         uses: whelk-io/maven-settings-xml-action@v20

.github/workflows/release-project.yml

@@ -41,11 +41,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##*/})"
-      - name: Set up JDK 1.11
+      - name: Set up JDK 17
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - name: Create custom Maven Settings.xml
         uses: whelk-io/maven-settings-xml-action@v20

.github/workflows/sonarcloud-analysis.yml

@@ -30,11 +30,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 1.11
+      - name: Set up JDK 17
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

pom.xml

@@ -15,8 +15,7 @@ SPDX-License-Identifier: Apache-2.0
 
     <properties>
         <maven.compiler.parameters>true</maven.compiler.parameters>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 

service/src/main/java/org/lfenergy/compas/scl/auto/alignment/common/ElementUtil.java

@@ -24,7 +24,7 @@ public static Stream<Element> getElementsStream(Element element, String tagName)
                 .map(Element.class::cast);
     }
 
-    public static String getAttribute(Element element, String attributeName) {
+    public static String getAttributeValue(Element element, String attributeName) {
         String value = element.getAttribute(attributeName);
         if (StringUtils.isNotBlank(value)) {
             return value;

service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/AbstractGenericEntity.java

@@ -25,7 +25,7 @@ protected Stream<Element> getElementsStream(String tagName) {
     }
 
     protected String getAttribute(String attributeName) {
-        return ElementUtil.getAttribute(element, attributeName);
+        return ElementUtil.getAttributeValue(element, attributeName);
     }
 
     protected double convertStringToDouble(Element element) {

service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/AbstractGenericNameEntity.java

@@ -12,7 +12,7 @@ protected AbstractGenericNameEntity(P parent, Element element) {
     }
 
     public String getName() {
-        return ElementUtil.getAttribute(getElement(), "name");
+        return ElementUtil.getAttributeValue(getElement(), "name");
     }
 
     @Override

service/src/test/java/org/lfenergy/compas/scl/auto/alignment/common/ElementUtilTest.java

@@ -30,7 +30,7 @@ void getElementsStream_WhenCalledWithSCLElement_ThenRetrieveTheSubstationElement
     void getAttribute_WhenCalledWithSCLElement_ThenRetrieveVersionAttributeFromSCLElement() throws IOException {
         var scl = readSCLElement(BASIC_SCD_FILENAME);
 
-        var result = ElementUtil.getAttribute(scl, "version");
+        var result = ElementUtil.getAttributeValue(scl, "version");
         assertNotNull(result);
         assertEquals("2007", result);
     }
@@ -39,7 +39,7 @@ void getAttribute_WhenCalledWithSCLElement_ThenRetrieveVersionAttributeFromSCLEl
     void getAttribute_WhenCalledWithSCLElement_ThenRetrieveEmptyDummyAttributeFromSCLElementAsNull() throws IOException {
         var scl = readSCLElement(BASIC_SCD_FILENAME);
 
-        var result = ElementUtil.getAttribute(scl, "dummy");
+        var result = ElementUtil.getAttributeValue(scl, "dummy");
         assertNull(result);
     }
 }