rename logback-classic to logback-core

koupleless · Feb 24, 2025 · 4e4affb · 4e4affb
1 parent 0945570
commit 4e4affb
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 22 deletions.
diff --git a/...k-classic-1.1.6/conf/adapter-mapping.yaml → ...back-core-1.1.6/conf/adapter-mapping.yaml b/...k-classic-1.1.6/conf/adapter-mapping.yaml → ...back-core-1.1.6/conf/adapter-mapping.yaml
@@ -2,8 +2,8 @@ version: 1.2.4
 adapterMappings:
   - matcher:
       groupId: ch.qos.logback
-      artifactId: logback-classic
+      artifactId: logback-core
       versionRange: "(,1.4.12)"
     adapter:
-      artifactId: koupleless-adapter-logback-classic-1.1.6
+      artifactId: koupleless-adapter-logback-core-1.1.6
       groupId: com.alipay.sofa.koupleless
diff --git a/...ess-adapter-logback-classic-1.1.6/pom.xml → ...leless-adapter-logback-core-1.1.6/pom.xml b/...ess-adapter-logback-classic-1.1.6/pom.xml → ...leless-adapter-logback-core-1.1.6/pom.xml
@@ -71,4 +71,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/...java/ch/qos/logback/core/util/Loader.java → ...java/ch/qos/logback/core/util/Loader.java b/...java/ch/qos/logback/core/util/Loader.java → ...java/ch/qos/logback/core/util/Loader.java
diff --git a/...leless/base/build/plugin/MatcherTest.java → ...leless/base/build/plugin/MatcherTest.java b/...leless/base/build/plugin/MatcherTest.java → ...leless/base/build/plugin/MatcherTest.java
@@ -16,7 +16,6 @@
  */
 package com.alipay.sofa.koupleless.base.build.plugin;
 
-import edu.emory.mathcs.backport.java.util.Collections;
 import org.apache.maven.model.Dependency;
 
 import org.eclipse.aether.version.InvalidVersionSpecificationException;
@@ -50,11 +49,11 @@ public MatcherTest() throws IOException {
     @Test
     public void testMatcher() throws InvalidVersionSpecificationException {
         List<Dependency> res = getMatcherAdaptor(
-            mockArtifact("ch.qos.logback", "logback-classic", "1.1.11"));
+            mockArtifact("ch.qos.logback", "logback-core", "1.1.11"));
         assertEquals(1, res.size());
-        assertEquals(res.get(0).getArtifactId(), "koupleless-adapter-logback-classic-1.1.6");
+        assertEquals(res.get(0).getArtifactId(), "koupleless-adapter-logback-core-1.1.6");
 
-        res = getMatcherAdaptor(mockArtifact("ch.qos.logback", "logback-classic", "1.4.12"));
+        res = getMatcherAdaptor(mockArtifact("ch.qos.logback", "logback-core", "1.4.12"));
         assertEquals(0, res.size());
     }
-}
+}
diff --git a/...-classic-1.4.12/conf/adapter-mapping.yaml → ...ack-core-1.4.12/conf/adapter-mapping.yaml b/...-classic-1.4.12/conf/adapter-mapping.yaml → ...ack-core-1.4.12/conf/adapter-mapping.yaml
@@ -2,8 +2,8 @@ version: 1.2.4
 adapterMappings:
   - matcher:
       groupId: ch.qos.logback
-      artifactId: logback-classic
+      artifactId: logback-core
       versionRange: "[1.4.12,)"
     adapter:
-      artifactId: koupleless-adapter-logback-classic-1.4.12
+      artifactId: koupleless-adapter-logback-core-1.4.12
       groupId: com.alipay.sofa.koupleless
diff --git a/...ss-adapter-logback-classic-1.4.12/pom.xml → ...eless-adapter-logback-core-1.4.12/pom.xml b/...ss-adapter-logback-classic-1.4.12/pom.xml → ...eless-adapter-logback-core-1.4.12/pom.xml
@@ -72,4 +72,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/...java/ch/qos/logback/core/util/Loader.java → ...java/ch/qos/logback/core/util/Loader.java b/...java/ch/qos/logback/core/util/Loader.java → ...java/ch/qos/logback/core/util/Loader.java
diff --git a/...leless/base/build/plugin/MatcherTest.java → ...leless/base/build/plugin/MatcherTest.java b/...leless/base/build/plugin/MatcherTest.java → ...leless/base/build/plugin/MatcherTest.java
@@ -16,7 +16,6 @@
  */
 package com.alipay.sofa.koupleless.base.build.plugin;
 
-import edu.emory.mathcs.backport.java.util.Collections;
 import org.apache.maven.model.Dependency;
 
 import org.eclipse.aether.version.InvalidVersionSpecificationException;
@@ -50,15 +49,15 @@ public MatcherTest() throws IOException {
     @Test
     public void testMatcher() throws InvalidVersionSpecificationException {
         List<Dependency> res = getMatcherAdaptor(
-            mockArtifact("ch.qos.logback", "logback-classic", "1.4.12"));
+            mockArtifact("ch.qos.logback", "logback-core", "1.4.12"));
         assertEquals(1, res.size());
-        assertEquals(res.get(0).getArtifactId(), "koupleless-adapter-logback-classic-1.4.12");
+        assertEquals(res.get(0).getArtifactId(), "koupleless-adapter-logback-core-1.4.12");
 
-        res = getMatcherAdaptor(mockArtifact("ch.qos.logback", "logback-classic", "1.5.12"));
+        res = getMatcherAdaptor(mockArtifact("ch.qos.logback", "logback-core", "1.5.12"));
         assertEquals(1, res.size());
-        assertEquals(res.get(0).getArtifactId(), "koupleless-adapter-logback-classic-1.4.12");
+        assertEquals(res.get(0).getArtifactId(), "koupleless-adapter-logback-core-1.4.12");
 
-        res = getMatcherAdaptor(mockArtifact("ch.qos.logback", "logback-classic", "1.4.11"));
+        res = getMatcherAdaptor(mockArtifact("ch.qos.logback", "logback-core", "1.4.11"));
         assertEquals(0, res.size());
     }
-}
+}
diff --git a/koupleless-adapter-logback/pom.xml b/koupleless-adapter-logback/pom.xml
@@ -21,7 +21,7 @@
     <dependencies>
         <dependency>
             <groupId>com.alipay.sofa.koupleless</groupId>
-            <artifactId>koupleless-adapter-logback-classic-1.1.6</artifactId>
+            <artifactId>6</artifactId>
             <version>${revision}</version>
             <scope>provided</scope>
         </dependency>

diff --git a/koupleless-adapter-spring-boot-logback-2.7.14/pom.xml b/koupleless-adapter-spring-boot-logback-2.7.14/pom.xml
@@ -23,7 +23,7 @@
     <dependencies>
         <dependency>
             <groupId>com.alipay.sofa.koupleless</groupId>
-            <artifactId>koupleless-adapter-logback-classic-1.1.6</artifactId>
+            <artifactId>6</artifactId>
             <version>${revision}</version>
             <scope>provided</scope>
         </dependency>

diff --git a/pom.xml b/pom.xml
@@ -107,8 +107,8 @@
 
 <!--        summarize all configurations-->
         <module>koupleless-adapter-configs</module>
-        <module>koupleless-adapter-logback-classic-1.4.12</module>
-        <module>koupleless-adapter-logback-classic-1.1.6</module>
+        <module>koupleless-adapter-logback-core-1.4.12</module>
+        <module>koupleless-adapter-logback-core-1.1.6</module>
 
     </modules>