Revert "修改：Version"

This reverts commit 38753c1.
alibaba · Sep 2, 2024 · a8d06f7 · a8d06f7
1 parent e1a89ef
commit a8d06f7
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 72 deletions.
diff --git a/.gitignore b/.gitignore
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.51.01</version>
+        <version>2.0.52-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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.51.01</version>
+        <version>2.0.52-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.51.01</version>
+        <version>2.0.52-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.51.01</version>
+        <version>2.0.52-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/core/src/test/java/org/apache/dubbo/jsonb/JSONBWirteTest.java b/core/src/test/java/org/apache/dubbo/jsonb/JSONBWirteTest.java
@@ -1,25 +1,24 @@
 package org.apache.dubbo.jsonb;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONB;
+import com.alibaba.fastjson2.JSONReader;
+import com.alibaba.fastjson2.JSONWriter;
+import org.apache.dubbo.jsonb.model.UserDTO;
+import org.apache.dubbo.jsonb.rw.BigDecimalReader;
+import org.apache.dubbo.jsonb.rw.BigDecimalWriter;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
-import org.apache.dubbo.jsonb.model.UserDTO;
-import org.apache.dubbo.jsonb.rw.BigDecimalReader;
-import org.apache.dubbo.jsonb.rw.BigDecimalWriter;
-import org.junit.jupiter.api.Test;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONB;
-import com.alibaba.fastjson2.JSONReader;
-import com.alibaba.fastjson2.JSONWriter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class JSONBWirteTest {
     @Test
-    public void jsonbWirteTest() {
+    public void wirteTest() {
         // 序列化BigDecimal类型的时候添加千分位逗号
         JSON.register(BigDecimal.class, BigDecimalWriter.INSTANCE);
         // 反序列化BigDecimal类型的时候去除千分位逗号
@@ -35,15 +34,19 @@ public void jsonbWirteTest() {
         user.setModifyDate(LocalDateTime.of(2024, 7, 2, 10, 11, 56));
 
         // 摘至dobbo源码org.apache.dubbo.common.serialize.fastjson2.FastJson2ObjectOutput.writeObject(Object)
-        JSONWriter.Feature[] writeFeatures = { JSONWriter.Feature.WriteClassName, JSONWriter.Feature.FieldBased,
+        JSONWriter.Feature[] writeFeatures = {
+                JSONWriter.Feature.WriteClassName, JSONWriter.Feature.FieldBased,
                 JSONWriter.Feature.ErrorOnNoneSerializable, JSONWriter.Feature.ReferenceDetection,
                 JSONWriter.Feature.WriteNulls, JSONWriter.Feature.NotWriteDefaultValue,
                 JSONWriter.Feature.NotWriteHashMapArrayListClassName, JSONWriter.Feature.WriteNameAsSymbol };
 
         // 摘至dobbo源码org.apache.dubbo.common.serialize.fastjson2.FastJson2ObjectInput.readObject(Class<T>)
-        JSONReader.Feature[] readerFeatures = { JSONReader.Feature.UseDefaultConstructorAsPossible,
-                JSONReader.Feature.ErrorOnNoneSerializable, JSONReader.Feature.IgnoreAutoTypeNotMatch,
-                JSONReader.Feature.UseNativeObject, JSONReader.Feature.FieldBased };
+        JSONReader.Feature[] readerFeatures = {
+                JSONReader.Feature.UseDefaultConstructorAsPossible,
+                JSONReader.Feature.ErrorOnNoneSerializable,
+                JSONReader.Feature.IgnoreAutoTypeNotMatch,
+                JSONReader.Feature.UseNativeObject,
+                JSONReader.Feature.FieldBased};
 
         byte[] bytes = JSONB.toBytes(user, writeFeatures);
         UserDTO result = JSONB.parseObject(bytes, UserDTO.class, readerFeatures);
@@ -54,33 +57,4 @@ public void jsonbWirteTest() {
         assertEquals(user.getDeposit(), result.getDeposit());
         assertEquals("2024-07-01", result.getActDate().format(dtf));
     }
-
-    @Test
-    public void wirteTest() {
-        // 序列化BigDecimal类型的时候添加千分位逗号
-        JSON.register(BigDecimal.class, BigDecimalWriter.INSTANCE);
-        // 反序列化BigDecimal类型的时候去除千分位逗号
-        JSON.register(BigDecimal.class, BigDecimalReader.INSTANCE);
-
-        UserDTO user = new UserDTO();
-        user.setName("张三");
-        user.setDeposit(new BigDecimal("1000.01"));
-        user.setBirthday(LocalDate.now());
-        LocalDateTime actDate = LocalDateTime.of(2024, 7, 1, 10, 11, 56);
-        user.setActDate(actDate);
-        user.setCreateDate(LocalDateTime.of(2024, 7, 1, 10, 11, 56));
-        user.setModifyDate(LocalDateTime.of(2024, 7, 2, 10, 11, 56));
-
-        String text = JSON.toJSONString(user);
-        System.out.println(text);
-
-        UserDTO result = JSON.parseObject(text, UserDTO.class);
-        System.out.println(result);
-
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
-        assertEquals(user.getName(), result.getName());
-        assertEquals(user.getDeposit(), result.getDeposit());
-        assertEquals("2024-07-01", result.getActDate().format(dtf));
-    }
 }
diff --git a/core/src/test/java/org/apache/dubbo/jsonb/model/UserDTO.java b/core/src/test/java/org/apache/dubbo/jsonb/model/UserDTO.java
@@ -75,10 +75,4 @@ public LocalDateTime getModifyDate() {
     public void setModifyDate(LocalDateTime modifyDate) {
         this.modifyDate = modifyDate;
     }
-
-    @Override
-    public String toString() {
-        return "UserDTO [name=" + name + ", deposit=" + deposit + ", birthday=" + birthday + ", actDate=" + actDate
-                + ", createDate=" + createDate + ", modifyDate=" + modifyDate + "]";
-    }
 }
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.51.01</version>
+        <version>2.0.52-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.51.01</version>
+        <version>2.0.52-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.51.01</version>
+        <version>2.0.52-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.51.01</version>
+        <version>2.0.52-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.51.01</version>
+        <version>2.0.52-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.51.01</version>
+        <version>2.0.52-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.51.01</version>
+        <version>2.0.52-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.51.01</version>
+        <version>2.0.52-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.51.01</version>
+        <version>2.0.52-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.51.01</version>
+    <version>2.0.52-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>Fastjson is a JSON processor (JSON parser + JSON generator) written in Java</description>
     <packaging>pom</packaging>
@@ -136,14 +136,12 @@
 
     <distributionManagement>
         <repository>
-            <id>local-releases</id>
-            <name>Nexus Snapshots Repository Pro</name>
-            <url>http://192.168.2.200:8081/repository/maven-releases/</url>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
         <snapshotRepository>
-            <id>local-snapshots</id>
-            <name>Nexus Releases Repository Pro</name>
-            <url>http://192.168.2.200:8081/repository/maven-snapshots/</url>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 

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.51.01</version>
+        <version>2.0.52-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.51.01</version>
+        <version>2.0.52-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>