Skip to content

Commit 121517d

Browse files
committed
Merge branch 'RM-4571-2' into 'SID'
RM-4571: add slf4j-api and change logback scope to test See merge request cdoc2/cdoc2-java-ref-impl!102
2 parents 2a46c4a + a64e1a7 commit 121517d

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

cdoc2-cli/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@
4343
<groupId>ee.cyber.cdoc2</groupId>
4444
<artifactId>cdoc2-lib</artifactId>
4545
<version>SID-2.1.1-SNAPSHOT</version>
46-
<exclusions>
47-
<exclusion>
48-
<groupId>ch.qos.logback</groupId>
49-
<artifactId>logback-classic</artifactId>
50-
</exclusion>
51-
</exclusions>
5246
</dependency>
5347
</dependencies>
5448

cdoc2-client/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,18 @@
2525
</properties>
2626

2727
<dependencies>
28+
<dependency>
29+
<groupId>org.slf4j</groupId>
30+
<artifactId>slf4j-api</artifactId>
31+
<version>2.0.16</version>
32+
<scope>compile</scope>
33+
</dependency>
2834
<dependency>
2935
<groupId>ch.qos.logback</groupId>
3036
<artifactId>logback-classic</artifactId>
3137
<version>${logback-classic.version}</version>
38+
<scope>test</scope>
3239
</dependency>
33-
3440
<!-- javax.annotation.Nonnull and friends used by jersey3 client-->
3541
<!-- no longer required for client, but lib depends on it yet. Move to lib with client move -->
3642
<!-- remove, and add jakarta-annotation, and start using jakarta.annotation.Nullable instead -->

cdoc2-lib/pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>ee.cyber.cdoc2</groupId>
3434
<artifactId>cdoc2-auth-token</artifactId>
35-
<version>0.3.2-SNAPSHOT</version>
35+
<version>0.3.3-SNAPSHOT</version>
3636
</dependency>
3737

3838
<dependency>
@@ -53,10 +53,18 @@
5353
<version>${bouncycastle.version}</version>
5454
</dependency>
5555

56+
<dependency>
57+
<groupId>org.slf4j</groupId>
58+
<artifactId>slf4j-api</artifactId>
59+
<version>2.0.16</version>
60+
<scope>compile</scope>
61+
</dependency>
62+
5663
<dependency>
5764
<groupId>ch.qos.logback</groupId>
5865
<artifactId>logback-classic</artifactId>
5966
<version>${logback-classic.version}</version>
67+
<scope>test</scope>
6068
</dependency>
6169

6270
<dependency>

0 commit comments

Comments
 (0)