Bring v2 up-to-date

.github/dependabot.yml

@@ -0,0 +1,14 @@
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v4

.github/workflows/maven.yml

@@ -3,25 +3,19 @@
 
 name: Java CI with Maven
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v5
       with:
-        # TODO: Revert to '11'.
-        # See https://github.com/ChargeTimeEU/Java-OCA-OCPP/pull/223#issuecomment-1328048028
-        java-version: '11.0.16+8'
+        java-version: '11'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven

OCPP-J/build.gradle

@@ -4,11 +4,11 @@
 
 dependencies {
     compile project(':common')
-    compile 'com.google.code.gson:gson:2.8.0'
-    compile 'org.java-websocket:Java-WebSocket:1.5.3'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile 'org.hamcrest:hamcrest-core:1.3'
+    compile 'com.google.code.gson:gson:2.13.2'
+    compile 'org.java-websocket:Java-WebSocket:1.6.0'
+    testCompile 'junit:junit:4.13.2'
+    testCompile 'org.mockito:mockito-core:4.11.0'
+    testCompile 'org.hamcrest:hamcrest-core:3.0'
 }
 
 task javadocJar(type: Jar) {

OCPP-J/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>eu.chargetime.ocpp</groupId>
     <artifactId>OCPP-J</artifactId>
-    <version>1.0.2</version>
+    <version>1.2.0</version>
     <packaging>jar</packaging>
 
     <name>Java-OCA-OCPP OCPP-J</name>
@@ -50,41 +50,41 @@
         <dependency>
             <groupId>eu.chargetime.ocpp</groupId>
             <artifactId>common</artifactId>
-            <version>1.0.2</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.9</version>
+            <version>2.13.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.java-websocket</groupId>
             <artifactId>Java-WebSocket</artifactId>
-            <version>1.5.3</version>
+            <version>1.6.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
+            <version>3.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>1.3.16</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -98,12 +98,12 @@
                   <source>1.8</source>
                   <target>1.8</target>
               </configuration>
-              <version>3.5.1</version>
+              <version>3.14.1</version>
           </plugin>
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-source-plugin</artifactId>
-              <version>2.2.1</version>
+              <version>3.4.0</version>
               <executions>
                   <execution>
                       <id>attach-sources</id>
@@ -117,7 +117,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>3.12.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -130,7 +130,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.5</version>
+                <version>3.2.8</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -144,7 +144,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.8</version>
+                <version>1.7.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>

OCPP-J/src/main/java/eu/chargetime/ocpp/Draft_HttpHealthCheck.java

@@ -2,6 +2,9 @@
 /*
  * Based ON https://github.com/TooTallNate/Java-WebSocket/issues/1077
  */
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.List;
 import org.java_websocket.WebSocketImpl;
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.enums.CloseHandshakeType;
@@ -12,105 +15,98 @@
 import org.java_websocket.handshake.*;
 import org.java_websocket.util.Charsetfunctions;
 
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.List;
-
 class Draft_HttpHealthCheck extends Draft {
 
-    static final int HTTP_HEALTH_CHECK_CLOSE_CODE = 10200;
-
-    static Boolean isHttp(ClientHandshake handshakedata) {
-        String upgradeField = handshakedata.getFieldValue("Upgrade");
-        return upgradeField == null || upgradeField == "";
-    }
-
-    @Override
-    public List<ByteBuffer> createHandshake(Handshakedata handshakedata, boolean withcontent) {
-        byte[] content = Charsetfunctions.asciiBytes("<h1>OCPP-J Websocket OK</h1>");
-        byte[] header = Charsetfunctions.asciiBytes(
-                "HTTP/1.0 200 OK\r\n" +
-                        "Mime-Version: 1.0\r\n" +
-                        "Content-Type: text/html\r\n" +
-                        "Content-Length: " + content.length + " \r\n" +
-                        "Connection: close\r\n" +
-                        "\r\n"
-        );
-
-        ByteBuffer bytebuffer = ByteBuffer.allocate(content.length + header.length);
-        bytebuffer.put(header);
-        bytebuffer.put(content);
-        bytebuffer.flip();
-        return Collections.singletonList(bytebuffer);
-    }
-
-    @Override
-    public HandshakeState acceptHandshakeAsClient(
-            ClientHandshake request, ServerHandshake response
-    ) throws InvalidHandshakeException {
-        throw new InvalidHandshakeException("This draft can't be used on a client");
-    }
-
-    @Override
-    public HandshakeState acceptHandshakeAsServer(
-            ClientHandshake handshakedata
-    ) throws InvalidHandshakeException {
-        return (isHttp(handshakedata)) ? HandshakeState.MATCHED : HandshakeState.NOT_MATCHED;
-    }
-
-    @Override
-    public ByteBuffer createBinaryFrame(Framedata framedata) {
-        return null;
-    }
-
-    @Override
-    public List<Framedata> createFrames(ByteBuffer binary, boolean mask) {
-        return null;
-    }
-
-    @Override
-    public List<Framedata> createFrames(String text, boolean mask) {
-        return null;
-    }
-
-    @Override
-    public void processFrame(
-            WebSocketImpl webSocketImpl, Framedata frame
-    ) throws InvalidDataException {
-        throw new InvalidDataException(0, "This draft can't be used on a client");
-    }
-
-    @Override
-    public void reset() {
-        // Nothing to Do
-    }
-
-    @Override
-    public ClientHandshakeBuilder postProcessHandshakeRequestAsClient(
-            ClientHandshakeBuilder request
-    ) throws InvalidHandshakeException {
-        throw new InvalidHandshakeException("This draft can't be used on a client");
-    }
-
-    @Override
-    public HandshakeBuilder postProcessHandshakeResponseAsServer(
-            ClientHandshake request, ServerHandshakeBuilder response
-    ) throws InvalidHandshakeException {
-        return response;
-    }
-
-    @Override
-    public List<Framedata> translateFrame(ByteBuffer buffer) throws InvalidDataException {
-        throw new InvalidHandshakeException("This draft doesn't work with frames");
-    }
-
-    @Override
-    public CloseHandshakeType getCloseHandshakeType() {
-        return CloseHandshakeType.NONE;
-    }
-
-    @Override
-    public Draft copyInstance() {
-        return this;
-    }
+  static final int HTTP_HEALTH_CHECK_CLOSE_CODE = 10200;
+
+  static Boolean isHttp(ClientHandshake handshakedata) {
+    String upgradeField = handshakedata.getFieldValue("Upgrade");
+    return upgradeField == null || upgradeField.isEmpty();
+  }
+
+  @Override
+  public List<ByteBuffer> createHandshake(Handshakedata handshakedata, boolean withcontent) {
+    byte[] content = Charsetfunctions.asciiBytes("<h1>OCPP-J Websocket OK</h1>");
+    byte[] header =
+        Charsetfunctions.asciiBytes(
+            "HTTP/1.0 200 OK\r\n"
+                + "Mime-Version: 1.0\r\n"
+                + "Content-Type: text/html\r\n"
+                + "Content-Length: "
+                + content.length
+                + " \r\n"
+                + "Connection: close\r\n"
+                + "\r\n");
+
+    ByteBuffer bytebuffer = ByteBuffer.allocate(content.length + header.length);
+    bytebuffer.put(header);
+    bytebuffer.put(content);
+    bytebuffer.flip();
+    return Collections.singletonList(bytebuffer);
+  }
+
+  @Override
+  public HandshakeState acceptHandshakeAsClient(ClientHandshake request, ServerHandshake response)
+      throws InvalidHandshakeException {
+    throw new InvalidHandshakeException("This draft can't be used on a client");
+  }
+
+  @Override
+  public HandshakeState acceptHandshakeAsServer(ClientHandshake handshakedata)
+      throws InvalidHandshakeException {
+    return (isHttp(handshakedata)) ? HandshakeState.MATCHED : HandshakeState.NOT_MATCHED;
+  }
+
+  @Override
+  public ByteBuffer createBinaryFrame(Framedata framedata) {
+    return null;
+  }
+
+  @Override
+  public List<Framedata> createFrames(ByteBuffer binary, boolean mask) {
+    return null;
+  }
+
+  @Override
+  public List<Framedata> createFrames(String text, boolean mask) {
+    return null;
+  }
+
+  @Override
+  public void processFrame(WebSocketImpl webSocketImpl, Framedata frame)
+      throws InvalidDataException {
+    throw new InvalidDataException(0, "This draft can't be used on a client");
+  }
+
+  @Override
+  public void reset() {
+    // Nothing to Do
+  }
+
+  @Override
+  public ClientHandshakeBuilder postProcessHandshakeRequestAsClient(ClientHandshakeBuilder request)
+      throws InvalidHandshakeException {
+    throw new InvalidHandshakeException("This draft can't be used on a client");
+  }
+
+  @Override
+  public HandshakeBuilder postProcessHandshakeResponseAsServer(
+      ClientHandshake request, ServerHandshakeBuilder response) throws InvalidHandshakeException {
+    return response;
+  }
+
+  @Override
+  public List<Framedata> translateFrame(ByteBuffer buffer) throws InvalidDataException {
+    throw new InvalidHandshakeException("This draft doesn't work with frames");
+  }
+
+  @Override
+  public CloseHandshakeType getCloseHandshakeType() {
+    return CloseHandshakeType.NONE;
+  }
+
+  @Override
+  public Draft copyInstance() {
+    return this;
+  }
 }