2.0.55 init

alibaba · Jan 11, 2025 · 4a2ed12 · 4a2ed12
1 parent 69723ae
commit 4a2ed12
Show file tree

Hide file tree

Showing 24 changed files with 39 additions and 27 deletions.
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/benchmark/src/test/java/com/alibaba/fastjson2/benchmark/GenReport.java b/benchmark/src/test/java/com/alibaba/fastjson2/benchmark/GenReport.java
@@ -282,6 +282,7 @@ public void add(String library, String jdk, double score) {
     static class DocReader
             implements Closeable {
         BufferedReader reader;
+        int lines;
 
         public DocReader(File file) throws IOException {
             this.reader = new BufferedReader(new FileReader(file));
@@ -294,8 +295,10 @@ public void close() throws IOException {
 
         public Block readBlock() throws Exception {
             String line = reader.readLine();
+            lines++;
             while (line != null && line.trim().isEmpty()) {
                 line = reader.readLine();
+                lines++;
             }
 
             if (line == null || !line.startsWith("#")) {
@@ -306,12 +309,14 @@ public Block readBlock() throws Exception {
             block.jdk = line.substring(1).trim();
 
             line = reader.readLine();
+            lines++;
             if (!line.startsWith("```")) {
                 return null;
             }
 
             do {
                 line = reader.readLine();
+                lines++;
             } while (line.isEmpty());
 
             if (line.startsWith("```")) {
@@ -324,6 +329,7 @@ public Block readBlock() throws Exception {
 
             while (true) {
                 line = reader.readLine();
+                lines++;
                 if (line.startsWith("```")) {
                     break;
                 }

diff --git a/benchmark/src/test/java/com/alibaba/fastjson2/benchmark/ReadResult.java b/benchmark/src/test/java/com/alibaba/fastjson2/benchmark/ReadResult.java
@@ -21,9 +21,9 @@ public static void main(String[] args) throws Exception {
         files.put("aliyun_ecs.g8y.large", "/Users/wenshao/Downloads/result_" + version + "_g8y.out");
 //        files.put("aws_ecs.c6g.large", "/Users/wenshao/Downloads/result_2.0.41_aws_c6g.out");
 //        files.put("aws_ecs.c7g.large", "/Users/wenshao/Downloads/result_" + version + "_aws_c7g.out");
-//        files.put("orangepi5p", "/Users/wenshao/Downloads/result_" + version + "_orangepi5.out");
-//        files.put("orangepi_aipro", "/Users/wenshao/Downloads/result_" + version + "_orangepi_aipro.out");
-//        files.put("MacBookM1Pro", "/Users/wenshao/Downloads/result_" + version + "_applem1pro.out");
+        files.put("orangepi5p", "/Users/wenshao/Downloads/result_" + version + "_orangepi5.out");
+        files.put("orangepi_aipro", "/Users/wenshao/Downloads/result_" + version + "_orangepi_aipro.out");
+        files.put("MacBookM1Pro", "/Users/wenshao/Downloads/result_" + version + "_applem1pro.out");
 
         PrintStream out = new PrintStream(new FileOutputStream(outFile));
         files.forEach((k, v) -> {
@@ -105,6 +105,12 @@ public void read() throws IOException {
                         vm = "graalvm-ce-1" + vm.substring("graalvm-ce-java1".length());
                     } else if (vm.startsWith("graalvm-ee-java1")) {
                         vm = "graalvm-ee-1" + vm.substring("graalvm-ee-java1".length());
+                    } else if (vm.startsWith("zulu8.68.0.21")) {
+                        vm = "zulu8.68.0.21";
+                    } else if (vm.startsWith("zulu8.82.0.21")) {
+                        vm = "zulu8.82.0.21";
+                    } else if (vm.startsWith("zulu17.54.21")) {
+                        vm = "zulu17.54.21";
                     }
                     String title = "# " + spec + "-" + vm;
                     blockLines.add(title);

diff --git a/codegen-test/pom.xml b/codegen-test/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/codegen/pom.xml b/codegen/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/core/src/main/java/com/alibaba/fastjson2/JSON.java b/core/src/main/java/com/alibaba/fastjson2/JSON.java
@@ -37,7 +37,7 @@ public interface JSON {
     /**
      * fastjson2 version name
      */
-    String VERSION = "2.0.54";
+    String VERSION = "2.0.55";
 
     /**
      * Parses the json string as a {@link JSONArray} or {@link JSONObject}.

diff --git a/example-graalvm-native/pom.xml b/example-graalvm-native/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
         <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
-        <fastjson2.version>2.0.54</fastjson2.version>
+        <fastjson2.version>2.0.55-SNAPSHOT</fastjson2.version>
         <imageName>fastjson2-example-graalvm-native</imageName>
     </properties>
 

diff --git a/example-solon-test/pom.xml b/example-solon-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/example-spring-test/pom.xml b/example-spring-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/example-spring6-test/pom.xml b/example-spring6-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -16,7 +16,7 @@
     <properties>
         <maven.test.skip>true</maven.test.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <fastjson2.version>2.0.54</fastjson2.version>
+        <fastjson2.version>2.0.55-SNAPSHOT</fastjson2.version>
         <java.version>17</java.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>

diff --git a/extension-jaxrs/extension-jaxrs-jakarta/pom.xml b/extension-jaxrs/extension-jaxrs-jakarta/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-extension-jaxrs</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
     </parent>
 
     <artifactId>fastjson2-extension-jaxrs-jakarta</artifactId>

diff --git a/extension-jaxrs/extension-jaxrs-javax/pom.xml b/extension-jaxrs/extension-jaxrs-javax/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-extension-jaxrs</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
     </parent>
 
     <artifactId>fastjson2-extension-jaxrs-javax</artifactId>

diff --git a/extension-jaxrs/pom.xml b/extension-jaxrs/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
     </parent>
     <artifactId>fastjson2-extension-jaxrs</artifactId>
     <packaging>pom</packaging>

diff --git a/extension-solon/pom.xml b/extension-solon/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/extension-spring5/pom.xml b/extension-spring5/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/extension-spring6/pom.xml b/extension-spring6/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/fastjson1-compatible/pom.xml b/fastjson1-compatible/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/incubator-vector/pom.xml b/incubator-vector/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/kotlin/pom.xml b/kotlin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alibaba.fastjson2</groupId>
     <artifactId>fastjson2-parent</artifactId>
-    <version>2.0.54</version>
+    <version>2.0.55-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>Fastjson is a JSON processor (JSON parser + JSON generator) written in Java</description>
     <packaging>pom</packaging>

diff --git a/safemode-test/pom.xml b/safemode-test/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/test-jdk17/pom.xml b/test-jdk17/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-parent</artifactId>
-        <version>2.0.54</version>
+        <version>2.0.55-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>