jdk 11 compile target reverted

Signed-off-by: David Kral <[email protected]>
Verdent · Jul 10, 2024 · 0022c0a · 0022c0a
1 parent 2f0ad11
commit 0022c0a
Show file tree

Hide file tree

Showing 8 changed files with 121 additions and 283 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,33 +21,26 @@ jobs:
 
     strategy:
       matrix:
-        java_version: [ 11, 17 ]
+        java_version: [ 11, 17, 21 ]
 
     steps:
       - name: Checkout for build
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up compile JDK
         uses: actions/setup-java@v4
-        with: #Compile java needs to be the highest to ensure proper compilation of the multi-release jar
+        with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: ${{ matrix.java_version }}
           cache: 'maven'
       - name: Copyright
         run: bash etc/copyright.sh
       - name: Checkstyle
-        run: mvn -B checkstyle:checkstyle
+        run: mvn -B checkstyle:checkstyle -Pstaging
       - name: Yasson install
-#        run: mvn -U -C -Pstaging clean install -DskipTests
-        run: mvn -U -C clean install -DskipTests
-      - name: Set up JDK for tests
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java_version }}
-          cache: 'maven'
+        run: mvn -U -C clean install -Pstaging -DskipTests
       - name: Yasson tests
         run: mvn -U -B -C -Dmaven.javadoc.skip=true -Pstaging verify
       - name: JSONB-API TCK
-        run: cd yasson-tck && mvn -U -B test -DargLine="-Djava.locale.providers=COMPAT"
+        run: cd yasson-tck && mvn -U -B test -DargLine="-Djava.locale.providers=COMPAT" -Pstaging
diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -88,7 +88,7 @@
         <!-- Checks for Javadoc comments.                     -->
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
         <module name="JavadocMethod">
-            <property name="scope" value="protected"/>
+            <property name="accessModifiers" value="protected"/>
             <property name="allowMissingReturnTag" value="true"/>
             <property name="allowMissingParamTags" value="true"/>
         </module>