Skip to content

Commit 496b76a

Browse files
authored
Update dependencies (except otel) (#40)
* Update dependencies * Update licenses
1 parent 8b5d0a5 commit 496b76a

File tree

135 files changed

+2254
-1604
lines changed

Some content is hidden

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

135 files changed

+2254
-1604
lines changed

build.gradle.kts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ plugins {
2121
java
2222

2323
id("com.diffplug.spotless")
24-
id("com.github.ben-manes.versions")
2524
id("com.github.jk1.dependency-license-report")
2625
id("nebula.release")
2726
}
@@ -34,20 +33,6 @@ val releaseTask = tasks.named("release")
3433
val postReleaseTask = tasks.named("release")
3534

3635
allprojects {
37-
repositories {
38-
jcenter()
39-
mavenCentral()
40-
mavenLocal()
41-
42-
maven {
43-
setUrl("https://dl.bintray.com/open-telemetry/maven")
44-
}
45-
46-
maven {
47-
setUrl("https://oss.jfrog.org/libs-snapshot")
48-
}
49-
}
50-
5136
project.group = "software.amazon.opentelemetry"
5237

5338
plugins.apply("com.diffplug.spotless")
@@ -233,11 +218,6 @@ allprojects {
233218
}
234219

235220
tasks {
236-
named<Wrapper>("wrapper") {
237-
gradleVersion = "6.7.1"
238-
distributionSha256Sum = "3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d"
239-
}
240-
241221
val cleanLicenseReport by registering(Delete::class) {
242222
delete("licenses")
243223
}

dependencyManagement/build.gradle.kts

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,32 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16+
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
1617
import com.github.jk1.license.LicenseReportExtension
1718

1819
plugins {
1920
`java-platform`
21+
22+
id("com.github.ben-manes.versions")
2023
}
2124

2225
data class DependencySet(val group: String, val version: String, val modules: List<String>)
2326

2427
val DEPENDENCY_BOMS = listOf(
25-
"com.fasterxml.jackson:jackson-bom:2.12.0",
28+
"com.fasterxml.jackson:jackson-bom:2.12.1",
29+
"com.google.guava:guava-bom:30.1-jre",
2630
"com.google.protobuf:protobuf-bom:3.14.0",
27-
"com.linecorp.armeria:armeria-bom:1.3.0",
28-
"io.grpc:grpc-bom:1.34.0",
31+
"com.linecorp.armeria:armeria-bom:1.4.0",
32+
"io.grpc:grpc-bom:1.35.0",
2933
"io.opentelemetry:opentelemetry-bom:0.14.1",
3034
"org.apache.logging.log4j:log4j-bom:2.14.0",
3135
"org.junit:junit-bom:5.7.0",
32-
"org.springframework.boot:spring-boot-dependencies:2.4.0",
33-
"org.testcontainers:testcontainers-bom:1.15.0",
34-
"software.amazon.awssdk:bom:2.15.40"
36+
"org.springframework.boot:spring-boot-dependencies:2.4.2",
37+
"org.testcontainers:testcontainers-bom:1.15.1",
38+
"software.amazon.awssdk:bom:2.15.73"
3539
)
3640

3741
val DEPENDENCY_SETS = listOf(
38-
DependencySet(
39-
"com.google.guava",
40-
"29.0-jre",
41-
listOf("guava", "guava-testlib")
42-
),
4342
DependencySet(
4443
"io.opentelemetry",
4544
"0.14.1-alpha",
@@ -57,12 +56,12 @@ val DEPENDENCY_SETS = listOf(
5756
),
5857
DependencySet(
5958
"org.assertj",
60-
"3.17.0",
59+
"3.19.0",
6160
listOf("assertj-core")
6261
),
6362
DependencySet(
6463
"org.curioswitch.curiostack",
65-
"1.1.0",
64+
"1.2.0",
6665
listOf("protobuf-jackson")
6766
),
6867
DependencySet(
@@ -78,7 +77,7 @@ val DEPENDENCY_SETS = listOf(
7877
val DEPENDENCIES = listOf(
7978
"commons-logging:commons-logging:1.2",
8079
"com.sparkjava:spark-core:2.9.3",
81-
"com.squareup.okhttp3:okhttp:3.14.9"
80+
"com.squareup.okhttp3:okhttp:4.9.1"
8281
)
8382

8483
javaPlatform {
@@ -112,3 +111,22 @@ rootProject.allprojects {
112111
}
113112
}
114113
}
114+
115+
fun isNonStable(version: String): Boolean {
116+
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
117+
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
118+
val isGuava = version.endsWith("-jre")
119+
val isStable = stableKeyword || regex.matches(version) || isGuava
120+
return isStable.not()
121+
}
122+
123+
tasks {
124+
named<DependencyUpdatesTask>("dependencyUpdates") {
125+
revision = "release"
126+
checkConstraints = true
127+
128+
rejectVersionIf {
129+
isNonStable(candidate.version)
130+
}
131+
}
132+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
4+
distributionSha256Sum=fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists
File renamed without changes.
File renamed without changes.

licenses/apache-client-2.15.40.jar/META-INF/LICENSE.txt renamed to licenses/apache-client-2.15.73.jar/META-INF/LICENSE.txt

File renamed without changes.

licenses/apache-client-2.15.40.jar/META-INF/NOTICE.txt renamed to licenses/apache-client-2.15.73.jar/META-INF/NOTICE.txt

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)