Upgrade to Java 21 (#131)

* Upgrade to lastest PSF using Java 21

* Upgrade pom and CI to use Java 21

* Add annotation that suppress this-escapes warnings

* Bump com.google.errorprone:error_prone_core from 2.44.0 to 2.46.0

* Comment out testing SIFIS-Home in CI

This change is due to the fact that (the particular commit point of) its
code base uses Java 1.7 which is no longer supported when using JDK 21.

Author: kostis

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - uses: ts-graphviz/setup-graphviz@v2
       - name: Install pydot
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - uses: ts-graphviz/setup-graphviz@v2
       - name: Install pydot
@@ -71,7 +71,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - uses: ts-graphviz/setup-graphviz@v2
       - name: Install pydot
@@ -97,7 +97,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - uses: ts-graphviz/setup-graphviz@v2
       - name: Install pydot
@@ -114,57 +114,57 @@ jobs:
           java -jar edhoc-fuzzer.jar @experiments/args/rise/server_m4_app -roundLimit 5
           ./scripts/diff_hyps.sh experiments/saved_results/servers/rise_m4_app experiments/results/servers/rise_m4_app 5
 
-  SIFIS-HOME-Client:
-    if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-java@v5
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - uses: ts-graphviz/setup-graphviz@v2
-      - name: Install pydot
-        run: pip3 install pydot
-
-      - name: Setup EDHOC-Fuzzer
-        run: ./scripts/setup_fuzzer.sh -l
-
-      - name: Setup SIFIS-HOME
-        run: ./scripts/setup_sul.sh sifis-home
-
-      - name: Test SIFIS-HOME Client (phase_1)
-        run: |
-          java -jar edhoc-fuzzer.jar @experiments/args/sifis-home/client_phase_1 -roundLimit 4
-          ./scripts/diff_hyps.sh experiments/saved_results/clients/sifis-home_phase_1 experiments/results/clients/sifis-home_phase_1 4
-
-  SIFIS-HOME-Server:
-    if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-java@v5
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - uses: ts-graphviz/setup-graphviz@v2
-      - name: Install pydot
-        run: pip3 install pydot
-
-      - name: Setup EDHOC-Fuzzer
-        run: ./scripts/setup_fuzzer.sh -l
-
-      - name: Setup SIFIS-HOME
-        run: ./scripts/setup_sul.sh sifis-home
-
-      - name: Test SIFIS-HOME Server (phase_1)
-        run: |
-          java -jar edhoc-fuzzer.jar @experiments/args/sifis-home/server_phase_1 -roundLimit 5
-          ./scripts/diff_hyps.sh experiments/saved_results/servers/sifis-home_phase_1 experiments/results/servers/sifis-home_phase_1 5
+#  SIFIS-HOME-Client:
+#    if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
+#    runs-on: ubuntu-latest
+#    strategy:
+#      fail-fast: true
+#    steps:
+#      - uses: actions/checkout@v6
+#      - uses: actions/setup-java@v5
+#        with:
+#          java-version: '21'
+#          distribution: 'temurin'
+#      - uses: ts-graphviz/setup-graphviz@v2
+#      - name: Install pydot
+#        run: pip3 install pydot
+#
+#      - name: Setup EDHOC-Fuzzer
+#        run: ./scripts/setup_fuzzer.sh -l
+#
+#      - name: Setup SIFIS-HOME
+#        run: ./scripts/setup_sul.sh sifis-home
+#
+#      - name: Test SIFIS-HOME Client (phase_1)
+#        run: |
+#          java -jar edhoc-fuzzer.jar @experiments/args/sifis-home/client_phase_1 -roundLimit 4
+#          ./scripts/diff_hyps.sh experiments/saved_results/clients/sifis-home_phase_1 experiments/results/clients/sifis-home_phase_1 4
+#
+#  SIFIS-HOME-Server:
+#    if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
+#    runs-on: ubuntu-latest
+#    strategy:
+#      fail-fast: true
+#    steps:
+#      - uses: actions/checkout@v6
+#      - uses: actions/setup-java@v5
+#        with:
+#          java-version: '21'
+#          distribution: 'temurin'
+#      - uses: ts-graphviz/setup-graphviz@v2
+#      - name: Install pydot
+#        run: pip3 install pydot
+#
+#      - name: Setup EDHOC-Fuzzer
+#        run: ./scripts/setup_fuzzer.sh -l
+#
+#      - name: Setup SIFIS-HOME
+#        run: ./scripts/setup_sul.sh sifis-home
+#
+#      - name: Test SIFIS-HOME Server (phase_1)
+#        run: |
+#          java -jar edhoc-fuzzer.jar @experiments/args/sifis-home/server_phase_1 -roundLimit 5
+#          ./scripts/diff_hyps.sh experiments/saved_results/servers/sifis-home_phase_1 experiments/results/servers/sifis-home_phase_1 5
 
   uOSCORE-uEDHOC-Client:
     if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
@@ -175,7 +175,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - uses: ts-graphviz/setup-graphviz@v2
       - name: Install pydot
@@ -201,7 +201,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - uses: ts-graphviz/setup-graphviz@v2
       - name: Install pydot

.github/workflows/concretization.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - uses: ts-graphviz/setup-graphviz@v2
       - name: Install pydot
@@ -42,7 +42,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - uses: ts-graphviz/setup-graphviz@v2
       - name: Install pydot

.github/workflows/spotless.yml

@@ -6,10 +6,10 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: spotlessCheck
         run: mvn spotless:check

pom.xml

@@ -10,12 +10,13 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
 
         <protocol-state-fuzzer.version>1.0.0</protocol-state-fuzzer.version>
         <cf-edhoc.version>0.0.0</cf-edhoc.version>
-        <error-prone.version>2.42.0</error-prone.version>
+        <error-prone.version>2.46.0</error-prone.version>
         <gson.version>2.13.2</gson.version>
         <guava.version>33.5.0-jre</guava.version>
         <jakarta-xml.version>4.0.4</jakarta-xml.version>
@@ -247,6 +248,7 @@
                        <arg>-Xlint:all</arg>
                        <arg>-XDcompilePolicy=simple</arg>
                        <arg>--should-stop=ifError=FLOW</arg>
+                       <arg>-XDaddTypeAnnotationsToSymbol=true</arg>
                        <arg>-Xplugin:ErrorProne -Xep:AddressSelection:OFF -Xep:NonApiType:OFF -Xep:WaitNotInLoop:OFF</arg>
                    </compilerArgs>
                    <annotationProcessorPaths>

scripts/setup_fuzzer.sh

@@ -8,7 +8,7 @@ readonly BASE_DIR
 setup_psf() {
     # setup protocol-state-fuzzer library
 
-    CHECKOUT="87e85fec214fea27817e1a3e06aa5ab387dac2bc"
+    CHECKOUT="42392348464ab4cebb3a4c7b149c21caf6ee9c4e"
 
     set -e
     cd "${BASE_DIR}"

src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/protocol/EdhocSessionPersistent.java

@@ -41,6 +41,7 @@ public class EdhocSessionPersistent extends EdhocSession {
     protected byte[] forceOscoreSenderId;
     protected byte[] forceOscoreRecipientId;
 
+    @SuppressWarnings("this-escape")
     public EdhocSessionPersistent(
             String sessionUri, boolean initiator, boolean clientInitiated, int method, byte[] connectionId,
             EdhocEndpointInfoPersistent edhocEndpointInfoPersistent, List<Integer> peerSupportedCipherSuites,

src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/protocol/EdhocStackPersistent.java

@@ -10,6 +10,7 @@
 /** Adapted from {@link org.eclipse.californium.edhoc.EdhocStack} */
 public class EdhocStackPersistent extends BaseCoapStack {
 
+    @SuppressWarnings("this-escape")
     public EdhocStackPersistent(String tag, final Configuration config, final Outbox outbox,
                                 EndpointContextMatcher matchingStrategy,
                                 EdhocEndpointInfoPersistent edhocEndpointInfoPersistent,

src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/connectors/EdhocServer.java

@@ -13,6 +13,7 @@
 public class EdhocServer extends CoapServer {
     private static final Logger LOGGER = LogManager.getLogger();
 
+    @SuppressWarnings("this-escape")
     public EdhocServer(String host, int port, String edhocResource, String appResource,
                        EdhocStackFactoryPersistent edhocStackFactoryPersistent,
                        CoapExchanger coapExchanger) {

src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/context/EdhocMapperState.java

@@ -91,6 +91,7 @@ public abstract class EdhocMapperState {
 
     protected CleanupTasks cleanupTasks;
 
+    @SuppressWarnings("this-escape")
     public EdhocMapperState(EdhocMapperConfig edhocMapperConfig, String edhocSessionUri, String oscoreUri, CleanupTasks cleanupTasks) {
 
         this.edhocMapperConfig = edhocMapperConfig;