This is an automated email from the ASF dual-hosted git repository. amichai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit a86051d11090965dea854b279fde75e822a64816 Author: Amichai Rothman <[email protected]> AuthorDate: Sun Jun 2 15:49:18 2024 +0300 ARIES-2155 Upgrade to SLF4J 2.0.13 and Logback 1.3.14 --- itests/felix/pom.xml | 31 ++++++++++++++++++++++ .../apache/aries/rsa/itests/felix/RsaTestBase.java | 6 +++++ parent/pom.xml | 9 +++++-- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml index dd6378bf..bd70c741 100644 --- a/itests/felix/pom.xml +++ b/itests/felix/pom.xml @@ -67,6 +67,37 @@ <version>1.5.1</version> </dependency> + <dependency> + <groupId>org.apache.aries.spifly</groupId> + <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> + <version>1.3.7</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>9.7</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + <version>9.7</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-util</artifactId> + <version>9.7</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + <version>9.7</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + <version>9.7</version> + </dependency> + <dependency> <groupId>org.apache.aries.rsa</groupId> <artifactId>org.apache.aries.rsa.core</artifactId> diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java index 6aa0adee..74f3c0d8 100644 --- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java +++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java @@ -131,6 +131,12 @@ public class RsaTestBase { mvn("org.osgi", "org.osgi.util.function"), mvn("org.osgi", "org.osgi.util.promise"), mvn("org.osgi", "org.osgi.service.component"), + mvn("org.apache.aries.spifly", "org.apache.aries.spifly.dynamic.bundle"), + mvn("org.ow2.asm", "asm"), + mvn("org.ow2.asm", "asm-commons"), + mvn("org.ow2.asm", "asm-util"), + mvn("org.ow2.asm", "asm-tree"), + mvn("org.ow2.asm", "asm-analysis"), mvn("org.apache.felix", "org.apache.felix.eventadmin"), mvn("org.apache.felix", "org.apache.felix.configadmin"), mvn("org.apache.felix", "org.apache.felix.scr"), diff --git a/parent/pom.xml b/parent/pom.xml index fc8f9c22..ac6e8707 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -35,7 +35,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <bnd.version>6.4.0</bnd.version> <zookeeper.version>3.4.14</zookeeper.version> - <slf4j.version>1.7.36</slf4j.version> + <slf4j.version>2.0.13</slf4j.version> <hawtdispatch.version>1.22</hawtdispatch.version> <hawtbuf.version>1.11</hawtbuf.version> <exam.version>4.13.5</exam.version> @@ -66,7 +66,12 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.2.13</version> + <version>1.3.14</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>1.3.14</version> </dependency> <dependency> <groupId>junit</groupId>
