fix springboot3 samples

sofastack · Feb 1, 2024 · fe6b08b · fe6b08b
1 parent b5eac52
commit fe6b08b
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 53 deletions.
diff --git a/samples/springboot3-samples/logging/log4j2/base/pom.xml b/samples/springboot3-samples/logging/log4j2/base/pom.xml
@@ -15,30 +15,14 @@
 	<description>logging base for log4j2</description>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<!-- 这里添加动态模块相关依赖 -->
 		<dependency>
 			<groupId>com.alipay.sofa.serverless</groupId>
 			<artifactId>sofa-serverless-base-starter</artifactId>
 			<!-- 以上版本支持springboot3 -->
 			<version>${sofa.serverless.runtime.version}</version>
+			<type>pom</type>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-log4j2</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>com.alipay.sofa</groupId>
 			<artifactId>web-ark-plugin</artifactId>
@@ -50,6 +34,23 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j2</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>com.alipay.sofa</groupId>
 			<artifactId>log-sofa-boot-starter</artifactId>

diff --git a/samples/springboot3-samples/msg/kafka/base/pom.xml b/samples/springboot3-samples/msg/kafka/base/pom.xml
@@ -15,6 +15,27 @@
 	<description>logging base for log4j2</description>
 
 	<dependencies>
+		<!-- 这里添加动态模块相关依赖 -->
+		<dependency>
+			<groupId>com.alipay.sofa.serverless</groupId>
+			<artifactId>sofa-serverless-base-starter</artifactId>
+			<!-- 以上版本支持springboot3 -->
+			<version>${sofa.serverless.runtime.version}</version>
+			<type>pom</type>
+		</dependency>
+
+		<dependency>
+			<groupId>com.alipay.sofa</groupId>
+			<artifactId>web-ark-plugin</artifactId>
+			<!-- 排除 web-ark-plugin 中 log-sofa-boot-starter -->
+			<exclusions>
+				<exclusion>
+					<groupId>com.alipay.sofa</groupId>
+					<artifactId>log-sofa-boot-starter</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -42,25 +63,6 @@
 			<version>${disruptor.version}</version>
 		</dependency>
 
-		<!-- 这里添加动态模块相关依赖 -->
-		<dependency>
-			<groupId>com.alipay.sofa.serverless</groupId>
-			<artifactId>sofa-serverless-base-starter</artifactId>
-			<!-- 以上版本支持springboot3 -->
-			<version>${sofa.serverless.runtime.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.alipay.sofa</groupId>
-			<artifactId>web-ark-plugin</artifactId>
-			<!-- 排除 web-ark-plugin 中 log-sofa-boot-starter -->
-			<exclusions>
-				<exclusion>
-					<groupId>com.alipay.sofa</groupId>
-					<artifactId>log-sofa-boot-starter</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>com.alipay.sofa</groupId>
 			<artifactId>log-sofa-boot-starter</artifactId>

diff --git a/samples/springboot3-samples/web/tomcat/base/pom.xml b/samples/springboot3-samples/web/tomcat/base/pom.xml
@@ -15,22 +15,6 @@
 	<description>base</description>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-log4j2</artifactId>
-		</dependency>
-
 		<!-- 这里添加动态模块相关依赖 -->
 		<dependency>
 			<groupId>com.alipay.sofa.serverless</groupId>
@@ -39,7 +23,6 @@
 			<version>${sofa.serverless.runtime.version}</version>
 		</dependency>
 		<!-- end 动态模块相关依赖 -->
-
 		<!-- 这里添加 tomcat 单 host 模式部署多web应用的依赖 -->
 		<dependency>
 			<groupId>com.alipay.sofa</groupId>
@@ -52,6 +35,23 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j2</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>com.alipay.sofa</groupId>
 			<artifactId>log-sofa-boot-starter</artifactId>