Merge pull request #275 from sofastack/youji-dev

update slimming
sofastack · Nov 9, 2023 · 52aff88 · 52aff88
2 parents 4d0fb9e + 5d0221a
commit 52aff88
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 17 deletions.
diff --git a/samples/springboot-samples/pom.xml b/samples/springboot-samples/pom.xml
@@ -38,6 +38,7 @@
         <module>service/sample-service-base</module>
         <module>service/sample-service-biz</module>
         <module>service/sample-service-biz2</module>
+        <module>slimming/log4j2</module>
         <module>msg/kafka/base</module>
         <module>msg/kafka/biz1</module>
         <module>msg/kafka/biz2</module>

diff --git a/samples/springboot-samples/slimming/log4j2/base/pom.xml b/samples/springboot-samples/slimming/log4j2/base/pom.xml
@@ -3,16 +3,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>com.alipay.sofa</groupId>
-		<artifactId>springboot-samples</artifactId>
+		<groupId>com.alipay.sofa.slimming.log4j2</groupId>
+		<artifactId>slimming-log4j2</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath> <!-- lookup parent from repository -->
+		<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>com.alipay.sofa.logging.log4j2</groupId>
-	<artifactId>base-log4j2</artifactId>
+	<artifactId>base-slimming-log4j2</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>base-log4j2</name>
-	<description>logging base for log4j2</description>
 
 	<dependencies>
 		<dependency>

diff --git a/samples/springboot-samples/slimming/log4j2/biz1/pom.xml b/samples/springboot-samples/slimming/log4j2/biz1/pom.xml
@@ -3,16 +3,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.alipay.sofa</groupId>
-        <artifactId>springboot-samples</artifactId>
+        <groupId>com.alipay.sofa.slimming.log4j2</groupId>
+        <artifactId>slimming-log4j2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath> <!-- lookup parent from repository -->
+        <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
     </parent>
-    <groupId>com.alipay.sofa.logging.log4j2</groupId>
-    <artifactId>biz1-log4j2</artifactId>
+    <artifactId>biz1-slimming-log4j2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>biz1-log4j2</name>
-    <description>biz1</description>
 
     <dependencies>
         <dependency>
@@ -73,9 +70,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <finalName>springboot-application</finalName>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/samples/springboot-samples/slimming/log4j2/pom.xml b/samples/springboot-samples/slimming/log4j2/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.alipay.sofa</groupId>
+        <artifactId>springboot-samples</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.alipay.sofa.slimming.log4j2</groupId>
+    <artifactId>slimming-log4j2</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>base</module>
+        <module>biz1</module>
+    </modules>
+</project>