From 5f571fee2b455c8227c005eaec9b163839413af2 Mon Sep 17 00:00:00 2001 From: Nick Cross Date: Thu, 30 Nov 2023 09:35:21 +0000 Subject: [PATCH] Update SLF4J/Logback --- .../test/java/org/commonjava/maven/ext/cli/CliTest.java | 6 +++--- .../maven/ext/common/util/ManifestUtilsTest.java | 1 - pom.xml | 7 ++++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/src/test/java/org/commonjava/maven/ext/cli/CliTest.java b/cli/src/test/java/org/commonjava/maven/ext/cli/CliTest.java index e9c8b49c..66f3aca7 100644 --- a/cli/src/test/java/org/commonjava/maven/ext/cli/CliTest.java +++ b/cli/src/test/java/org/commonjava/maven/ext/cli/CliTest.java @@ -297,8 +297,8 @@ public void checkDependencies() assertTrue( cliOutput.contains( "Found 83" ) ); assertTrue( cliOutput.matches( "(?s).*" - + "ch.qos.logback:logback-classic:1.2.[.\\d+]+\\s+ jar compile \n" - + "ch.qos.logback:logback-core:1.2.[.\\d+]+\\s+ jar compile \n" + + "ch.qos.logback:logback-classic:1.[.\\d+]+\\s+ jar compile \n" + + "ch.qos.logback:logback-core:1.[.\\d+]+\\s+ jar compile \n" + "com.fasterxml.jackson.core:jackson-annotations:2.[.\\w+|\\a|-]+\\s+ jar compile \n" + "com.fasterxml.jackson.core:jackson-core:2.[.\\w+|-]+\\s+ jar compile \n" + "com.fasterxml.jackson.core:jackson-databind:2.[.\\w+|-]+\\s+ jar compile \n" @@ -364,7 +364,7 @@ public void checkDependencies() + "org.jdom:jdom2:2.[.\\d+]+\\s+ jar compile \n" + "org.projectlombok:lombok:1.[.\\d+]+\\s+ jar provided \n" + "org.projectlombok:lombok-maven-plugin:1.[.\\d+]+\\s+ maven-plugin \n" - + "org.slf4j:slf4j-api:1.[.\\d+]+\\s+ jar compile \n" + + "org.slf4j:slf4j-api:2.[.\\d+]+\\s+ jar compile \n" + "org.xmlunit:xmlunit-core:2.[.\\d+]+\\s+ jar test \n" + "org.xmlunit:xmlunit-matchers:2.[.\\d+]+\\s+ jar test \n" + "org.yaml:snakeyaml:2.[.\\d+]+\\s+ jar compile.*") ); diff --git a/common/src/test/java/org/commonjava/maven/ext/common/util/ManifestUtilsTest.java b/common/src/test/java/org/commonjava/maven/ext/common/util/ManifestUtilsTest.java index 47c2b11d..32fda562 100644 --- a/common/src/test/java/org/commonjava/maven/ext/common/util/ManifestUtilsTest.java +++ b/common/src/test/java/org/commonjava/maven/ext/common/util/ManifestUtilsTest.java @@ -51,7 +51,6 @@ public void testNoClass() public void testThisClass() { ManifestUtils.getManifestInformation( ManifestUtilsTest.class ); - assertTrue( systemRule.getLog() .contains( "Unable to retrieve manifest for class " + "org.commonjava.maven.ext.common.util.ManifestUtilsTest as " diff --git a/pom.xml b/pom.xml index 1999cd0f..68837fb0 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,8 @@ 3.0.17 3.14.2 2.8.0 - 1.7.36 + 2.0.9 + 1.3.12 1.1 1.18.20.0 3.2.4 @@ -423,12 +424,12 @@ ch.qos.logback logback-classic - 1.2.9 + ${logbackVersion} ch.qos.logback logback-core - 1.2.9 + ${logbackVersion}