Merge branch 'issue-1308' into master

TooTallNate · Mar 11, 2023 · 30ba037 · 30ba037
2 parents 70092c6 + 239ded8
commit 30ba037
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 28 deletions.
diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml
@@ -1,5 +1,5 @@
 # This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
 
 name: Java Code Style Check with Maven
 
@@ -11,10 +11,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          java-version: '17'
+          distribution: 'temurin'
       - name: Code Style Check
         run: mvn -B checkstyle:check --file pom.xml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,21 +6,23 @@ jobs:
   Build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          java-version: '17'
+          distribution: 'temurin'
       - name: Build
         run: mvn -DskipTests package --file pom.xml
 
   Test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          java-version: '17'
+          distribution: 'temurin'
       - name: Test
         run: mvn test --file pom.xml
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -8,13 +8,14 @@ jobs:
     name: SonarQube
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: '17'
+          distribution: 'temurin'
       - name: Cache SonarCloud packages
         uses: actions/cache@v1
         with:

diff --git a/pom.xml b/pom.xml
@@ -11,21 +11,21 @@
     <url>https://github.com/TooTallNate/Java-WebSocket</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <slf4j.version>1.7.25</slf4j.version>
+        <slf4j.version>2.0.6</slf4j.version>
 
         <!-- Test dependencies versions -->
         <junit.version>4.12</junit.version>
         <org.json.version>20180813</org.json.version>
 
         <!-- Maven plugin versions -->
-        <bnd.maven.plugin.version>4.3.1</bnd.maven.plugin.version>
+        <bnd.maven.plugin.version>6.4.0</bnd.maven.plugin.version>
         <maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version>
-        <maven.compiler.plugin.version>3.7.0</maven.compiler.plugin.version>
+        <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
         <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
-        <maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
-        <maven.javadoc.plugin.version>2.10.3</maven.javadoc.plugin.version>
-        <maven.shade.plugin.version>3.1.0</maven.shade.plugin.version>
-        <maven.source.plugin.version>3.0.0</maven.source.plugin.version>
+        <maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
+        <maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
+        <maven.shade.plugin.version>3.4.1</maven.shade.plugin.version>
+        <maven.source.plugin.version>3.2.1</maven.source.plugin.version>
         <nexus.staging.maven.plugin.version>1.6.8</nexus.staging.maven.plugin.version>
         <sonar.projectKey>org.java-websocket:Java-WebSocket</sonar.projectKey>
         <sonar.organization>marci4-github</sonar.organization>
@@ -86,10 +86,12 @@
                             </goals>
                             <configuration>
                                 <bnd><![CDATA[
+                                    Multi-Release: true
                                     Export-Package: \
                                          org.java_websocket.*
                                     -noextraheaders: true
                                     -snapshot: SNAPSHOT
+                                    -fixupmessages "Classes found in the wrong directory"; restrict:=error; is:=warning
                                 ]]></bnd>
                             </configuration>
                         </execution>
@@ -99,10 +101,32 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${maven.compiler.plugin.version}</version>
-                    <configuration>
-                        <source>1.7</source>
-                        <target>1.7</target>
-                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>default-compile</id>
+                            <goals>
+                                <goal>compile</goal>
+                            </goals>
+                            <configuration>
+                                <release>7</release>
+                            </configuration>
+                        </execution>
+
+                        <execution>
+                            <id>module-compile</id>
+                            <phase>compile</phase>
+                            <goals>
+                                <goal>compile</goal>
+                            </goals>
+                            <configuration>
+                                <release>9</release>
+                                <compileSourceRoots>
+                                    <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
+                                </compileSourceRoots>
+                                <multiReleaseOutput>true</multiReleaseOutput>
+                            </configuration>
+                        </execution>
+                    </executions>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -183,6 +207,7 @@
                 <version>${maven.checkstyle.plugin.version}</version>
                 <configuration>
                     <configLocation>google_checks.xml</configLocation>
+                    <excludes>**/module-info.java</excludes>
                     <violationSeverity>warning</violationSeverity>
                     <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
                     <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>

diff --git a/src/main/java9/module-info.java b/src/main/java9/module-info.java
@@ -0,0 +1,19 @@
+/**
+ * This module implements a barebones WebSocket server and client.
+ */
+module org.java_websocket {
+    requires transitive org.slf4j;
+
+    exports org.java_websocket;
+    exports org.java_websocket.client;
+    exports org.java_websocket.drafts;
+    exports org.java_websocket.enums;
+    exports org.java_websocket.exceptions;
+    exports org.java_websocket.extensions;
+    exports org.java_websocket.extensions.permessage_deflate;
+    exports org.java_websocket.framing;
+    exports org.java_websocket.handshake;
+    exports org.java_websocket.interfaces;
+    exports org.java_websocket.protocols;
+    exports org.java_websocket.server;
+}