Merge pull request #1435 from marci4/feature/drop_java1.7

TooTallNate · Jul 14, 2024 · c4bf44e · c4bf44e
2 parents 4aef466 + 01e1a40
commit c4bf44e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2,795 deletions.
diff --git a/README.markdown b/README.markdown
@@ -114,7 +114,7 @@ Minimum Required JDK
 
 `Java-WebSocket` is known to work with:
 
- * Java 1.7 and higher
+ * Java 8 and higher
 
 Other JRE implementations may work as well, but haven't been tested.
 

diff --git a/build.gradle b/build.gradle
@@ -10,9 +10,9 @@ repositories {
 }
 
 group = 'org.java-websocket'
-version = '1.5.8-SNAPSHOT'
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+version = '1.6.0-SNAPSHOT'
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 compileJava {
     options.compilerArgs += ['-encoding', 'UTF-8']
@@ -35,8 +35,7 @@ publishing {
 }
 
 dependencies {
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.6'
-    testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.6'
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
-    testImplementation group: 'org.json', name: 'json', version: '20180813'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.13'
+    testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.13'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.1'
 }
diff --git a/pom.xml b/pom.xml
@@ -5,17 +5,16 @@
     <groupId>org.java-websocket</groupId>
     <artifactId>Java-WebSocket</artifactId>
     <packaging>jar</packaging>
-    <version>1.5.8-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <name>Java-WebSocket</name>
     <description>A barebones WebSocket client and server implementation written 100% in Java</description>
     <url>https://github.com/TooTallNate/Java-WebSocket</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <slf4j.version>2.0.6</slf4j.version>
+        <slf4j.version>2.0.13</slf4j.version>
 
         <!-- Test dependencies versions -->
-        <junit.version>4.12</junit.version>
-        <org.json.version>20180813</org.json.version>
+        <junit.version>4.13.1</junit.version>
 
         <!-- Maven plugin versions -->
         <bnd.maven.plugin.version>6.4.0</bnd.maven.plugin.version>
@@ -63,12 +62,6 @@
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.json</groupId>
-                <artifactId>json</artifactId>
-                <version>${org.json.version}</version>
-                <scope>test</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>
@@ -299,11 +292,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <developers>
         <developer>