Skip to content

Commit a7d0121

Browse files
committed
SLF4J binding warning on console
- Updates Logback to new version in case of Flight Evaluation Report to resolve mismatch caused by transitive dependencies Resolves #197 {patch} Signed-off-by: Esta Nagy <[email protected]>
1 parent ee60a2b commit a7d0121

File tree

7 files changed

+62
-15
lines changed

7 files changed

+62
-15
lines changed

boosters/testkit/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
implementation project(":mission-control")
1010
implementation libs.spring.boot.starter
1111
implementation libs.spring.boot.starter.test
12-
implementation libs.bundles.logback
12+
implementation libs.bundles.logback.test
1313
testImplementation libs.jupiter.api
1414
testImplementation libs.jupiter.core
1515
constraints {

gradle/libs.versions.toml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ springBoot = "2.7.6"
44
snakeYaml = "1.33"
55
thymeleaf = "3.1.0.RELEASE"
66
thymeleafExtrasTime = "3.0.4.RELEASE"
7-
logback = "1.2.11"
7+
logbackTest = "1.2.11"
88
jsonSchemaValidator = "1.0.74"
9+
logbackReport = "1.4.5"
910
jackson = "2.14.1"
1011
gson = "2.10"
1112
slf4j = "1.7.36"
@@ -43,8 +44,10 @@ snake-yaml = { module = "org.yaml:snakeyaml", version.ref = "snakeYaml" }
4344
thymeleaf = { module = "org.thymeleaf:thymeleaf", version.ref = "thymeleaf" }
4445
thymeleaf-extras-java8time = { module = "org.thymeleaf.extras:thymeleaf-extras-java8time", version.ref = "thymeleafExtrasTime" }
4546

46-
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
47-
logback-core = { module = "ch.qos.logback:logback-core", version.ref = "logback" }
47+
logback-classic-test = { module = "ch.qos.logback:logback-classic", version.ref = "logbackTest" }
48+
logback-core-test = { module = "ch.qos.logback:logback-core", version.ref = "logbackTest" }
49+
logback-classic-report = { module = "ch.qos.logback:logback-classic", version.ref = "logbackReport" }
50+
logback-core-report = { module = "ch.qos.logback:logback-core", version.ref = "logbackReport" }
4851

4952
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
5053
json-schema-validator = { module = "com.networknt:json-schema-validator", version.ref = "jsonSchemaValidator" }
@@ -76,7 +79,8 @@ cucumber-spring = { module = "io.cucumber:cucumber-spring", version.ref = "cucum
7679

7780
[bundles]
7881
spring-test = ["spring-core", "spring-context", "spring-test", "snake-yaml"]
79-
logback = ["logback-classic", "logback-core"]
82+
logback-test = ["logback-classic-test", "logback-core-test"]
83+
logback-report = ["logback-classic-report", "logback-core-report"]
8084

8185
[plugins]
8286
lombok = { id = "io.freefair.lombok", version.ref = "lombokPlugin" }

gradle/verification-metadata.xml

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131
<sha256 value="64e01794db4659829862a44574e066bf6940678fb1657e26668bf6414596244d" origin="Generated by Gradle"/>
3232
</artifact>
3333
</component>
34+
<component group="ch.qos.logback" name="logback-classic" version="1.4.5">
35+
<artifact name="logback-classic-1.4.5.jar">
36+
<sha256 value="595431df58c74d515dd4c225b2d84d9f23e16a24daeaafd7c94b059312a8b493" origin="Generated by Gradle"/>
37+
</artifact>
38+
<artifact name="logback-classic-1.4.5.pom">
39+
<sha256 value="8bfb0ea99168c5f1c63888bbe5eacb4b7eacdf8a2d2226d9b0c023f3b5887fde" origin="Generated by Gradle"/>
40+
</artifact>
41+
</component>
3442
<component group="ch.qos.logback" name="logback-core" version="1.2.11">
3543
<artifact name="logback-core-1.2.11.jar">
3644
<sha256 value="6ce1e9397be8298a2e99029f55f955c6fa3cef255171c554d0b9c201cffd0159" origin="Generated by Gradle"/>
@@ -39,11 +47,24 @@
3947
<sha256 value="53074a2590e0d64da5bd5b09cfe4a9c1cfcbf987e503940e8184ee39fe855d14" origin="Generated by Gradle"/>
4048
</artifact>
4149
</component>
50+
<component group="ch.qos.logback" name="logback-core" version="1.4.5">
51+
<artifact name="logback-core-1.4.5.jar">
52+
<sha256 value="8604e7c327556b097590701fba88dae84c581167f2746378f736b37269452380" origin="Generated by Gradle"/>
53+
</artifact>
54+
<artifact name="logback-core-1.4.5.pom">
55+
<sha256 value="68988021b6ecbf3d40fb74a3e8561e87ae66edc3a6d84e5c100880bea3208891" origin="Generated by Gradle"/>
56+
</artifact>
57+
</component>
4258
<component group="ch.qos.logback" name="logback-parent" version="1.2.11">
4359
<artifact name="logback-parent-1.2.11.pom">
4460
<sha256 value="c3c0f80dfb31aa922f8c60fe22c24b04eee41aa9a17466cdd85d81474196d1ef" origin="Generated by Gradle"/>
4561
</artifact>
4662
</component>
63+
<component group="ch.qos.logback" name="logback-parent" version="1.4.5">
64+
<artifact name="logback-parent-1.4.5.pom">
65+
<sha256 value="af2ef873616180481564afb295b877d7558077cca9a3786b90ce5407b9434acc" origin="Generated by Gradle"/>
66+
</artifact>
67+
</component>
4768
<component group="com.beust" name="jcommander" version="1.82">
4869
<artifact name="jcommander-1.82.jar">
4970
<sha256 value="deeac157c8de6822878d85d0c7bc8467a19cc8484d37788f7804f039dde280b1" origin="Generated by Gradle"/>
@@ -2165,13 +2186,18 @@
21652186
</artifact>
21662187
</component>
21672188
<component group="org.slf4j" name="slf4j-api" version="2.0.3">
2168-
<artifact name="slf4j-api-2.0.3.jar">
2169-
<sha256 value="68ddcda65300ff8097ad1a096d7cd2fb06cef25193887cec3f2690e01bdbf421" origin="Generated by Gradle"/>
2170-
</artifact>
21712189
<artifact name="slf4j-api-2.0.3.pom">
21722190
<sha256 value="1b2985de22fda3ee76cd564ad106fb291b73439ec3c544be3d3242c6f7a26b46" origin="Generated by Gradle"/>
21732191
</artifact>
21742192
</component>
2193+
<component group="org.slf4j" name="slf4j-api" version="2.0.4">
2194+
<artifact name="slf4j-api-2.0.4.jar">
2195+
<sha256 value="57fa874599ace9259286b99253d7a877afdd2db4b07a6827ac6c847ca5d601a2" origin="Generated by Gradle"/>
2196+
</artifact>
2197+
<artifact name="slf4j-api-2.0.4.pom">
2198+
<sha256 value="85b1af0535665ce8f23a2b9f1f581cc1e7877bb1289304140827731216c78ffd" origin="Generated by Gradle"/>
2199+
</artifact>
2200+
</component>
21752201
<component group="org.slf4j" name="slf4j-parent" version="1.7.2">
21762202
<artifact name="slf4j-parent-1.7.2.pom">
21772203
<sha256 value="1d8e084a6f2384ade42685332b52a0ece090478641dc14c0fa8c52e1e2984425" origin="Generated by Gradle"/>
@@ -2207,6 +2233,11 @@
22072233
<sha256 value="78293303db8c626674935fde8428baff8aaaacfc93ec461168692c92c8472339" origin="Generated by Gradle"/>
22082234
</artifact>
22092235
</component>
2236+
<component group="org.slf4j" name="slf4j-parent" version="2.0.4">
2237+
<artifact name="slf4j-parent-2.0.4.pom">
2238+
<sha256 value="dc9dc87f53a8af721ee49dbb521bd06cda06134214fdad9400d872a75426cffd" origin="Generated by Gradle"/>
2239+
</artifact>
2240+
</component>
22102241
<component group="org.sonatype.aether" name="aether" version="1.13.1">
22112242
<artifact name="aether-1.13.1.pom">
22122243
<sha256 value="719fe091fd3fe4c6a7b8f69c8714935138b85a2b6145068a1ccfdb57d2e500d1" origin="Generated by Gradle"/>

mission-report/flight-evaluation-report/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
implementation libs.jackson.databind
1818
implementation libs.thymeleaf
1919
implementation libs.thymeleaf.extras.java8time
20-
implementation libs.bundles.logback
20+
implementation libs.bundles.logback.report
2121
implementation libs.findbugs.jsr305
2222
annotationProcessor libs.lombok
2323
testImplementation libs.jupiter.core

mission-report/flight-evaluation-report/src/main/java/com/github/nagyesta/abortmission/reporting/PropertiesParser.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@
1010

1111
public final class PropertiesParser {
1212

13-
private static final String INPUT = "--report.input";
14-
private static final String OUTPUT = "--report.output";
13+
/**
14+
* The parameter name of the input file.
15+
*/
16+
public static final String INPUT = "--report.input";
17+
/**
18+
* The parameter name of the output file.
19+
*/
20+
public static final String OUTPUT = "--report.output";
1521
private static final String RELAXED = "--report.relaxed";
1622
private static final String FAIL_ON_ERROR = "--report.failOnError";
1723
private static final String EQUALS = "=";

mission-report/flight-evaluation-report/src/main/java/com/github/nagyesta/abortmission/reporting/config/ConversionProperties.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package com.github.nagyesta.abortmission.reporting.config;
22

33
import lombok.Data;
4-
import lombok.NonNull;
54

65
import javax.annotation.Nonnull;
76
import java.io.File;
7+
import java.util.Optional;
8+
9+
import static com.github.nagyesta.abortmission.reporting.PropertiesParser.INPUT;
10+
import static com.github.nagyesta.abortmission.reporting.PropertiesParser.OUTPUT;
811

912
@Data
1013
public final class ConversionProperties {
@@ -13,9 +16,12 @@ public final class ConversionProperties {
1316
private boolean relaxed;
1417
private boolean failOnError;
1518

16-
private ConversionProperties(@NonNull final File input, @NonNull final File output, final boolean relaxed, final boolean failOnError) {
17-
this.input = input;
19+
private ConversionProperties(final File input, final File output, final boolean relaxed, final boolean failOnError) {
20+
this.input = Optional.ofNullable(input)
21+
.orElseThrow(() -> new IllegalArgumentException("Missing input parameter. Expected: " + INPUT + "=<file.json>"));
1822
this.output = output;
23+
Optional.ofNullable(output)
24+
.orElseThrow(() -> new IllegalArgumentException("Missing output parameter. Expected: " + OUTPUT + "=<file.html>"));
1925
this.relaxed = relaxed;
2026
this.failOnError = failOnError;
2127
}

strongback/strongback-base/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
implementation libs.spring.context
1111
implementation libs.spring.core
1212
implementation libs.slf4j.api
13-
implementation libs.logback.classic
13+
implementation libs.logback.classic.report
1414
testImplementation libs.jupiter.core
1515
testImplementation libs.mockito.core
1616
}

0 commit comments

Comments
 (0)