From dba07577f5824422a1448f44b4a4d09f328f8e2b Mon Sep 17 00:00:00 2001 From: Neenu1995 Date: Mon, 13 Jun 2022 11:55:34 -0400 Subject: [PATCH 1/7] chore: update depndencies --- .kokoro/downstream-client-library-check.sh | 8 ++++++- build.gradle | 2 +- dependencies.properties | 28 +++++++++++----------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/.kokoro/downstream-client-library-check.sh b/.kokoro/downstream-client-library-check.sh index 7916e1c08..ab5ee8286 100755 --- a/.kokoro/downstream-client-library-check.sh +++ b/.kokoro/downstream-client-library-check.sh @@ -94,4 +94,10 @@ git diff echo # This reads the JOB_TYPE environmental variable ("test" or "graalvm") -.kokoro/build.sh +mvn install -B -V -ntp \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true \ + -T 1C diff --git a/build.gradle b/build.gradle index f16c38837..c262d5d31 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { id 'com.github.johnrengelman.shadow' version '7.1.2' apply false id 'com.github.sherter.google-java-format' version '0.9' apply false - id 'org.sonarqube' version '3.3' + id 'org.sonarqube' version '3.4.0.2513' } // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) diff --git a/dependencies.properties b/dependencies.properties index 73867e176..bcdea5203 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -23,7 +23,7 @@ version.gax_httpjson=0.103.2-SNAPSHOT # Versions for dependencies which actual artifacts differ between Bazel and Gradle. # Gradle build depends on prebuilt maven artifacts, while Bazel build depends on Bazel workspaces # with the sources. -version.com_google_protobuf=3.19.4 +version.com_google_protobuf=3.21.1 version.google_java_format=1.1 version.io_grpc=1.46.0 @@ -32,10 +32,10 @@ version.io_grpc=1.46.0 # It should be constructed the following way: # 1) Take full artifact id (including the group and classifier (if any) portions) and remove version portion. # 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character -maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.8.3 -maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.8.3 -maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.6.0 -maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.6.0 +maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.9.0 +maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.9.0 +maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.7.0 +maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.7.0 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.28.0 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.28.0 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.28.0 @@ -62,21 +62,21 @@ maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_ maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:1.3 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.9 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.9 -maven.com_google_api_api_common=com.google.api:api-common:2.2.0 -maven.org_threeten_threetenbp=org.threeten:threetenbp:1.5.0 -maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.3.4 -maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.3.4 -maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.41.5 -maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.41.5 +maven.com_google_api_api_common=com.google.api:api-common:2.2.1 +maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.0 +maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.4.0 +maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.4.0 +maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.42.0 +maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.42.0 maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.18 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2 -maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.1.0 +maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.1.0.1 # Testing maven artifacts maven.junit_junit=junit:junit:4.13.2 -maven.org_mockito_mockito_core=org.mockito:mockito-core:2.28.2 +maven.org_mockito_mockito_core=org.mockito:mockito-core:4.6.1 maven.org_hamcrest_hamcrest_core=org.hamcrest:hamcrest-core:1.3 maven.com_google_truth_truth=com.google.truth:truth:1.1.2 maven.com_googlecode_java_diff_utils_diffutils=com.googlecode.java-diff-utils:diffutils:1.3.0 maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.9.7 -maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6 +maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6 \ No newline at end of file From b6d35c2def5a7ba418ae9a0f6b5ab47977c1dd6c Mon Sep 17 00:00:00 2001 From: Neenu1995 Date: Mon, 13 Jun 2022 12:59:37 -0400 Subject: [PATCH 2/7] chore: revert protobuf --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index bcdea5203..83aab344e 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -23,7 +23,7 @@ version.gax_httpjson=0.103.2-SNAPSHOT # Versions for dependencies which actual artifacts differ between Bazel and Gradle. # Gradle build depends on prebuilt maven artifacts, while Bazel build depends on Bazel workspaces # with the sources. -version.com_google_protobuf=3.21.1 +version.com_google_protobuf=3.19.4 version.google_java_format=1.1 version.io_grpc=1.46.0 From 2006e0750b516928b889a2b9fdb8ab027982d1ca Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Mon, 13 Jun 2022 14:18:37 -0400 Subject: [PATCH 3/7] Update dependencies.properties --- dependencies.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index 83aab344e..cf61c22f3 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -74,9 +74,9 @@ maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.1.0.1 # Testing maven artifacts maven.junit_junit=junit:junit:4.13.2 -maven.org_mockito_mockito_core=org.mockito:mockito-core:4.6.1 +maven.org_mockito_mockito_core=org.mockito:mockito-core:2.28.2 maven.org_hamcrest_hamcrest_core=org.hamcrest:hamcrest-core:1.3 maven.com_google_truth_truth=com.google.truth:truth:1.1.2 maven.com_googlecode_java_diff_utils_diffutils=com.googlecode.java-diff-utils:diffutils:1.3.0 maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.9.7 -maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6 \ No newline at end of file +maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6 From c942322c7494544f7cb5f9d56c696cc7f7d27e6c Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Mon, 13 Jun 2022 14:28:40 -0400 Subject: [PATCH 4/7] Update dependencies.properties --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index cf61c22f3..489e0ced1 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -23,7 +23,7 @@ version.gax_httpjson=0.103.2-SNAPSHOT # Versions for dependencies which actual artifacts differ between Bazel and Gradle. # Gradle build depends on prebuilt maven artifacts, while Bazel build depends on Bazel workspaces # with the sources. -version.com_google_protobuf=3.19.4 +version.com_google_protobuf=3.20.1 version.google_java_format=1.1 version.io_grpc=1.46.0 From dfa746c0eb034ce458aeec4135a067ce613c6a9f Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Mon, 13 Jun 2022 14:32:27 -0400 Subject: [PATCH 5/7] Update dependencies.properties --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 489e0ced1..6500d9ecf 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -23,7 +23,7 @@ version.gax_httpjson=0.103.2-SNAPSHOT # Versions for dependencies which actual artifacts differ between Bazel and Gradle. # Gradle build depends on prebuilt maven artifacts, while Bazel build depends on Bazel workspaces # with the sources. -version.com_google_protobuf=3.20.1 +version.com_google_protobuf=3.21.1 version.google_java_format=1.1 version.io_grpc=1.46.0 From 9bbd0c8b2a39fbfee29165c8facf99a340b5cc86 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 14 Jun 2022 12:25:39 -0400 Subject: [PATCH 6/7] Update dependencies.properties --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 6500d9ecf..e8f3a3733 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -25,7 +25,7 @@ version.gax_httpjson=0.103.2-SNAPSHOT # with the sources. version.com_google_protobuf=3.21.1 version.google_java_format=1.1 -version.io_grpc=1.46.0 +version.io_grpc=1.47.0 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). From fd639da983027957d544f08dcd38a9db8fee4d67 Mon Sep 17 00:00:00 2001 From: Neenu1995 Date: Wed, 15 Jun 2022 18:00:09 -0400 Subject: [PATCH 7/7] chore: add io.netty:netty-transport-native-unix-common dependency --- dependencies.properties | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index e8f3a3733..cf064c948 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -39,17 +39,18 @@ maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-aut maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.28.0 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.28.0 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.28.0 -maven.io_netty_netty_tcnative_boringssl_static=io.netty:netty-tcnative-boringssl-static:2.0.36.Final -maven.io_netty_netty_handler=io.netty:netty-handler:4.1.52.Final -maven.io_netty_netty_common=io.netty:netty-common:4.1.52.Final -maven.io_netty_netty_codec_socks=io.netty:netty-codec-socks:4.1.52.Final -maven.io_netty_netty_codec_http2=io.netty:netty-codec-http2:4.1.52.Final -maven.io_netty_netty_codec_http=io.netty:netty-codec-http:4.1.52.Final -maven.io_netty_netty_codec=io.netty:netty-codec:4.1.52.Final -maven.io_netty_netty_buffer=io.netty:netty-buffer:4.1.52.Final -maven.io_netty_netty_resolver=io.netty:netty-resolver:4.1.52.Final -maven.io_netty_netty_transport=io.netty:netty-transport:4.1.52.Final -maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.52.Final +maven.io_netty_netty_tcnative_boringssl_static=io.netty:netty-tcnative-boringssl-static:2.0.46.Final +maven.io_netty_netty_handler=io.netty:netty-handler:4.1.72.Final +maven.io_netty_netty_common=io.netty:netty-common:4.1.72.Final +maven.io_netty_netty_codec_socks=io.netty:netty-codec-socks:4.1.72.Final +maven.io_netty_netty_codec_http2=io.netty:netty-codec-http2:4.1.72.Final +maven.io_netty_netty_codec_http=io.netty:netty-codec-http:4.1.72.Final +maven.io_netty_netty_codec=io.netty:netty-codec:4.1.72.Final +maven.io_netty_netty_buffer=io.netty:netty-buffer:4.1.72.Final +maven.io_netty_netty_resolver=io.netty:netty-resolver:4.1.72.Final +maven.io_netty_netty_transport=io.netty:netty-transport:4.1.72.Final +maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.72.Final +maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-native-unix-common:4.1.72.Final maven.io_perfmark_perfmark_api=io.perfmark:perfmark-api:0.23.0 maven.org_apache_tomcat_annotations_api=org.apache.tomcat:annotations-api:6.0.53 maven.com_google_code_gson_gson=com.google.code.gson:gson:2.8.6