Skip to content

Commit 277ed8c

Browse files
authored
Update dependencies (#75)
* Update dependencies * Update licenses * Tweak * Generate license report * More updates * More licenses
1 parent e16a4b1 commit 277ed8c

File tree

160 files changed

+2237
-3529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+2237
-3529
lines changed

build.gradle.kts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,19 @@ allprojects {
8888
withSourcesJar()
8989
}
9090

91+
val dependencyManagement by configurations.creating {
92+
isCanBeConsumed = false
93+
isCanBeResolved = false
94+
isVisible = false
95+
}
96+
9197
dependencies {
92-
configurations.configureEach {
93-
if (name.endsWith("Classpath")) {
94-
add(name, enforcedPlatform(project(":dependencyManagement")))
98+
dependencyManagement(platform(project(":dependencyManagement")))
99+
afterEvaluate {
100+
configurations.configureEach {
101+
if (isCanBeResolved && !isCanBeConsumed) {
102+
extendsFrom(dependencyManagement)
103+
}
95104
}
96105
}
97106

dependencyManagement/build.gradle.kts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@ val otelVersion = "1.5.0"
3030
val otelSnapshotVersion = "1.6.0"
3131

3232
val DEPENDENCY_BOMS = listOf(
33-
"com.amazonaws:aws-java-sdk-bom:1.11.1020",
34-
"com.fasterxml.jackson:jackson-bom:2.12.3",
33+
"com.amazonaws:aws-java-sdk-bom:1.12.57",
34+
"com.fasterxml.jackson:jackson-bom:2.12.5",
3535
"com.google.guava:guava-bom:30.1.1-jre",
36-
"com.google.protobuf:protobuf-bom:3.17.0",
37-
"com.linecorp.armeria:armeria-bom:1.7.2",
38-
"io.grpc:grpc-bom:1.37.1",
36+
"com.google.protobuf:protobuf-bom:3.17.3",
37+
"com.linecorp.armeria:armeria-bom:1.11.0",
38+
"io.grpc:grpc-bom:1.40.1",
3939
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"}",
4040
"org.apache.logging.log4j:log4j-bom:2.14.1",
4141
"org.junit:junit-bom:5.7.2",
42-
"org.springframework.boot:spring-boot-dependencies:2.4.5",
43-
"org.testcontainers:testcontainers-bom:1.15.3",
44-
"software.amazon.awssdk:bom:2.16.64"
42+
"org.springframework.boot:spring-boot-dependencies:2.5.4",
43+
"org.testcontainers:testcontainers-bom:1.16.0",
44+
"software.amazon.awssdk:bom:2.17.29"
4545
)
4646

4747
val DEPENDENCY_SETS = listOf(
4848
DependencySet(
4949
"org.assertj",
50-
"3.19.0",
50+
"3.20.2",
5151
listOf("assertj-core")
5252
),
5353
DependencySet(
@@ -57,7 +57,7 @@ val DEPENDENCY_SETS = listOf(
5757
),
5858
DependencySet(
5959
"org.slf4j",
60-
"1.7.30",
60+
"1.7.32",
6161
listOf(
6262
"slf4j-api",
6363
"slf4j-simple"
@@ -70,8 +70,8 @@ val DEPENDENCIES = listOf(
7070
"com.sparkjava:spark-core:2.9.3",
7171
"com.squareup.okhttp3:okhttp:4.9.1",
7272
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.4.0",
73-
"io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"}",
74-
"net.bytebuddy:byte-buddy:1.11.0"
73+
"io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) "1.5.2" else "$otelSnapshotVersion-SNAPSHOT"}",
74+
"net.bytebuddy:byte-buddy:1.11.13"
7575
)
7676

7777
javaPlatform {

licenses/annotations-2.16.18.jar/META-INF/NOTICE.txt renamed to licenses/annotations-2.17.29.jar/META-INF/NOTICE.txt

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

licenses/apache-client-2.16.18.jar/META-INF/NOTICE.txt renamed to licenses/apache-client-2.17.29.jar/META-INF/NOTICE.txt

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

licenses/arns-2.16.18.jar/META-INF/NOTICE.txt renamed to licenses/arns-2.17.29.jar/META-INF/NOTICE.txt

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)