From 8a682a4e797583ca18944cbe910a97412c171f93 Mon Sep 17 00:00:00 2001
From: The-Gamer-01 <58755323+The-Gamer-01@users.noreply.github.com>
Date: Wed, 17 May 2023 17:10:12 +0800
Subject: [PATCH] [ISSUE #10388] Fix third-party component bugs (#10504)

---
 pom.xml | 125 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 70 insertions(+), 55 deletions(-)

diff --git a/pom.xml b/pom.xml
index df9e84826db..02c1996276c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     
     <name>Alibaba NACOS ${project.version}</name>
     <description>Top Nacos project pom.xml file</description>
-    <url>http://nacos.io</url>
+    <url>https://nacos.io</url>
     <prerequisites>
         <maven>3.2.5</maven>
     </prerequisites>
@@ -64,7 +64,7 @@
         <developer>
             <id>Alibaba Nacos</id>
             <name>Nacos</name>
-            <url>http://nacos.io</url>
+            <url>https://nacos.io</url>
             <email>nacos_dev@linux.alibaba.com</email>
         </developer>
     </developers>
@@ -88,12 +88,13 @@
     </issueManagement>
     
     <properties>
-        <revision>2.1.0</revision>
+        <revision>2.3.0-SNAPSHOT</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!-- Compiler settings properties -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <java.version>1.8</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
         <!-- Maven properties -->
         <maven.test.skip>false</maven.test.skip>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -107,6 +108,7 @@
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
         <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
+        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <maven-pmd-plugin.version>3.8</maven-pmd-plugin.version>
         <apache-rat-plugin.version>0.12</apache-rat-plugin.version>
@@ -119,40 +121,40 @@
         <maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
         <maven-assembly-plugin.version>3.0.0</maven-assembly-plugin.version>
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-        <maven-flatten-version>1.1.0</maven-flatten-version>
+        <maven-easyj-version>1.1.5</maven-easyj-version>
         <!-- dependency version related to plugin -->
         <extra-enforcer-rules.version>1.0-beta-4</extra-enforcer-rules.version>
         <p3c-pmd.version>1.3.0</p3c-pmd.version>
         
         <!-- dependency version -->
-        <spring-boot-dependencies.version>2.6.8</spring-boot-dependencies.version>
+        <spring-boot-dependencies.version>2.7.11</spring-boot-dependencies.version>
         <servlet-api.version>3.0</servlet-api.version>
         <commons-io.version>2.7</commons-io.version>
         <commons-collections.version>3.2.2</commons-collections.version>
-        <slf4j-api.version>1.7.7</slf4j-api.version>
+        <slf4j-api.version>1.7.26</slf4j-api.version>
         <logback.version>1.2.9</logback.version>
         <log4j.version>2.17.1</log4j.version>
         
-        <httpasyncclient.version>4.1.3</httpasyncclient.version>
         <mysql-connector-java.version>8.0.28</mysql-connector-java.version>
         <derby.version>10.14.2.0</derby.version>
         <jackson-core.version>2.12.6</jackson-core.version>
-        <jackson-databind.version>2.12.6.1</jackson-databind.version>
+        <jackson-databind.version>2.12.7.1</jackson-databind.version>
         <jackson.annotations.version>2.12.6</jackson.annotations.version>
         <jackson-core-asl.version>1.9.13</jackson-core-asl.version>
         <jjwt.version>0.11.2</jjwt.version>
         <guava.version>30.1-jre</guava.version>
         <javatuples.version>1.2</javatuples.version>
-        <grpc-java.version>1.30.2</grpc-java.version>
-        <proto-google-common-protos.version>1.17.0</proto-google-common-protos.version>
-        <protobuf-java.version>3.16.1</protobuf-java.version>
+        <grpc-java.version>1.50.2</grpc-java.version>
+        <proto-google-common-protos.version>2.7.1</proto-google-common-protos.version>
+        <protobuf-java.version>3.21.11</protobuf-java.version>
         <protoc-gen-grpc-java.version>${grpc-java.version}</protoc-gen-grpc-java.version>
         <hessian.version>4.0.63</hessian.version>
         <mockito-all.version>1.10.19</mockito-all.version>
         <mockito-core.version>3.8.0</mockito-core.version>
         <HikariCP.version>3.4.2</HikariCP.version>
-        <jraft-core.version>1.3.8</jraft-core.version>
-        <rpc-grpc-impl.version>1.3.8</rpc-grpc-impl.version>
+        <jraft-core.version>1.3.12</jraft-core.version>
+        <rpc-grpc-impl.version>${jraft-core.version}</rpc-grpc-impl.version>
+        <SnakeYaml.version>2.0</SnakeYaml.version>
     </properties>
     <!-- == -->
     <!-- =========================================================Build plugins================================================ -->
@@ -160,10 +162,17 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven-jar-plugin.version}</version>
+                </plugin>
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>
                     <version>${spring-boot-dependencies.version}</version>
+                    <configuration>
+                        <attach>false</attach>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -343,6 +352,8 @@
                         <exclude>**/gogo.proto</exclude>
                         <exclude>**/any.proto</exclude>
                         <exclude>src/main/java/com/alibaba/nacos/common/packagescan/classreading/**</exclude>
+                        <exclude>.flattened-pom.xml</exclude>
+                        <exclude>**/announcement.conf</exclude>
                     </excludes>
                 </configuration>
                 <executions>
@@ -372,6 +383,9 @@
                     <dataFile>${project.build.directory}/coverage-reports/jacoco-unit.exec</dataFile>
                     <output>file</output>
                     <append>true</append>
+                    <excludes>
+                        <exclude>**/grpc/auto/**</exclude>
+                    </excludes>
                 </configuration>
                 <executions>
                     <execution>
@@ -409,29 +423,24 @@
                 <version>${maven-assembly-plugin.version}</version>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>flatten-maven-plugin</artifactId>
-                <version>${maven-flatten-version}</version>
+                <groupId>icu.easyj.maven.plugins</groupId>
+                <artifactId>easyj-maven-plugin</artifactId>
+                <version>${maven-easyj-version}</version>
                 <configuration>
-                    <updatePomFile>true</updatePomFile>
-                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
-                    <pomElements>
-                        <dependencies>expand</dependencies>
-                    </pomElements>
+                    <simplifiedPomFileName>.flattened-pom.xml</simplifiedPomFileName>
+                    <useTabIndent>true</useTabIndent>
                 </configuration>
                 <executions>
                     <execution>
-                        <id>flatten</id>
-                        <phase>process-resources</phase>
+                        <id>flatten-pom</id>
                         <goals>
-                            <goal>flatten</goal>
+                            <goal>simplify-pom</goal>
                         </goals>
                     </execution>
                     <execution>
-                        <id>flatten.clean</id>
-                        <phase>clean</phase>
+                        <id>clean-flattened-pom</id>
                         <goals>
-                            <goal>clean</goal>
+                            <goal>clean-simplify-pom</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -595,7 +604,8 @@
         <module>sys</module>
         <module>plugin</module>
         <module>plugin-default-impl</module>
-        <module>k8s-sync</module>
+        <module>prometheus</module>
+        <module>persistence</module>
     </modules>
     
     <!-- Default dependencies in all subprojects -->
@@ -643,6 +653,11 @@
                 <artifactId>nacos-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.alibaba.nacos</groupId>
+                <artifactId>nacos-persistence</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>nacos-naming</artifactId>
@@ -701,7 +716,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>nacos-k8s-sync</artifactId>
+                <artifactId>nacos-prometheus</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -724,6 +739,26 @@
                 <artifactId>nacos-config-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>nacos-control-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba.nacos</groupId>
+                <artifactId>nacos-trace-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba.nacos</groupId>
+                <artifactId>nacos-datasource-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>nacos-custom-environment-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>nacos-auth</artifactId>
@@ -807,13 +842,6 @@
                 <version>${log4j.version}</version>
             </dependency>
             
-            <!-- HTTP client libs -->
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpasyncclient</artifactId>
-                <version>${httpasyncclient.version}</version>
-            </dependency>
-            
             <!-- JDBC libs -->
             <dependency>
                 <groupId>mysql</groupId>
@@ -937,12 +965,6 @@
                 <artifactId>grpc-stub</artifactId>
                 <version>${grpc-java.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>protoc-gen-grpc-java</artifactId>
-                <version>${grpc-java.version}</version>
-                <type>pom</type>
-            </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-testing</artifactId>
@@ -986,17 +1008,11 @@
                 <version>2.9.0</version>
                 <scope>compile</scope>
             </dependency>
-            
-            <dependency>
-                <groupId>io.kubernetes</groupId>
-                <artifactId>client-java-api</artifactId>
-                <version>14.0.0</version>
-            </dependency>
-            
+    
             <dependency>
-                <groupId>io.kubernetes</groupId>
-                <artifactId>client-java</artifactId>
-                <version>14.0.0</version>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${SnakeYaml.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -1014,6 +1030,5 @@
         </repository>
     </distributionManagement>
 
-
 </project>