Bladeren bron

fix some version conflict

Mr.qian 1 dag geleden
bovenliggende
commit
4dc9ccb8cc
2 gewijzigde bestanden met toevoegingen van 74 en 70 verwijderingen
  1. 32 33
      backstage-service/pom.xml
  2. 42 37
      pom.xml

+ 32 - 33
backstage-service/pom.xml

@@ -35,7 +35,6 @@
         <dependency>
             <groupId>com.txz</groupId>
             <artifactId>common</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -88,41 +87,41 @@
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-            <version>3.0.10</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>org.apache.dubbo</groupId> -->
+        <!--     <artifactId>dubbo-spring-boot-starter</artifactId> -->
+        <!--     <version>3.0.10</version> -->
+        <!-- </dependency> -->
 
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
-            <version>3.0.10</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>org.apache.dubbo</groupId> -->
+        <!--     <artifactId>dubbo</artifactId> -->
+        <!--     <version>3.0.10</version> -->
+        <!-- </dependency> -->
 
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>kryo</artifactId>
-            <version>4.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>de.javakaffee</groupId>
-            <artifactId>kryo-serializers</artifactId>
-            <version>0.45</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>com.esotericsoftware</groupId> -->
+        <!--     <artifactId>kryo</artifactId> -->
+        <!--     <version>4.0.2</version> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>de.javakaffee</groupId> -->
+        <!--     <artifactId>kryo-serializers</artifactId> -->
+        <!--     <version>0.45</version> -->
+        <!-- </dependency> -->
 
         <dependency>
-            <groupId>org.apache.dubbo</groupId>
+            <groupId>org.apache.dubbo.extensions</groupId>
             <artifactId>dubbo-serialization-kryo</artifactId>
-            <version>2.7.9</version>
+            <version>1.0.1</version>
         </dependency>
 
         <!-- Dubbo Registry Nacos -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-registry-nacos</artifactId>
-            <version>3.0.10</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>org.apache.dubbo</groupId> -->
+        <!--     <artifactId>dubbo-registry-nacos</artifactId> -->
+        <!--     <version>3.0.10</version> -->
+        <!-- </dependency> -->
 
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -158,11 +157,11 @@
             <version>1.56.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-            <version>2.2.2</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>com.alibaba.nacos</groupId> -->
+        <!--     <artifactId>nacos-client</artifactId> -->
+        <!--     <version>2.2.2</version> -->
+        <!-- </dependency> -->
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>

+ 42 - 37
pom.xml

@@ -2,57 +2,62 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
     <groupId>com.txz</groupId>
     <version>1.0.0-SNAPSHOT</version>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.18</version>
+        <version>2.7.18</version>
     </parent>
 
 
     <artifactId>backstage</artifactId>
     <packaging>pom</packaging>
-	<modules>
-<!--        <module>backstage-interface</module>-->
+    <modules>
+        <!--        <module>backstage-interface</module>-->
         <module>backstage-service</module>
-		<module>backstage-api</module>
+        <module>backstage-api</module>
     </modules>
 
-   <dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>2021.0.8</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<!-- <dependency> -->
-			<!--     <groupId>org.springframework.cloud</groupId> -->
-			<!--     <artifactId>spring-cloud-alibaba-dependencies</artifactId> -->
-			<!--     <version>0.2.2.RELEASE</version> -->
-			<!--     <type>pom</type> -->
-			<!--     <scope>import</scope> -->
-			<!-- </dependency> -->
-		</dependencies>
-	</dependencyManagement>
-	<distributionManagement>
-		<snapshotRepository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>nexus-snapshots</id>
-			<name>Nexus Snapshot Repository</name>
-			<url>http://124.220.229.80:9091/repository/maven-snapshots/</url>
-			<layout>default</layout>
-		</snapshotRepository>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.txz</groupId>
+                <artifactId>common</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>2021.0.8</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+                <version>2021.0.5.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <distributionManagement>
+        <snapshotRepository>
+            <uniqueVersion>false</uniqueVersion>
+            <id>nexus-snapshots</id>
+            <name>Nexus Snapshot Repository</name>
+            <url>http://124.220.229.80:9091/repository/maven-snapshots/</url>
+            <layout>default</layout>
+        </snapshotRepository>
 
-		<repository>
-			<id>nexus-releases</id>
-			<name>maven-releases</name>
-			<url>http://124.220.229.80:9091/repository/maven-releases/</url>
-		</repository>
-	</distributionManagement>
+        <repository>
+            <id>nexus-releases</id>
+            <name>maven-releases</name>
+            <url>http://124.220.229.80:9091/repository/maven-releases/</url>
+        </repository>
+    </distributionManagement>
 
 
     <build>