Merge branch 'main' into feature/test

shulieTech · Jun 26, 2021 · 2b15ac2 · 2b15ac2
2 parents b844bf8 + d670b51
commit 2b15ac2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/takin-data/amdb-receiver-service/pom.xml b/takin-data/amdb-receiver-service/pom.xml
@@ -29,14 +29,19 @@
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <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>
+
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-dependencies</artifactId>
-            <version>${spring.boot.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/takin-data/surge-data/common/pom.xml b/takin-data/surge-data/common/pom.xml
@@ -26,11 +26,6 @@
 
     <artifactId>common</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.10</version>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/takin-data/surge-data/sink/clickhouse/pom.xml b/takin-data/surge-data/sink/clickhouse/pom.xml
@@ -18,8 +18,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>surge-data</artifactId>
         <groupId>io.shulie.surge.data</groupId>
+        <artifactId>sink</artifactId>
         <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/takin-data/surge-data/sink/mysql/pom.xml b/takin-data/surge-data/sink/mysql/pom.xml
@@ -18,8 +18,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>surge-data</artifactId>
         <groupId>io.shulie.surge.data</groupId>
+        <artifactId>sink</artifactId>
         <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/takin-webapp/tro/tro-server-monitor/pom.xml b/takin-webapp/tro/tro-server-monitor/pom.xml
@@ -65,6 +65,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.boot.version}</version>
                 <configuration>
                     <!-- 指定该Main Class为全局的唯一入口 -->
                     <mainClass>io.shulie.tro.monitor.Application</mainClass>