From 4f9821d051ac4e9cdbebbc6d34aec7606173fce8 Mon Sep 17 00:00:00 2001
From: qinyingjie <qinyingjie@deepexi.com>
Date: Fri, 3 Feb 2023 10:11:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=89=93=E5=8C=85=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nacos-server-common/pom.xml                   | 34 ++-----------------
 nacos-server-consumer/pom.xml                 | 19 +----------
 nacos-server-producer/pom.xml                 | 19 +----------
 nacos-server-sentinel-consumer/pom.xml        | 21 +++---------
 ....java => SentinelConsumerApplication.java} |  4 +--
 ... => SentinelConsumerApplicationTests.java} |  2 +-
 pom.xml                                       |  2 ++
 7 files changed, 14 insertions(+), 87 deletions(-)
 rename nacos-server-sentinel-consumer/src/main/java/com/kwan/springcloudalibaba/{SentinelApplication.java => SentinelConsumerApplication.java} (75%)
 rename nacos-server-sentinel-consumer/src/test/java/com/kwan/springcloudalibaba/{SentinelApplicationTests.java => SentinelConsumerApplicationTests.java} (82%)

diff --git a/nacos-server-common/pom.xml b/nacos-server-common/pom.xml
index d1c4ef7..6264c37 100644
--- a/nacos-server-common/pom.xml
+++ b/nacos-server-common/pom.xml
@@ -11,43 +11,13 @@
     <artifactId>nacos-server-common</artifactId>
     <name>nacos-server-common</name>
     <description>nacos-server-common</description>
+    <version>1.0.0</version>
 
-    <properties>
-        <java.version>1.8</java.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-boot.version>2.3.0.RELEASE</spring-boot.version>
-        <spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
     </dependencies>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>${spring-cloud-alibaba.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <!--            <dependency>-->
-            <!--                <groupId>org.springframework.cloud</groupId>-->
-            <!--                <artifactId>spring-cloud-dependencies</artifactId>-->
-            <!--                <version>${spring-cloud.version}</version>-->
-            <!--                <type>pom</type>-->
-            <!--                <scope>import</scope>-->
-            <!--            </dependency>-->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+
 </project>
\ No newline at end of file
diff --git a/nacos-server-consumer/pom.xml b/nacos-server-consumer/pom.xml
index f01b412..58485be 100644
--- a/nacos-server-consumer/pom.xml
+++ b/nacos-server-consumer/pom.xml
@@ -24,6 +24,7 @@
         <dependency>
             <groupId>com.kwan.springcloudalibaba</groupId>
             <artifactId>nacos-server-common</artifactId>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -80,22 +81,4 @@
         </dependencies>
     </dependencyManagement>
 
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>7</source>
-                    <target>7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/nacos-server-producer/pom.xml b/nacos-server-producer/pom.xml
index e8a78ac..86427af 100644
--- a/nacos-server-producer/pom.xml
+++ b/nacos-server-producer/pom.xml
@@ -25,6 +25,7 @@
         <dependency>
             <groupId>com.kwan.springcloudalibaba</groupId>
             <artifactId>nacos-server-common</artifactId>
+            <version>1.0.0</version>
         </dependency>
 
         <dependency>
@@ -81,22 +82,4 @@
         </dependencies>
     </dependencyManagement>
 
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>7</source>
-                    <target>7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/nacos-server-sentinel-consumer/pom.xml b/nacos-server-sentinel-consumer/pom.xml
index 2eca9e8..990dcc5 100644
--- a/nacos-server-sentinel-consumer/pom.xml
+++ b/nacos-server-sentinel-consumer/pom.xml
@@ -17,6 +17,7 @@
         <dependency>
             <groupId>com.kwan.springcloudalibaba</groupId>
             <artifactId>nacos-server-common</artifactId>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -62,6 +63,10 @@
             <groupId>com.alibaba.csp</groupId>
             <artifactId>sentinel-datasource-nacos</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>
@@ -89,20 +94,4 @@
         </dependencies>
     </dependencyManagement>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>7</source>
-                    <target>7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
\ No newline at end of file
diff --git a/nacos-server-sentinel-consumer/src/main/java/com/kwan/springcloudalibaba/SentinelApplication.java b/nacos-server-sentinel-consumer/src/main/java/com/kwan/springcloudalibaba/SentinelConsumerApplication.java
similarity index 75%
rename from nacos-server-sentinel-consumer/src/main/java/com/kwan/springcloudalibaba/SentinelApplication.java
rename to nacos-server-sentinel-consumer/src/main/java/com/kwan/springcloudalibaba/SentinelConsumerApplication.java
index 6b1aebe..abf9505 100644
--- a/nacos-server-sentinel-consumer/src/main/java/com/kwan/springcloudalibaba/SentinelApplication.java
+++ b/nacos-server-sentinel-consumer/src/main/java/com/kwan/springcloudalibaba/SentinelConsumerApplication.java
@@ -12,9 +12,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @date : 2023/1/17 12:37
  */
 @SpringBootApplication
-public class SentinelApplication {
+public class SentinelConsumerApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(SentinelApplication.class, args);
+        SpringApplication.run(SentinelConsumerApplication.class, args);
     }
 }
diff --git a/nacos-server-sentinel-consumer/src/test/java/com/kwan/springcloudalibaba/SentinelApplicationTests.java b/nacos-server-sentinel-consumer/src/test/java/com/kwan/springcloudalibaba/SentinelConsumerApplicationTests.java
similarity index 82%
rename from nacos-server-sentinel-consumer/src/test/java/com/kwan/springcloudalibaba/SentinelApplicationTests.java
rename to nacos-server-sentinel-consumer/src/test/java/com/kwan/springcloudalibaba/SentinelConsumerApplicationTests.java
index bbcae7c..9a5f4be 100644
--- a/nacos-server-sentinel-consumer/src/test/java/com/kwan/springcloudalibaba/SentinelApplicationTests.java
+++ b/nacos-server-sentinel-consumer/src/test/java/com/kwan/springcloudalibaba/SentinelConsumerApplicationTests.java
@@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-class SentinelApplicationTests {
+class SentinelConsumerApplicationTests {
 
     @Test
     void contextLoads() {
diff --git a/pom.xml b/pom.xml
index 1732957..a718141 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,10 +56,12 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>3.0.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
                 <configuration>
                     <source>7</source>
                     <target>7</target>
-- 
GitLab