Skip to content

Commit c4bf44e

Browse files
authored
Merge pull request TooTallNate#1435 from marci4/feature/drop_java1.7
2 parents 4aef466 + 01e1a40 commit c4bf44e

File tree

4 files changed

+10
-2795
lines changed

4 files changed

+10
-2795
lines changed

README.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Minimum Required JDK
114114

115115
`Java-WebSocket` is known to work with:
116116

117-
* Java 1.7 and higher
117+
* Java 8 and higher
118118

119119
Other JRE implementations may work as well, but haven't been tested.
120120

build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ repositories {
1010
}
1111

1212
group = 'org.java-websocket'
13-
version = '1.5.8-SNAPSHOT'
14-
sourceCompatibility = 1.7
15-
targetCompatibility = 1.7
13+
version = '1.6.0-SNAPSHOT'
14+
sourceCompatibility = 1.8
15+
targetCompatibility = 1.8
1616

1717
compileJava {
1818
options.compilerArgs += ['-encoding', 'UTF-8']
@@ -35,8 +35,7 @@ publishing {
3535
}
3636

3737
dependencies {
38-
implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.6'
39-
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.6'
40-
testImplementation group: 'junit', name: 'junit', version: '4.12'
41-
testImplementation group: 'org.json', name: 'json', version: '20180813'
38+
implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.13'
39+
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.13'
40+
testImplementation group: 'junit', name: 'junit', version: '4.13.1'
4241
}

pom.xml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55
<groupId>org.java-websocket</groupId>
66
<artifactId>Java-WebSocket</artifactId>
77
<packaging>jar</packaging>
8-
<version>1.5.8-SNAPSHOT</version>
8+
<version>1.6.0-SNAPSHOT</version>
99
<name>Java-WebSocket</name>
1010
<description>A barebones WebSocket client and server implementation written 100% in Java</description>
1111
<url>https://github.com/TooTallNate/Java-WebSocket</url>
1212
<properties>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<slf4j.version>2.0.6</slf4j.version>
14+
<slf4j.version>2.0.13</slf4j.version>
1515

1616
<!-- Test dependencies versions -->
17-
<junit.version>4.12</junit.version>
18-
<org.json.version>20180813</org.json.version>
17+
<junit.version>4.13.1</junit.version>
1918

2019
<!-- Maven plugin versions -->
2120
<bnd.maven.plugin.version>6.4.0</bnd.maven.plugin.version>
@@ -63,12 +62,6 @@
6362
<version>${junit.version}</version>
6463
<scope>test</scope>
6564
</dependency>
66-
<dependency>
67-
<groupId>org.json</groupId>
68-
<artifactId>json</artifactId>
69-
<version>${org.json.version}</version>
70-
<scope>test</scope>
71-
</dependency>
7265
</dependencies>
7366
</dependencyManagement>
7467
<build>
@@ -299,11 +292,6 @@
299292
<artifactId>junit</artifactId>
300293
<scope>test</scope>
301294
</dependency>
302-
<dependency>
303-
<groupId>org.json</groupId>
304-
<artifactId>json</artifactId>
305-
<scope>test</scope>
306-
</dependency>
307295
</dependencies>
308296
<developers>
309297
<developer>

0 commit comments

Comments
 (0)