optimize: change version to 2.2.0-SNAPSHOT (#6808)

apache · Sep 4, 2024 · 4b419a4 · 4b419a4
1 parent cec5edf
commit 4b419a4
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 97 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -27,18 +27,14 @@ jobs:
 
       # step 2: Initializes the CodeQL tools for scanning.
       - name: "Initialize CodeQL"
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
 
-      # step 3
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: "Autobuild"
-        uses: github/codeql-action/autobuild@v2
+      - run: ./mvnw -T 4C clean install -DskipTests
 
-      # step 4
+      # step 3
       - name: "Perform CodeQL Analysis"
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"
diff --git a/build/pom.xml b/build/pom.xml
@@ -71,7 +71,7 @@
 
     <properties>
         <!-- seata version -->
-        <revision>2.1.0-SNAPSHOT</revision>
+        <revision>2.2.0-SNAPSHOT</revision>
 
         <!-- Compiler settings properties -->
         <java.version>1.8</java.version>

diff --git a/changes/en-us/1.7.0.md b/changes/en-us/1.7.0.md
@@ -82,7 +82,7 @@ The version is updated as follows:
 - [[#5648](https://github.com/seata/seata/pull/5648)] optimize server logs print
 - [[#5647](https://github.com/seata/seata/pull/5647)] support case-sensitive attributes for table and column metadata
 - [[#5678](https://github.com/seata/seata/pull/5678)] optimize escape character for case of columnNames
-- [[#5684](https://github.com/seata/seata/pull/5684)] optimize github actions for CodeQL, skywalking-eyes and checkout
+- [[#5685](https://github.com/seata/seata/pull/5685)] optimize github actions for CodeQL, skywalking-eyes and checkout
 - [[#5700](https://github.com/seata/seata/pull/5700)] optimize distributed lock log
 
 

diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -78,6 +78,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6793](https://github.com/apache/incubator-seata/pull/6795)] optimize the initialization logic for server meta
 - [[#6794](https://github.com/apache/incubator-seata/pull/6794)] optimize NacosMockTest UT case
 - [[#6806](https://github.com/apache/incubator-seata/pull/6806)] optimize `tableMeta` cache scheduled refresh issue
+- [[#6808](https://github.com/apache/incubator-seata/pull/6808)] change version to 2.2.0-SNAPSHOT
 
 
 ### refactor:

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -79,7 +79,7 @@
 - [[#6794](https://github.com/apache/incubator-seata/pull/6794)] 优化 NacosMockTest 单测问题
 - [[#6793](https://github.com/apache/incubator-seata/pull/6795)] 独立server的meta信息初始化逻辑
 - [[#6806](https://github.com/apache/incubator-seata/pull/6806)] 优化`tableMeta`缓存定时刷新问题
-
+- [[#6808](https://github.com/apache/incubator-seata/pull/6808)] 修改版本号为2.2.0-SNAPSHOT
 
 ### refactor:
 

diff --git a/distribution/LICENSE b/distribution/LICENSE
@@ -398,7 +398,7 @@ Apache-2.0 licenses
     io.prometheus:simpleclient_tracer_common 0.15.0 Apache-2.0
     io.prometheus:simpleclient_tracer_otel 0.15.0 Apache-2.0
     io.prometheus:simpleclient_tracer_otel_agent 0.15.0 Apache-2.0
-    io.seata:seata-all 2.1.0-SNAPSHOT Apache-2.0
+    io.seata:seata-all 2.2.0-SNAPSHOT Apache-2.0
     javax.inject:javax.inject 1 Apache-2.0
     joda-time:joda-time 2.3 Apache-2.0
     net.bytebuddy:byte-buddy-agent 1.10.22 Apache-2.0

diff --git a/distribution/NOTICE.md b/distribution/NOTICE.md
@@ -150,35 +150,35 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to
     ├── proto-google-common-protos-1.17.0.jar
     ├── reflectasm-1.11.9.jar
     ├── registry-client-all-6.3.0.jar
-    ├── seata-common-2.1.0-SNAPSHOT.jar
-    ├── seata-compressor-all-2.1.0-SNAPSHOT.jar
-    ├── seata-compressor-bzip2-2.1.0-SNAPSHOT.jar
-    ├── seata-compressor-deflater-2.1.0-SNAPSHOT.jar
-    ├── seata-compressor-gzip-2.1.0-SNAPSHOT.jar
-    ├── seata-compressor-lz4-2.1.0-SNAPSHOT.jar
-    ├── seata-compressor-zip-2.1.0-SNAPSHOT.jar
-    ├── seata-config-all-2.1.0-SNAPSHOT.jar
-    ├── seata-config-apollo-2.1.0-SNAPSHOT.jar
-    ├── seata-config-consul-2.1.0-SNAPSHOT.jar
-    ├── seata-config-core-2.1.0-SNAPSHOT.jar
-    ├── seata-config-etcd3-2.1.0-SNAPSHOT.jar
-    ├── seata-config-nacos-2.1.0-SNAPSHOT.jar
-    ├── seata-config-spring-cloud-2.1.0-SNAPSHOT.jar
-    ├── seata-config-zk-2.1.0-SNAPSHOT.jar
-    ├── seata-core-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-consul-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-custom-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-etcd3-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-nacos-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-redis-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-sofa-2.1.0-SNAPSHOT.jar
-    ├── seata-metrics-api-2.1.0-SNAPSHOT.jar
-    ├── seata-metrics-core-2.1.0-SNAPSHOT.jar
-    ├── seata-metrics-registry-compact-2.1.0-SNAPSHOT.jar
-    ├── seata-serializer-all-2.1.0-SNAPSHOT.jar
-    ├── seata-serializer-hessian-2.1.0-SNAPSHOT.jar
-    ├── seata-serializer-kryo-2.1.0-SNAPSHOT.jar
-    ├── seata-spring-autoconfigure-server-2.1.0-SNAPSHOT.jar
+    ├── seata-common-2.2.0-SNAPSHOT.jar
+    ├── seata-compressor-all-2.2.0-SNAPSHOT.jar
+    ├── seata-compressor-bzip2-2.2.0-SNAPSHOT.jar
+    ├── seata-compressor-deflater-2.2.0-SNAPSHOT.jar
+    ├── seata-compressor-gzip-2.2.0-SNAPSHOT.jar
+    ├── seata-compressor-lz4-2.2.0-SNAPSHOT.jar
+    ├── seata-compressor-zip-2.2.0-SNAPSHOT.jar
+    ├── seata-config-all-2.2.0-SNAPSHOT.jar
+    ├── seata-config-apollo-2.2.0-SNAPSHOT.jar
+    ├── seata-config-consul-2.2.0-SNAPSHOT.jar
+    ├── seata-config-core-2.2.0-SNAPSHOT.jar
+    ├── seata-config-etcd3-2.2.0-SNAPSHOT.jar
+    ├── seata-config-nacos-2.2.0-SNAPSHOT.jar
+    ├── seata-config-spring-cloud-2.2.0-SNAPSHOT.jar
+    ├── seata-config-zk-2.2.0-SNAPSHOT.jar
+    ├── seata-core-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-consul-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-custom-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-etcd3-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-nacos-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-redis-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-sofa-2.2.0-SNAPSHOT.jar
+    ├── seata-metrics-api-2.2.0-SNAPSHOT.jar
+    ├── seata-metrics-core-2.2.0-SNAPSHOT.jar
+    ├── seata-metrics-registry-compact-2.2.0-SNAPSHOT.jar
+    ├── seata-serializer-all-2.2.0-SNAPSHOT.jar
+    ├── seata-serializer-hessian-2.2.0-SNAPSHOT.jar
+    ├── seata-serializer-kryo-2.2.0-SNAPSHOT.jar
+    ├── seata-spring-autoconfigure-server-2.2.0-SNAPSHOT.jar
     ├── servo-core-0.12.21.jar
     ├── simpleclient-0.15.0.jar
     ├── simpleclient_common-0.15.0.jar
@@ -252,17 +252,17 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to
     ├── protobuf-java-3.16.3.jar
     ├── protobuf-java-util-3.11.0.jar
     ├── rocksdbjni-7.7.3.jar
-    ├── seata-compressor-zstd-2.1.0-SNAPSHOT.jar
-    ├── seata-console-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-all-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-core-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-eureka-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-zk-2.1.0-SNAPSHOT.jar
-    ├── seata-metrics-all-2.1.0-SNAPSHOT.jar
-    ├── seata-metrics-exporter-prometheus-2.1.0-SNAPSHOT.jar
-    ├── seata-serializer-protobuf-2.1.0-SNAPSHOT.jar
-    ├── seata-serializer-seata-2.1.0-SNAPSHOT.jar
-    ├── seata-spring-autoconfigure-core-2.1.0-SNAPSHOT.jar
+    ├── seata-compressor-zstd-2.2.0-SNAPSHOT.jar
+    ├── seata-console-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-all-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-core-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-eureka-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-zk-2.2.0-SNAPSHOT.jar
+    ├── seata-metrics-all-2.2.0-SNAPSHOT.jar
+    ├── seata-metrics-exporter-prometheus-2.2.0-SNAPSHOT.jar
+    ├── seata-serializer-protobuf-2.2.0-SNAPSHOT.jar
+    ├── seata-serializer-seata-2.2.0-SNAPSHOT.jar
+    ├── seata-spring-autoconfigure-core-2.2.0-SNAPSHOT.jar
     ├── simpleclient_httpserver-0.15.0.jar
     ├── slf4j-api-1.7.36.jar
     ├── spring-boot-2.7.17.jar
@@ -432,35 +432,35 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to
     ├── proto-google-common-protos-1.17.0.jar
     ├── reflectasm-1.11.9.jar
     ├── registry-client-all-6.3.0.jar
-    ├── seata-common-2.1.0-SNAPSHOT.jar
-    ├── seata-compressor-all-2.1.0-SNAPSHOT.jar
-    ├── seata-compressor-bzip2-2.1.0-SNAPSHOT.jar
-    ├── seata-compressor-deflater-2.1.0-SNAPSHOT.jar
-    ├── seata-compressor-gzip-2.1.0-SNAPSHOT.jar
-    ├── seata-compressor-lz4-2.1.0-SNAPSHOT.jar
-    ├── seata-compressor-zip-2.1.0-SNAPSHOT.jar
-    ├── seata-config-all-2.1.0-SNAPSHOT.jar
-    ├── seata-config-apollo-2.1.0-SNAPSHOT.jar
-    ├── seata-config-consul-2.1.0-SNAPSHOT.jar
-    ├── seata-config-core-2.1.0-SNAPSHOT.jar
-    ├── seata-config-etcd3-2.1.0-SNAPSHOT.jar
-    ├── seata-config-nacos-2.1.0-SNAPSHOT.jar
-    ├── seata-config-spring-cloud-2.1.0-SNAPSHOT.jar
-    ├── seata-config-zk-2.1.0-SNAPSHOT.jar
-    ├── seata-core-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-consul-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-custom-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-etcd3-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-nacos-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-redis-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-sofa-2.1.0-SNAPSHOT.jar
-    ├── seata-metrics-api-2.1.0-SNAPSHOT.jar
-    ├── seata-metrics-core-2.1.0-SNAPSHOT.jar
-    ├── seata-metrics-registry-compact-2.1.0-SNAPSHOT.jar
-    ├── seata-serializer-all-2.1.0-SNAPSHOT.jar
-    ├── seata-serializer-hessian-2.1.0-SNAPSHOT.jar
-    ├── seata-serializer-kryo-2.1.0-SNAPSHOT.jar
-    ├── seata-spring-autoconfigure-server-2.1.0-SNAPSHOT.jar
+    ├── seata-common-2.2.0-SNAPSHOT.jar
+    ├── seata-compressor-all-2.2.0-SNAPSHOT.jar
+    ├── seata-compressor-bzip2-2.2.0-SNAPSHOT.jar
+    ├── seata-compressor-deflater-2.2.0-SNAPSHOT.jar
+    ├── seata-compressor-gzip-2.2.0-SNAPSHOT.jar
+    ├── seata-compressor-lz4-2.2.0-SNAPSHOT.jar
+    ├── seata-compressor-zip-2.2.0-SNAPSHOT.jar
+    ├── seata-config-all-2.2.0-SNAPSHOT.jar
+    ├── seata-config-apollo-2.2.0-SNAPSHOT.jar
+    ├── seata-config-consul-2.2.0-SNAPSHOT.jar
+    ├── seata-config-core-2.2.0-SNAPSHOT.jar
+    ├── seata-config-etcd3-2.2.0-SNAPSHOT.jar
+    ├── seata-config-nacos-2.2.0-SNAPSHOT.jar
+    ├── seata-config-spring-cloud-2.2.0-SNAPSHOT.jar
+    ├── seata-config-zk-2.2.0-SNAPSHOT.jar
+    ├── seata-core-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-consul-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-custom-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-etcd3-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-nacos-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-redis-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-sofa-2.2.0-SNAPSHOT.jar
+    ├── seata-metrics-api-2.2.0-SNAPSHOT.jar
+    ├── seata-metrics-core-2.2.0-SNAPSHOT.jar
+    ├── seata-metrics-registry-compact-2.2.0-SNAPSHOT.jar
+    ├── seata-serializer-all-2.2.0-SNAPSHOT.jar
+    ├── seata-serializer-hessian-2.2.0-SNAPSHOT.jar
+    ├── seata-serializer-kryo-2.2.0-SNAPSHOT.jar
+    ├── seata-spring-autoconfigure-server-2.2.0-SNAPSHOT.jar
     ├── servo-core-0.12.21.jar
     ├── simpleclient-0.15.0.jar
     ├── simpleclient_common-0.15.0.jar
@@ -534,17 +534,17 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to
     ├── protobuf-java-3.16.3.jar
     ├── protobuf-java-util-3.11.0.jar
     ├── rocksdbjni-7.7.3.jar
-    ├── seata-compressor-zstd-2.1.0-SNAPSHOT.jar
-    ├── seata-console-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-all-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-core-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-eureka-2.1.0-SNAPSHOT.jar
-    ├── seata-discovery-zk-2.1.0-SNAPSHOT.jar
-    ├── seata-metrics-all-2.1.0-SNAPSHOT.jar
-    ├── seata-metrics-exporter-prometheus-2.1.0-SNAPSHOT.jar
-    ├── seata-serializer-protobuf-2.1.0-SNAPSHOT.jar
-    ├── seata-serializer-seata-2.1.0-SNAPSHOT.jar
-    ├── seata-spring-autoconfigure-core-2.1.0-SNAPSHOT.jar
+    ├── seata-compressor-zstd-2.2.0-SNAPSHOT.jar
+    ├── seata-console-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-all-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-core-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-eureka-2.2.0-SNAPSHOT.jar
+    ├── seata-discovery-zk-2.2.0-SNAPSHOT.jar
+    ├── seata-metrics-all-2.2.0-SNAPSHOT.jar
+    ├── seata-metrics-exporter-prometheus-2.2.0-SNAPSHOT.jar
+    ├── seata-serializer-protobuf-2.2.0-SNAPSHOT.jar
+    ├── seata-serializer-seata-2.2.0-SNAPSHOT.jar
+    ├── seata-spring-autoconfigure-core-2.2.0-SNAPSHOT.jar
     ├── simpleclient_httpserver-0.15.0.jar
     ├── slf4j-api-1.7.36.jar
     ├── spring-boot-2.7.17.jar

diff --git a/namingserver/src/test/java/org/apache/seata/namingserver/NamingControllerTest.java b/namingserver/src/test/java/org/apache/seata/namingserver/NamingControllerTest.java
@@ -168,16 +168,16 @@ void mockDiscoveryMultiNode() {
         String namespace = "public4";
         String unitName = String.valueOf(UUID.randomUUID());
         NamingServerNode node = new NamingServerNode();
-        node.setTransaction(new Node.Endpoint("127.0.0.1", 8091, "netty"));
-        node.setControl(new Node.Endpoint("127.0.0.1", 7091, "http"));
+        node.setTransaction(new Node.Endpoint("127.0.0.1", 8095, "netty"));
+        node.setControl(new Node.Endpoint("127.0.0.1", 7095, "http"));
         Map<String, Object> meatadata = node.getMetadata();
         Map<String,Object> vGroups = new HashMap<>();
         vGroups.put("vgroup1",unitName);
         meatadata.put(CONSTANT_GROUP, vGroups);
         NamingServerNode node2 = new NamingServerNode();
         String unitName2 = String.valueOf(UUID.randomUUID());
-        node2.setTransaction(new Node.Endpoint("127.0.0.1", 8092, "netty"));
-        node2.setControl(new Node.Endpoint("127.0.0.1", 7092, "http"));
+        node2.setTransaction(new Node.Endpoint("127.0.0.1", 8096, "netty"));
+        node2.setControl(new Node.Endpoint("127.0.0.1", 7096, "http"));
         vGroups = new HashMap<>();
         vGroups.put("vgroup1",unitName2);
         node2.getMetadata().put(CONSTANT_GROUP, vGroups);

diff --git a/rocketmq/pom.xml b/rocketmq/pom.xml
@@ -24,7 +24,6 @@
         <groupId>org.apache.seata</groupId>
         <artifactId>seata-parent</artifactId>
         <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>seata-rocketmq</artifactId>