Skip to content

Commit 72159e7

Browse files
authored
feat: include logback dependencies in sdk (#496)
* feat: include logback dependencies in sdk * chore: remove explicit logback dependencies frmo archetype and samples
1 parent 12aaf91 commit 72159e7

16 files changed

Lines changed: 5 additions & 258 deletions

File tree

  • maven-java
    • akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources
    • akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources
  • project
  • samples

maven-java/akkaserverless-maven-archetype-event-sourced-entity/src/main/resources/archetype-resources/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -315,23 +315,6 @@
315315
<artifactId>akkaserverless-java-sdk</artifactId>
316316
<version>${D}{akkaserverless-sdk.version}</version>
317317
</dependency>
318-
<dependency>
319-
<groupId>ch.qos.logback</groupId>
320-
<artifactId>logback-classic</artifactId>
321-
<version>1.2.3</version>
322-
</dependency>
323-
<dependency>
324-
<!-- for JSON formatted logging -->
325-
<groupId>ch.qos.logback.contrib</groupId>
326-
<artifactId>logback-json-classic</artifactId>
327-
<version>0.1.5</version>
328-
</dependency>
329-
<dependency>
330-
<!-- for JSON formatted logging -->
331-
<groupId>ch.qos.logback.contrib</groupId>
332-
<artifactId>logback-jackson</artifactId>
333-
<version>0.1.5</version>
334-
</dependency>
335318
<dependency>
336319
<groupId>com.akkaserverless</groupId>
337320
<artifactId>akkaserverless-java-sdk-testkit</artifactId>

maven-java/akkaserverless-maven-archetype-value-entity/src/main/resources/archetype-resources/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -300,23 +300,6 @@
300300
<artifactId>akkaserverless-java-sdk</artifactId>
301301
<version>${D}{akkaserverless-sdk.version}</version>
302302
</dependency>
303-
<dependency>
304-
<groupId>ch.qos.logback</groupId>
305-
<artifactId>logback-classic</artifactId>
306-
<version>1.2.3</version>
307-
</dependency>
308-
<dependency>
309-
<!-- for JSON formatted logging -->
310-
<groupId>ch.qos.logback.contrib</groupId>
311-
<artifactId>logback-json-classic</artifactId>
312-
<version>0.1.5</version>
313-
</dependency>
314-
<dependency>
315-
<!-- for JSON formatted logging -->
316-
<groupId>ch.qos.logback.contrib</groupId>
317-
<artifactId>logback-jackson</artifactId>
318-
<version>0.1.5</version>
319-
</dependency>
320303
<dependency>
321304
<groupId>com.akkaserverless</groupId>
322305
<artifactId>akkaserverless-java-sdk-testkit</artifactId>

project/Dependencies.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ object Dependencies {
3737

3838
val commonsIo = "commons-io" % "commons-io" % CommonsIoVerison
3939
val logback = "ch.qos.logback" % "logback-classic" % LogbackVersion
40-
val logbackContrib = "ch.qos.logback.contrib" % "logback-json-classic" % LogbackContribVersion
40+
val logbackJson = "ch.qos.logback.contrib" % "logback-json-classic" % LogbackContribVersion
41+
val logbackJackson = "ch.qos.logback.contrib" % "logback-jackson" % LogbackContribVersion
4142

4243
val protobufJava = "com.google.protobuf" % "protobuf-java" % ProtobufVersion
4344
val protobufJavaUtil = "com.google.protobuf" % "protobuf-java-util" % ProtobufVersion
@@ -82,8 +83,9 @@ object Dependencies {
8283
akkaDependency("akka-stream-testkit") % Test,
8384
akkaHttpDependency("akka-http-testkit") % Test,
8485
scalaTest % Test,
85-
logback % "test;provided",
86-
logbackContrib % Provided,
86+
logback,
87+
logbackJson,
88+
logbackJackson,
8789
jacksonCore,
8890
jacksonAnnotations,
8991
jacksonDatabind,

samples/java-customer-registry-quickstart/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -298,23 +298,6 @@
298298
<artifactId>akkaserverless-java-sdk</artifactId>
299299
<version>${akkaserverless-sdk.version}</version>
300300
</dependency>
301-
<dependency>
302-
<groupId>ch.qos.logback</groupId>
303-
<artifactId>logback-classic</artifactId>
304-
<version>1.2.3</version>
305-
</dependency>
306-
<dependency>
307-
<!-- for JSON formatted logging -->
308-
<groupId>ch.qos.logback.contrib</groupId>
309-
<artifactId>logback-json-classic</artifactId>
310-
<version>0.1.5</version>
311-
</dependency>
312-
<dependency>
313-
<!-- for JSON formatted logging -->
314-
<groupId>ch.qos.logback.contrib</groupId>
315-
<artifactId>logback-jackson</artifactId>
316-
<version>0.1.5</version>
317-
</dependency>
318301
<dependency>
319302
<groupId>com.akkaserverless</groupId>
320303
<artifactId>akkaserverless-java-sdk-testkit</artifactId>

samples/java-doc-snippets/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -300,23 +300,6 @@
300300
<artifactId>akkaserverless-java-sdk</artifactId>
301301
<version>${akkaserverless-sdk.version}</version>
302302
</dependency>
303-
<dependency>
304-
<groupId>ch.qos.logback</groupId>
305-
<artifactId>logback-classic</artifactId>
306-
<version>1.2.3</version>
307-
</dependency>
308-
<dependency>
309-
<!-- for JSON formatted logging -->
310-
<groupId>ch.qos.logback.contrib</groupId>
311-
<artifactId>logback-json-classic</artifactId>
312-
<version>0.1.5</version>
313-
</dependency>
314-
<dependency>
315-
<!-- for JSON formatted logging -->
316-
<groupId>ch.qos.logback.contrib</groupId>
317-
<artifactId>logback-jackson</artifactId>
318-
<version>0.1.5</version>
319-
</dependency>
320303
<dependency>
321304
<groupId>com.akkaserverless</groupId>
322305
<artifactId>akkaserverless-java-sdk-testkit</artifactId>

samples/java-eventsourced-counter/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -300,23 +300,6 @@
300300
<artifactId>akkaserverless-java-sdk</artifactId>
301301
<version>${akkaserverless-sdk.version}</version>
302302
</dependency>
303-
<dependency>
304-
<groupId>ch.qos.logback</groupId>
305-
<artifactId>logback-classic</artifactId>
306-
<version>1.2.3</version>
307-
</dependency>
308-
<dependency>
309-
<!-- for JSON formatted logging -->
310-
<groupId>ch.qos.logback.contrib</groupId>
311-
<artifactId>logback-json-classic</artifactId>
312-
<version>0.1.5</version>
313-
</dependency>
314-
<dependency>
315-
<!-- for JSON formatted logging -->
316-
<groupId>ch.qos.logback.contrib</groupId>
317-
<artifactId>logback-jackson</artifactId>
318-
<version>0.1.5</version>
319-
</dependency>
320303
<dependency>
321304
<groupId>com.akkaserverless</groupId>
322305
<artifactId>akkaserverless-java-sdk-testkit</artifactId>

samples/java-eventsourced-customer-registry/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -300,23 +300,6 @@
300300
<artifactId>akkaserverless-java-sdk</artifactId>
301301
<version>${akkaserverless-sdk.version}</version>
302302
</dependency>
303-
<dependency>
304-
<groupId>ch.qos.logback</groupId>
305-
<artifactId>logback-classic</artifactId>
306-
<version>1.2.3</version>
307-
</dependency>
308-
<dependency>
309-
<!-- for JSON formatted logging -->
310-
<groupId>ch.qos.logback.contrib</groupId>
311-
<artifactId>logback-json-classic</artifactId>
312-
<version>0.1.5</version>
313-
</dependency>
314-
<dependency>
315-
<!-- for JSON formatted logging -->
316-
<groupId>ch.qos.logback.contrib</groupId>
317-
<artifactId>logback-jackson</artifactId>
318-
<version>0.1.5</version>
319-
</dependency>
320303
<dependency>
321304
<groupId>com.akkaserverless</groupId>
322305
<artifactId>akkaserverless-java-sdk-testkit</artifactId>

samples/java-eventsourced-shopping-cart/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -319,23 +319,6 @@
319319
<artifactId>akkaserverless-java-sdk</artifactId>
320320
<version>${akkaserverless-sdk.version}</version>
321321
</dependency>
322-
<dependency>
323-
<groupId>ch.qos.logback</groupId>
324-
<artifactId>logback-classic</artifactId>
325-
<version>1.2.3</version>
326-
</dependency>
327-
<dependency>
328-
<!-- for JSON formatted logging -->
329-
<groupId>ch.qos.logback.contrib</groupId>
330-
<artifactId>logback-json-classic</artifactId>
331-
<version>0.1.5</version>
332-
</dependency>
333-
<dependency>
334-
<!-- for JSON formatted logging -->
335-
<groupId>ch.qos.logback.contrib</groupId>
336-
<artifactId>logback-jackson</artifactId>
337-
<version>0.1.5</version>
338-
</dependency>
339322
<dependency>
340323
<groupId>com.akkaserverless</groupId>
341324
<artifactId>akkaserverless-java-sdk-testkit</artifactId>

samples/java-fibonacci-action/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -300,23 +300,6 @@
300300
<artifactId>akkaserverless-java-sdk</artifactId>
301301
<version>${akkaserverless-sdk.version}</version>
302302
</dependency>
303-
<dependency>
304-
<groupId>ch.qos.logback</groupId>
305-
<artifactId>logback-classic</artifactId>
306-
<version>1.2.3</version>
307-
</dependency>
308-
<dependency>
309-
<!-- for JSON formatted logging -->
310-
<groupId>ch.qos.logback.contrib</groupId>
311-
<artifactId>logback-json-classic</artifactId>
312-
<version>0.1.5</version>
313-
</dependency>
314-
<dependency>
315-
<!-- for JSON formatted logging -->
316-
<groupId>ch.qos.logback.contrib</groupId>
317-
<artifactId>logback-jackson</artifactId>
318-
<version>0.1.5</version>
319-
</dependency>
320303
<dependency>
321304
<groupId>com.akkaserverless</groupId>
322305
<artifactId>akkaserverless-java-sdk-testkit</artifactId>

samples/java-first-service/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -300,23 +300,6 @@
300300
<artifactId>akkaserverless-java-sdk</artifactId>
301301
<version>${akkaserverless-sdk.version}</version>
302302
</dependency>
303-
<dependency>
304-
<groupId>ch.qos.logback</groupId>
305-
<artifactId>logback-classic</artifactId>
306-
<version>1.2.3</version>
307-
</dependency>
308-
<dependency>
309-
<!-- for JSON formatted logging -->
310-
<groupId>ch.qos.logback.contrib</groupId>
311-
<artifactId>logback-json-classic</artifactId>
312-
<version>0.1.5</version>
313-
</dependency>
314-
<dependency>
315-
<!-- for JSON formatted logging -->
316-
<groupId>ch.qos.logback.contrib</groupId>
317-
<artifactId>logback-jackson</artifactId>
318-
<version>0.1.5</version>
319-
</dependency>
320303
<dependency>
321304
<groupId>com.akkaserverless</groupId>
322305
<artifactId>akkaserverless-java-sdk-testkit</artifactId>

0 commit comments

Comments
 (0)