Skip to content

Commit 47d33cd

Browse files
Update Checkstyle to allow building with JDK25
1 parent 36376b7 commit 47d33cd

3 files changed

Lines changed: 7 additions & 14 deletions

File tree

java/fory-core/src/main/java/org/apache/fory/Fory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@ public <T> T copyObject(T obj) {
10901090
case ClassResolver.HASHMAP_ID:
10911091
copy = hashMapSerializer.copy((HashMap) obj);
10921092
break;
1093-
// todo: add fastpath for other types.
1093+
// todo: add fastpath for other types.
10941094
default:
10951095
copy = copyObject(obj, typeInfo.getSerializer());
10961096
}

java/fory-core/src/main/java/org/apache/fory/util/MurmurHash3.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ public static int murmurhash3_x86_32(byte[] data, int offset, int len, int seed)
9292
switch (len & 0x03) {
9393
case 3:
9494
k1 = (data[roundedEnd + 2] & 0xff) << 16;
95-
// fallthrough
95+
// fallthrough
9696
case 2:
9797
k1 |= (data[roundedEnd + 1] & 0xff) << 8;
98-
// fallthrough
98+
// fallthrough
9999
case 1:
100100
k1 |= (data[roundedEnd] & 0xff);
101101
k1 *= c1;

java/pom.xml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<janino.version>3.1.12</janino.version>
7474
<commons_codec.version>1.13</commons_codec.version>
7575
<fory.java.rootdir>${basedir}</fory.java.rootdir>
76-
<maven-spotless-plugin.version>2.41.1</maven-spotless-plugin.version>
76+
<maven-spotless-plugin.version>3.3.0</maven-spotless-plugin.version>
7777
<lombok.version>1.18.38</lombok.version>
7878
</properties>
7979

@@ -224,14 +224,7 @@
224224
<plugin>
225225
<groupId>org.apache.maven.plugins</groupId>
226226
<artifactId>maven-checkstyle-plugin</artifactId>
227-
<version>3.1.0</version>
228-
<dependencies>
229-
<dependency>
230-
<groupId>com.puppycrawl.tools</groupId>
231-
<artifactId>checkstyle</artifactId>
232-
<version>8.29</version>
233-
</dependency>
234-
</dependencies>
227+
<version>3.6.0</version>
235228
<executions>
236229
<execution>
237230
<id>validate</id>
@@ -261,8 +254,8 @@
261254
<configuration>
262255
<java>
263256
<googleJavaFormat>
264-
<!-- 1.19.1 support JDK21 -->
265-
<version>1.19.1</version>
257+
<!-- 1.35 support JDK25 -->
258+
<version>1.35.0</version>
266259
<style>GOOGLE</style>
267260
</googleJavaFormat>
268261
</java>

0 commit comments

Comments
 (0)