Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename logback-classic to logback-core #51

Merged
merged 3 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: 1.2.4
version: 1.2.7
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>koupleless-adapter-logback-classic-1.1.6</artifactId>
<artifactId>koupleless-adapter-logback-core-1.1.6</artifactId>
<version>${revision}</version>

<properties>
Expand Down Expand Up @@ -71,4 +71,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -44,17 +43,17 @@ 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
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());
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: 1.2.4
version: 1.2.7
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>koupleless-adapter-logback-classic-1.4.12</artifactId>
<artifactId>koupleless-adapter-logback-core-1.4.12</artifactId>
<version>${revision}</version>

<properties>
Expand Down Expand Up @@ -72,4 +72,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -44,21 +43,21 @@ 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
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());
}
}
}
2 changes: 1 addition & 1 deletion koupleless-adapter-logback/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependencies>
<dependency>
<groupId>com.alipay.sofa.koupleless</groupId>
<artifactId>koupleless-adapter-logback-classic-1.1.6</artifactId>
<artifactId>koupleless-adapter-logback-core-1.1.6</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion koupleless-adapter-spring-boot-logback-2.7.14/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependencies>
<dependency>
<groupId>com.alipay.sofa.koupleless</groupId>
<artifactId>koupleless-adapter-logback-classic-1.1.6</artifactId>
<artifactId>koupleless-adapter-logback-core-1.1.6</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: 1.2.6
version: 1.2.7
adapterMappings:
- matcher:
groupId: org.springframework.boot
artifactId: spring-boot
versionRange: "[2.1.0,2.7.14]"
adapter:
artifactId: koupleless-adaptor-module-resource-load-spring-boot-2.7.14
groupId: com.alipay.sofa.koupleless
groupId: com.alipay.sofa.koupleless
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,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>

Expand Down