From ca5d902dd1fc4ea26ea086b1d334667ba23a148c Mon Sep 17 00:00:00 2001 From: lvjing2 Date: Mon, 24 Feb 2025 11:38:12 +0800 Subject: [PATCH 1/3] rename logback-classic to logback-core --- .../conf/adapter-mapping.yaml | 4 ++-- .../pom.xml | 2 +- .../main/java/ch/qos/logback/core/util/Loader.java | 0 .../koupleless/base/build/plugin/MatcherTest.java | 9 ++++----- .../conf/adapter-mapping.yaml | 4 ++-- .../pom.xml | 2 +- .../main/java/ch/qos/logback/core/util/Loader.java | 0 .../koupleless/base/build/plugin/MatcherTest.java | 13 ++++++------- pom.xml | 4 ++-- 9 files changed, 18 insertions(+), 20 deletions(-) rename {koupleless-adapter-logback-classic-1.1.6 => koupleless-adapter-logback-core-1.1.6}/conf/adapter-mapping.yaml (63%) rename {koupleless-adapter-logback-classic-1.1.6 => koupleless-adapter-logback-core-1.1.6}/pom.xml (99%) rename {koupleless-adapter-logback-classic-1.1.6 => koupleless-adapter-logback-core-1.1.6}/src/main/java/ch/qos/logback/core/util/Loader.java (100%) rename {koupleless-adapter-logback-classic-1.1.6 => koupleless-adapter-logback-core-1.1.6}/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java (91%) rename {koupleless-adapter-logback-classic-1.4.12 => koupleless-adapter-logback-core-1.4.12}/conf/adapter-mapping.yaml (63%) rename {koupleless-adapter-logback-classic-1.4.12 => koupleless-adapter-logback-core-1.4.12}/pom.xml (99%) rename {koupleless-adapter-logback-classic-1.4.12 => koupleless-adapter-logback-core-1.4.12}/src/main/java/ch/qos/logback/core/util/Loader.java (100%) rename {koupleless-adapter-logback-classic-1.4.12 => koupleless-adapter-logback-core-1.4.12}/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java (89%) diff --git a/koupleless-adapter-logback-classic-1.1.6/conf/adapter-mapping.yaml b/koupleless-adapter-logback-core-1.1.6/conf/adapter-mapping.yaml similarity index 63% rename from koupleless-adapter-logback-classic-1.1.6/conf/adapter-mapping.yaml rename to koupleless-adapter-logback-core-1.1.6/conf/adapter-mapping.yaml index 806042f5..c3aec9ca 100644 --- a/koupleless-adapter-logback-classic-1.1.6/conf/adapter-mapping.yaml +++ b/koupleless-adapter-logback-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/koupleless-adapter-logback-classic-1.1.6/pom.xml b/koupleless-adapter-logback-core-1.1.6/pom.xml similarity index 99% rename from koupleless-adapter-logback-classic-1.1.6/pom.xml rename to koupleless-adapter-logback-core-1.1.6/pom.xml index 7ee3da40..ba6d9fa4 100644 --- a/koupleless-adapter-logback-classic-1.1.6/pom.xml +++ b/koupleless-adapter-logback-core-1.1.6/pom.xml @@ -71,4 +71,4 @@ - \ No newline at end of file + diff --git a/koupleless-adapter-logback-classic-1.1.6/src/main/java/ch/qos/logback/core/util/Loader.java b/koupleless-adapter-logback-core-1.1.6/src/main/java/ch/qos/logback/core/util/Loader.java similarity index 100% rename from koupleless-adapter-logback-classic-1.1.6/src/main/java/ch/qos/logback/core/util/Loader.java rename to koupleless-adapter-logback-core-1.1.6/src/main/java/ch/qos/logback/core/util/Loader.java diff --git a/koupleless-adapter-logback-classic-1.1.6/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java b/koupleless-adapter-logback-core-1.1.6/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java similarity index 91% rename from koupleless-adapter-logback-classic-1.1.6/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java rename to koupleless-adapter-logback-core-1.1.6/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java index 1451d8bc..9c398363 100644 --- a/koupleless-adapter-logback-classic-1.1.6/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java +++ b/koupleless-adapter-logback-core-1.1.6/src/test/java/com/alipay/sofa/koupleless/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 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()); } -} \ No newline at end of file +} diff --git a/koupleless-adapter-logback-classic-1.4.12/conf/adapter-mapping.yaml b/koupleless-adapter-logback-core-1.4.12/conf/adapter-mapping.yaml similarity index 63% rename from koupleless-adapter-logback-classic-1.4.12/conf/adapter-mapping.yaml rename to koupleless-adapter-logback-core-1.4.12/conf/adapter-mapping.yaml index 898084b4..58a9eb5a 100644 --- a/koupleless-adapter-logback-classic-1.4.12/conf/adapter-mapping.yaml +++ b/koupleless-adapter-logback-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/koupleless-adapter-logback-classic-1.4.12/pom.xml b/koupleless-adapter-logback-core-1.4.12/pom.xml similarity index 99% rename from koupleless-adapter-logback-classic-1.4.12/pom.xml rename to koupleless-adapter-logback-core-1.4.12/pom.xml index f418eca7..6c459d34 100644 --- a/koupleless-adapter-logback-classic-1.4.12/pom.xml +++ b/koupleless-adapter-logback-core-1.4.12/pom.xml @@ -72,4 +72,4 @@ - \ No newline at end of file + diff --git a/koupleless-adapter-logback-classic-1.4.12/src/main/java/ch/qos/logback/core/util/Loader.java b/koupleless-adapter-logback-core-1.4.12/src/main/java/ch/qos/logback/core/util/Loader.java similarity index 100% rename from koupleless-adapter-logback-classic-1.4.12/src/main/java/ch/qos/logback/core/util/Loader.java rename to koupleless-adapter-logback-core-1.4.12/src/main/java/ch/qos/logback/core/util/Loader.java diff --git a/koupleless-adapter-logback-classic-1.4.12/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java b/koupleless-adapter-logback-core-1.4.12/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java similarity index 89% rename from koupleless-adapter-logback-classic-1.4.12/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java rename to koupleless-adapter-logback-core-1.4.12/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java index 3e7ddd9c..a2b307de 100644 --- a/koupleless-adapter-logback-classic-1.4.12/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java +++ b/koupleless-adapter-logback-core-1.4.12/src/test/java/com/alipay/sofa/koupleless/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 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()); } -} \ No newline at end of file +} diff --git a/pom.xml b/pom.xml index eccf6693..8c168aa4 100644 --- a/pom.xml +++ b/pom.xml @@ -109,8 +109,8 @@ koupleless-adapter-configs - koupleless-adapter-logback-classic-1.4.12 - koupleless-adapter-logback-classic-1.1.6 + koupleless-adapter-logback-core-1.4.12 + koupleless-adapter-logback-core-1.1.6 From ac83643419321b0d80a6250e418ab679b05eaed6 Mon Sep 17 00:00:00 2001 From: lvjing2 Date: Mon, 24 Feb 2025 13:24:28 +0800 Subject: [PATCH 2/3] rename module name --- koupleless-adapter-logback-core-1.1.6/pom.xml | 2 +- .../alipay/sofa/koupleless/base/build/plugin/MatcherTest.java | 2 +- koupleless-adapter-logback-core-1.4.12/pom.xml | 2 +- .../alipay/sofa/koupleless/base/build/plugin/MatcherTest.java | 2 +- koupleless-adapter-logback/pom.xml | 2 +- koupleless-adapter-spring-boot-logback-2.7.14/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koupleless-adapter-logback-core-1.1.6/pom.xml b/koupleless-adapter-logback-core-1.1.6/pom.xml index ba6d9fa4..fae02219 100644 --- a/koupleless-adapter-logback-core-1.1.6/pom.xml +++ b/koupleless-adapter-logback-core-1.1.6/pom.xml @@ -10,7 +10,7 @@ ../pom.xml - koupleless-adapter-logback-classic-1.1.6 + koupleless-adapter-logback-core-1.1.6 ${revision} diff --git a/koupleless-adapter-logback-core-1.1.6/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java b/koupleless-adapter-logback-core-1.1.6/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java index 9c398363..20019c10 100644 --- a/koupleless-adapter-logback-core-1.1.6/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java +++ b/koupleless-adapter-logback-core-1.1.6/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java @@ -43,7 +43,7 @@ public MatcherTest() throws IOException { * artifactId: logback-classic * 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 */ @Test diff --git a/koupleless-adapter-logback-core-1.4.12/pom.xml b/koupleless-adapter-logback-core-1.4.12/pom.xml index 6c459d34..e8aef04e 100644 --- a/koupleless-adapter-logback-core-1.4.12/pom.xml +++ b/koupleless-adapter-logback-core-1.4.12/pom.xml @@ -10,7 +10,7 @@ ../pom.xml - koupleless-adapter-logback-classic-1.4.12 + koupleless-adapter-logback-core-1.4.12 ${revision} diff --git a/koupleless-adapter-logback-core-1.4.12/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java b/koupleless-adapter-logback-core-1.4.12/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java index a2b307de..6518791d 100644 --- a/koupleless-adapter-logback-core-1.4.12/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java +++ b/koupleless-adapter-logback-core-1.4.12/src/test/java/com/alipay/sofa/koupleless/base/build/plugin/MatcherTest.java @@ -43,7 +43,7 @@ public MatcherTest() throws IOException { * artifactId: logback-classic * 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 */ @Test diff --git a/koupleless-adapter-logback/pom.xml b/koupleless-adapter-logback/pom.xml index 81575fd8..fc40fb22 100644 --- a/koupleless-adapter-logback/pom.xml +++ b/koupleless-adapter-logback/pom.xml @@ -21,7 +21,7 @@ com.alipay.sofa.koupleless - koupleless-adapter-logback-classic-1.1.6 + koupleless-adapter-logback-core-1.1.6 ${revision} provided diff --git a/koupleless-adapter-spring-boot-logback-2.7.14/pom.xml b/koupleless-adapter-spring-boot-logback-2.7.14/pom.xml index 10bceb00..62870969 100644 --- 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 @@ com.alipay.sofa.koupleless - koupleless-adapter-logback-classic-1.1.6 + koupleless-adapter-logback-core-1.1.6 ${revision} provided From 270d99d43ab5a2dc2f8769dd38dbacec49adce81 Mon Sep 17 00:00:00 2001 From: lvjing2 Date: Mon, 24 Feb 2025 16:11:49 +0800 Subject: [PATCH 3/3] update version --- .../conf/adapter-mapping.yaml | 2 +- .../conf/adapter-mapping.yaml | 2 +- .../conf/adapter-mapping.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koupleless-adapter-logback-core-1.1.6/conf/adapter-mapping.yaml b/koupleless-adapter-logback-core-1.1.6/conf/adapter-mapping.yaml index c3aec9ca..fc610ca9 100644 --- a/koupleless-adapter-logback-core-1.1.6/conf/adapter-mapping.yaml +++ b/koupleless-adapter-logback-core-1.1.6/conf/adapter-mapping.yaml @@ -1,4 +1,4 @@ -version: 1.2.4 +version: 1.2.7 adapterMappings: - matcher: groupId: ch.qos.logback diff --git a/koupleless-adapter-logback-core-1.4.12/conf/adapter-mapping.yaml b/koupleless-adapter-logback-core-1.4.12/conf/adapter-mapping.yaml index 58a9eb5a..80c0efd1 100644 --- a/koupleless-adapter-logback-core-1.4.12/conf/adapter-mapping.yaml +++ b/koupleless-adapter-logback-core-1.4.12/conf/adapter-mapping.yaml @@ -1,4 +1,4 @@ -version: 1.2.4 +version: 1.2.7 adapterMappings: - matcher: groupId: ch.qos.logback diff --git a/koupleless-adaptor-module-resource-load-spring-boot-2.7.14/conf/adapter-mapping.yaml b/koupleless-adaptor-module-resource-load-spring-boot-2.7.14/conf/adapter-mapping.yaml index 09e97648..d737f48b 100644 --- a/koupleless-adaptor-module-resource-load-spring-boot-2.7.14/conf/adapter-mapping.yaml +++ b/koupleless-adaptor-module-resource-load-spring-boot-2.7.14/conf/adapter-mapping.yaml @@ -1,4 +1,4 @@ -version: 1.2.6 +version: 1.2.7 adapterMappings: - matcher: groupId: org.springframework.boot @@ -6,4 +6,4 @@ adapterMappings: versionRange: "[2.1.0,2.7.14]" adapter: artifactId: koupleless-adaptor-module-resource-load-spring-boot-2.7.14 - groupId: com.alipay.sofa.koupleless \ No newline at end of file + groupId: com.alipay.sofa.koupleless