Skip to content

Commit

Permalink
Update to libraries-bom 26.20.0 (#27725)
Browse files Browse the repository at this point in the history
  • Loading branch information
bvolpato authored Jul 31, 2023
1 parent af533fe commit 97e5542
Show file tree
Hide file tree
Showing 13 changed files with 58 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -530,16 +530,16 @@ class BeamModulePlugin implements Plugin<Project> {
def dbcp2_version = "2.9.0"
def errorprone_version = "2.10.0"
// Try to keep gax_version consistent with gax-grpc version in google_cloud_platform_libraries_bom
def gax_version = "2.29.0"
def gax_version = "2.31.1"
def google_clients_version = "2.0.0"
def google_cloud_bigdataoss_version = "2.2.6"
// Try to keep google_cloud_spanner_version consistent with google_cloud_spanner_bom in google_cloud_platform_libraries_bom
def google_cloud_spanner_version = "6.43.0"
def google_code_gson_version = "2.9.1"
def google_cloud_spanner_version = "6.44.0"
def google_code_gson_version = "2.10.1"
def google_oauth_clients_version = "1.34.1"
// Try to keep grpc_version consistent with gRPC version in google_cloud_platform_libraries_bom
def grpc_version = "1.55.1"
def guava_version = "32.0.1-jre"
def grpc_version = "1.56.1"
def guava_version = "32.1.1-jre"
def hadoop_version = "2.10.2"
def hamcrest_version = "2.1"
def influxdb_version = "2.19"
Expand Down Expand Up @@ -677,9 +677,9 @@ class BeamModulePlugin implements Plugin<Project> {
google_cloud_pubsub : "com.google.cloud:google-cloud-pubsub", // google_cloud_platform_libraries_bom sets version
google_cloud_pubsublite : "com.google.cloud:google-cloud-pubsublite", // google_cloud_platform_libraries_bom sets version
// The release notes shows the versions set by the BOM:
// https://github.com/googleapis/java-cloud-bom/releases/tag/v26.17.0
// https://github.com/googleapis/java-cloud-bom/releases/tag/v26.20.0
// Update libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.17.0",
google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.20.0",
google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version
google_cloud_spanner_test : "com.google.cloud:google-cloud-spanner:$google_cloud_spanner_version:tests",
google_code_gson : "com.google.code.gson:gson:$google_code_gson_version",
Expand Down Expand Up @@ -824,7 +824,7 @@ class BeamModulePlugin implements Plugin<Project> {
testcontainers_oracle : "org.testcontainers:oracle-xe:$testcontainers_version",
testcontainers_postgresql : "org.testcontainers:postgresql:$testcontainers_version",
testcontainers_rabbitmq : "org.testcontainers:rabbitmq:$testcontainers_version",
truth : "com.google.truth:truth:1.0.1",
truth : "com.google.truth:truth:1.1.5",
threetenbp : "org.threeten:threetenbp:1.6.8",
vendored_grpc_1_54_0 : "org.apache.beam:beam-vendor-grpc-1_54_0:0.1",
vendored_guava_26_0_jre : "org.apache.beam:beam-vendor-guava-26_0-jre:0.1",
Expand Down Expand Up @@ -1137,6 +1137,10 @@ class BeamModulePlugin implements Plugin<Project> {
// test libraries classes causing version conflicts. Users should rely
// on using the yyy-core package instead of the yyy-all package.
exclude group: "org.hamcrest", module: "hamcrest-all"

// https://github.com/google/guava/releases/tag/v32.1.0#user-content-overlap
// Guava starting on v32.1.0 report classes as duplicate
exclude group: "com.google.guava", module: "listenablefuture"
}

// Force usage of the libraries defined within our common set found in the root
Expand Down
5 changes: 4 additions & 1 deletion it/cassandra/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ dependencies {
implementation library.java.testcontainers_cassandra
implementation 'com.datastax.oss:java-driver-core:4.15.0'

testImplementation library.java.truth
// TODO: excluding Guava until Truth updates it to >32.1.x
testImplementation(library.java.truth) {
exclude group: 'com.google.guava', module: 'guava'
}
testImplementation library.java.mockito_core
testRuntimeOnly library.java.slf4j_simple
}
5 changes: 4 additions & 1 deletion it/common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ dependencies {
implementation library.java.google_http_client
implementation library.java.guava

testImplementation library.java.truth
// TODO: excluding Guava until Truth updates it to >32.1.x
testImplementation(library.java.truth) {
exclude group: 'com.google.guava', module: 'guava'
}
testImplementation library.java.junit
testImplementation library.java.mockito_inline
testRuntimeOnly library.java.slf4j_simple
Expand Down
6 changes: 4 additions & 2 deletions it/elasticsearch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ dependencies {
implementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:$elastic_search_version"
implementation "org.elasticsearch.client:elasticsearch-rest-client:$elastic_search_version"
implementation "org.elasticsearch:elasticsearch:$elastic_search_version"

testImplementation library.java.truth
// TODO: excluding Guava until Truth updates it to >32.1.x
testImplementation(library.java.truth) {
exclude group: 'com.google.guava', module: 'guava'
}
testImplementation library.java.mockito_inline
testImplementation library.java.commons_lang3
testRuntimeOnly library.java.slf4j_simple
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
* Subject that has assertion operations for artifact lists (GCS files), usually coming from the
* result of a template.
*/
@SuppressWarnings({
"nullness" // TODO(https://github.com/apache/beam/issues/20497)
})
public final class ArtifactsSubject extends Subject {

private final List<Artifact> actual;
Expand Down
5 changes: 4 additions & 1 deletion it/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ dependencies {
implementation library.java.testcontainers_mssqlserver

testImplementation project(":it:truthmatchers")
testImplementation library.java.truth
// TODO: excluding Guava until Truth updates it to >32.1.x
testImplementation(library.java.truth) {
exclude group: 'com.google.guava', module: 'guava'
}
testImplementation library.java.mockito_core
testImplementation library.java.mockito_inline
testRuntimeOnly library.java.slf4j_simple
Expand Down
5 changes: 4 additions & 1 deletion it/kafka/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ dependencies {
implementation library.java.testcontainers_kafka
implementation library.java.kafka_clients

testImplementation library.java.truth
// TODO: excluding Guava until Truth updates it to >32.1.x
testImplementation(library.java.truth) {
exclude group: 'com.google.guava', module: 'guava'
}
testImplementation library.java.mockito_core
testRuntimeOnly library.java.slf4j_simple
}
5 changes: 4 additions & 1 deletion it/mongodb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ dependencies {
implementation library.java.mongo_java_driver

testImplementation library.java.mockito_core
testImplementation library.java.truth
// TODO: excluding Guava until Truth updates it to >32.1.x
testImplementation(library.java.truth) {
exclude group: 'com.google.guava', module: 'guava'
}
testImplementation library.java.commons_lang3
testRuntimeOnly library.java.slf4j_simple
}
6 changes: 4 additions & 2 deletions it/testcontainers/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ ext.summary = "Integration test utilities for Testcontainers."
dependencies {
implementation project(path: ":it:common", configuration: "shadow")
implementation library.java.testcontainers_base

testImplementation library.java.truth
// TODO: excluding Guava until Truth updates it to >32.1.x
testImplementation(library.java.truth) {
exclude group: 'com.google.guava', module: 'guava'
}
testImplementation library.java.mockito_core
testRuntimeOnly library.java.slf4j_simple
}
5 changes: 4 additions & 1 deletion it/truthmatchers/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ ext.summary = "Truth matchers for integration tests."

dependencies {
implementation project(path: ":it:common", configuration: "shadow")
implementation library.java.truth
// TODO: excluding Guava until Truth updates it to >32.1.x
implementation(library.java.truth) {
exclude group: 'com.google.guava', module: 'guava'
}
implementation library.java.vendored_guava_26_0_jre
permitUnusedDeclared library.java.vendored_guava_26_0_jre
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
* Subject that has assertion operations for {@link LaunchInfo}, which has the information for a
* recently launched pipeline.
*/
@SuppressWarnings({
"nullness" // TODO(https://github.com/apache/beam/issues/20497)
})
public final class LaunchInfoSubject extends Subject {

private final LaunchInfo actual;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
* Subject that has assertion operations for {@link Result}, which is the end result of a pipeline
* run.
*/
@SuppressWarnings({
"nullness" // TODO(https://github.com/apache/beam/issues/20497)
})
public final class ResultSubject extends Subject {

private final Result actual;
Expand Down
6 changes: 5 additions & 1 deletion sdks/java/container/license_scripts/dep_urls_java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,15 @@ jcip-annotations:
'1.0':
license: "https://raw.githubusercontent.com/stephenc/jcip-annotations/master/LICENSE.txt"
type: "Apache License 2.0"
guava-parent:
'32.1.1-jre':
license: "https://raw.githubusercontent.com/google/guava/master/LICENSE"
type: "Apache License 2.0"
jaxen:
'1.1.6':
type: "3-Clause BSD"
libraries-bom:
'26.17.0':
'26.20.0':
license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE"
type: "Apache License 2.0"
paranamer:
Expand Down

0 comments on commit 97e5542

Please sign in to comment.