Skip to content

Commit

Permalink
Remove logbook-bom
Browse files Browse the repository at this point in the history 
It seems it breaks the kotlin-related lines in the lock files
so after running resolveAndLockAll lock files needed manual fixes,
see: gh-13

Closes gh-13
  • Loading branch information
@jonatan-ivanov
jonatan-ivanov committed Oct 17, 2024
1 parent 84572eb commit 81ccc25
Show file tree
Hide file tree
Showing 13 changed files with 4 additions and 14 deletions.
1 change: 0 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ subprojects {
dependencies.add(conf, platform("org.springframework.boot:spring-boot-dependencies:$springBootVersion"))
dependencies.add(conf, platform("org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion"))
dependencies.add(conf, platform("org.springframework.data:spring-data-bom:$springDataVersion"))
dependencies.add(conf, platform('org.zalando:logbook-bom:latest.release'))
}
testImplementation platform('org.junit:junit-bom:latest.release')

Expand Down
1 change: 0 additions & 1 deletion core/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,4 @@ org.springframework:spring-expression:6.1.13=compileClasspath,runtimeClasspath,t
org.springframework:spring-jcl:6.1.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.springframework:spring-web:6.1.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.springframework:spring-webmvc:6.1.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-bom:3.9.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=testAnnotationProcessor
1 change: 0 additions & 1 deletion eureka/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,5 @@ org.springframework:spring-web:6.1.13=compileClasspath,productionRuntimeClasspat
org.springframework:spring-webmvc:6.1.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.xmlunit:xmlunit-core:2.9.1=testCompileClasspath,testRuntimeClasspath
org.yaml:snakeyaml:2.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-bom:3.9.0=annotationProcessor,compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
xmlpull:xmlpull:1.1.3.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=developmentOnly,testAndDevelopmentOnly,testAnnotationProcessor
1 change: 0 additions & 1 deletion spring-boot-admin/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,5 @@ org.thymeleaf:thymeleaf:3.1.2.RELEASE=compileClasspath,productionRuntimeClasspat
org.unbescape:unbescape:1.1.6.RELEASE=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.xmlunit:xmlunit-core:2.9.1=testCompileClasspath,testRuntimeClasspath
org.yaml:snakeyaml:2.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-bom:3.9.0=annotationProcessor,compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
xmlpull:xmlpull:1.1.3.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=developmentOnly,testAndDevelopmentOnly,testAnnotationProcessor
4 changes: 2 additions & 2 deletions tea-service/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ dependencies {

implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:latest.release'

implementation 'org.zalando:logbook-spring-boot-starter'
implementation 'org.zalando:logbook-okhttp'
implementation 'org.zalando:logbook-spring-boot-starter:latest.release'
implementation 'org.zalando:logbook-okhttp:latest.release'

runtimeOnly 'com.github.loki4j:loki-logback-appender:latest.release'
}
1 change: 0 additions & 1 deletion tea-service/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ org.xmlunit:xmlunit-core:2.9.1=testCompileClasspath,testRuntimeClasspath
org.yaml:snakeyaml:2.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:faux-pas:0.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-api:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-bom:3.9.0=annotationProcessor,compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-common:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-core:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-json:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
1 change: 0 additions & 1 deletion tea-service/tea-api/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@ org.projectlombok:lombok:1.18.34=annotationProcessor,compileClasspath
org.springframework.boot:spring-boot-dependencies:3.3.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.springframework.cloud:spring-cloud-dependencies:2023.0.3=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.springframework.data:spring-data-bom:2024.0.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-bom:3.9.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=testAnnotationProcessor
2 changes: 1 addition & 1 deletion tealeaf-service/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {

implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:latest.release'

implementation 'org.zalando:logbook-spring-boot-starter'
implementation 'org.zalando:logbook-spring-boot-starter:latest.release'

runtimeOnly 'com.github.loki4j:loki-logback-appender:latest.release'

Expand Down
1 change: 0 additions & 1 deletion tealeaf-service/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ org.xmlunit:xmlunit-core:2.9.1=testCompileClasspath,testRuntimeClasspath
org.yaml:snakeyaml:2.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:faux-pas:0.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-api:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-bom:3.9.0=annotationProcessor,compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-common:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-core:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-json:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
1 change: 0 additions & 1 deletion tealeaf-service/tealeaf-api/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@ org.projectlombok:lombok:1.18.34=annotationProcessor,compileClasspath
org.springframework.boot:spring-boot-dependencies:3.3.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.springframework.cloud:spring-cloud-dependencies:2023.0.3=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.springframework.data:spring-data-bom:2024.0.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-bom:3.9.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=testAnnotationProcessor
2 changes: 1 addition & 1 deletion water-service/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {

implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:latest.release'

implementation 'org.zalando:logbook-spring-boot-starter'
implementation 'org.zalando:logbook-spring-boot-starter:latest.release'

runtimeOnly 'com.github.loki4j:loki-logback-appender:latest.release'

Expand Down
1 change: 0 additions & 1 deletion water-service/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ org.xmlunit:xmlunit-core:2.9.1=testCompileClasspath,testRuntimeClasspath
org.yaml:snakeyaml:2.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:faux-pas:0.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-api:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-bom:3.9.0=annotationProcessor,compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-common:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-core:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-json:3.9.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
1 change: 0 additions & 1 deletion water-service/water-api/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@ org.projectlombok:lombok:1.18.34=annotationProcessor,compileClasspath
org.springframework.boot:spring-boot-dependencies:3.3.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.springframework.cloud:spring-cloud-dependencies:2023.0.3=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.springframework.data:spring-data-bom:2024.0.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.zalando:logbook-bom:3.9.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=testAnnotationProcessor

0 comments on commit 81ccc25

Please sign in to comment.