From e0bdec581e205245f6e689ccb003b3f2b47eb2fb Mon Sep 17 00:00:00 2001 From: Andrea Selva Date: Wed, 2 Nov 2022 11:54:59 +0100 Subject: [PATCH] Update BigQuery client to version 2.16.1 (#68) Update BigQuery client to version 2.16.1 --- CHANGELOG.md | 3 + build.gradle | 97 +++++++++++++------- lib/logstash-output-google_bigquery_jars.rb | 99 ++++++++++++++------- version | 2 +- 4 files changed, 135 insertions(+), 66 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3fb18d..6f53ee2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 4.3.0 + - Updated Google Cloud Storage client library, from `1.137.2` to `2.16.1` [#68](https://github.com/logstash-plugins/logstash-output-google_bigquery/pull/68) + ## 4.2.0 - Updated Google Cloud Storage client library, needs Logstash `>= 8.3.0` to run [#67](https://github.com/logstash-plugins/logstash-output-google_bigquery/pull/67) diff --git a/build.gradle b/build.gradle index 26ace74..a055572 100644 --- a/build.gradle +++ b/build.gradle @@ -17,46 +17,79 @@ repositories { dependencies { // Core dependency for BigQuery clients - implementation "com.google.cloud:google-cloud-bigquery:1.137.2" + implementation "com.google.cloud:google-cloud-bigquery:2.16.1" - implementation "com.google.cloud:google-cloud-core:2.0.2" - implementation "com.google.protobuf:protobuf-java-util:3.17.3" - implementation "com.google.code.gson:gson:2.8.7" - implementation "com.google.api.grpc:proto-google-common-protos:2.3.2" - implementation "com.google.api.grpc:proto-google-iam-v1:1.0.14" - implementation "com.google.auth:google-auth-library-credentials:1.0.0" - implementation "com.google.http-client:google-http-client-gson:1.39.2" - implementation "com.google.protobuf:protobuf-java:3.17.3" - implementation "com.google.cloud:google-cloud-core-http:2.0.2" - implementation "com.google.api-client:google-api-client:1.32.1" - implementation "com.google.oauth-client:google-oauth-client:1.31.5" - implementation "com.google.http-client:google-http-client-apache-v2:1.39.2" - implementation "com.google.http-client:google-http-client-appengine:1.39.2" - implementation "com.google.api:gax-httpjson:0.85.0" - implementation "io.opencensus:opencensus-api:0.28.0" - implementation "io.grpc:grpc-context:1.39.0" - implementation "io.opencensus:opencensus-contrib-http-util:0.28.0" - implementation "com.google.http-client:google-http-client-jackson2:1.39.2" - implementation "com.fasterxml.jackson.core:jackson-core:2.13.3" - implementation "com.google.http-client:google-http-client:1.39.2" + implementation "com.google.cloud:google-cloud-core:2.8.12" + implementation "com.google.protobuf:protobuf-java-util:3.21.6" + implementation "com.google.api.grpc:proto-google-common-protos:2.9.2" + implementation "com.google.api.grpc:proto-google-iam-v1:1.5.2" + implementation "com.google.auth:google-auth-library-credentials:1.11.0" + implementation "com.google.http-client:google-http-client-gson:1.42.2" + implementation "com.google.cloud:google-cloud-core-http:2.8.12" + implementation "com.google.api-client:google-api-client:2.0.0" + implementation "com.google.oauth-client:google-oauth-client:1.34.1" + implementation "com.google.http-client:google-http-client-apache-v2:1.42.2" + implementation "com.google.http-client:google-http-client-appengine:1.42.2" + implementation "com.google.api:gax-httpjson:0.104.1" + implementation "io.opencensus:opencensus-api:0.31.1" + implementation "io.opencensus:opencensus-contrib-http-util:0.31.1" + implementation "com.google.http-client:google-http-client-jackson2:1.42.2" + implementation "javax.annotation:javax.annotation-api:1.3.2" + implementation "com.google.http-client:google-http-client:1.42.2" implementation "org.apache.httpcomponents:httpclient:4.5.13" implementation "commons-logging:commons-logging:1.2" - implementation "commons-codec:commons-codec:1.15" - implementation "org.apache.httpcomponents:httpcore:4.4.14" + implementation "org.apache.httpcomponents:httpcore:4.4.15" implementation "com.google.j2objc:j2objc-annotations:1.3" implementation "org.checkerframework:checker-compat-qual:2.5.5" - implementation "com.google.auth:google-auth-library-oauth2-http:1.0.0" + implementation "org.checkerframework:checker-qual:3.25.0" + implementation "com.google.auth:google-auth-library-oauth2-http:1.11.0" implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation "com.google.apis:google-api-services-bigquery:v2-rev20210726-1.32.1" - implementation "com.google.api:api-common:2.0.0" - implementation "javax.annotation:javax.annotation-api:1.3.2" - implementation "com.google.guava:guava:30.1.1-jre" + implementation "com.google.apis:google-api-services-bigquery:v2-rev20220827-2.0.0" + implementation "com.google.api:api-common:2.2.1" + implementation "com.google.guava:guava:31.1-jre" implementation "com.google.guava:failureaccess:1.0.1" implementation "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" - implementation "org.checkerframework:checker-qual:3.8.0" - implementation "com.google.api:gax:2.0.0" - implementation "org.threeten:threetenbp:1.5.1" - implementation "com.google.errorprone:error_prone_annotations:2.8.1" + implementation "com.google.api:gax:2.19.1" + implementation "org.threeten:threetenbp:1.6.1" + implementation "com.google.code.gson:gson:2.9.1" + implementation "org.threeten:threeten-extra:1.7.1" + implementation "com.google.protobuf:protobuf-java:3.21.6" + implementation "com.google.cloud:google-cloud-bigquerystorage:2.20.1" + implementation "io.grpc:grpc-api:1.49.0" + implementation "io.grpc:grpc-context:1.49.0" + implementation "io.grpc:grpc-stub:1.49.0" + implementation "io.grpc:grpc-protobuf:1.49.0" + implementation "io.grpc:grpc-protobuf-lite:1.49.0" + implementation "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.144.1" + implementation "com.google.api:gax-grpc:2.19.1" + implementation "io.grpc:grpc-alts:1.49.0" + implementation "io.grpc:grpc-grpclb:1.49.0" + implementation "io.grpc:grpc-auth:1.49.0" + implementation "io.grpc:grpc-netty-shaded:1.49.0" + implementation "io.grpc:grpc-googleapis:1.49.0" + implementation "org.json:json:20200518" + implementation "io.grpc:grpc-core:1.49.0" + implementation "com.google.android:annotations:4.1.1.4" + implementation "org.codehaus.mojo:animal-sniffer-annotations:1.22" + implementation "io.perfmark:perfmark-api:0.25.0" + implementation "com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.144.1" + implementation "com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.144.1" + implementation "com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.20.1" + implementation "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:2.20.1" + implementation "org.apache.arrow:arrow-vector:9.0.0" + implementation "org.apache.arrow:arrow-format:9.0.0" + implementation "com.fasterxml.jackson.core:jackson-core:2.13.4" + implementation "com.fasterxml.jackson.core:jackson-annotations:2.13.4" + implementation "com.fasterxml.jackson.core:jackson-databind:2.13.4" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4" + implementation "commons-codec:commons-codec:1.15" + implementation "io.netty:netty-common:4.1.78.Final" + implementation "com.google.flatbuffers:flatbuffers-java:1.12.0" + implementation "org.slf4j:slf4j-api:1.7.25" + implementation "org.apache.arrow:arrow-memory-core:9.0.0" + implementation "org.apache.arrow:arrow-memory-netty:9.0.0" + implementation "io.netty:netty-buffer:4.1.78.Final" + implementation "com.google.errorprone:error_prone_annotations:2.15.0" } task generateGemJarRequiresFile { diff --git a/lib/logstash-output-google_bigquery_jars.rb b/lib/logstash-output-google_bigquery_jars.rb index 21a887d..1a52d9a 100644 --- a/lib/logstash-output-google_bigquery_jars.rb +++ b/lib/logstash-output-google_bigquery_jars.rb @@ -1,43 +1,76 @@ # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT. require 'jar_dependencies' -require_jar('com.google.cloud', 'google-cloud-bigquery', '1.137.2') -require_jar('com.google.cloud', 'google-cloud-core', '2.0.2') -require_jar('com.google.protobuf', 'protobuf-java-util', '3.17.3') -require_jar('com.google.code.gson', 'gson', '2.8.7') -require_jar('com.google.api.grpc', 'proto-google-common-protos', '2.3.2') -require_jar('com.google.api.grpc', 'proto-google-iam-v1', '1.0.14') -require_jar('com.google.auth', 'google-auth-library-credentials', '1.0.0') -require_jar('com.google.http-client', 'google-http-client-gson', '1.39.2') -require_jar('com.google.protobuf', 'protobuf-java', '3.17.3') -require_jar('com.google.cloud', 'google-cloud-core-http', '2.0.2') -require_jar('com.google.api-client', 'google-api-client', '1.32.1') -require_jar('com.google.oauth-client', 'google-oauth-client', '1.31.5') -require_jar('com.google.http-client', 'google-http-client-apache-v2', '1.39.2') -require_jar('com.google.http-client', 'google-http-client-appengine', '1.39.2') -require_jar('com.google.api', 'gax-httpjson', '0.85.0') -require_jar('io.opencensus', 'opencensus-api', '0.28.0') -require_jar('io.grpc', 'grpc-context', '1.39.0') -require_jar('io.opencensus', 'opencensus-contrib-http-util', '0.28.0') -require_jar('com.google.http-client', 'google-http-client-jackson2', '1.39.2') -require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.13.3') -require_jar('com.google.http-client', 'google-http-client', '1.39.2') +require_jar('com.google.cloud', 'google-cloud-bigquery', '2.16.1') +require_jar('com.google.cloud', 'google-cloud-core', '2.8.12') +require_jar('com.google.protobuf', 'protobuf-java-util', '3.21.6') +require_jar('com.google.api.grpc', 'proto-google-common-protos', '2.9.2') +require_jar('com.google.api.grpc', 'proto-google-iam-v1', '1.5.2') +require_jar('com.google.auth', 'google-auth-library-credentials', '1.11.0') +require_jar('com.google.http-client', 'google-http-client-gson', '1.42.2') +require_jar('com.google.cloud', 'google-cloud-core-http', '2.8.12') +require_jar('com.google.api-client', 'google-api-client', '2.0.0') +require_jar('com.google.oauth-client', 'google-oauth-client', '1.34.1') +require_jar('com.google.http-client', 'google-http-client-apache-v2', '1.42.2') +require_jar('com.google.http-client', 'google-http-client-appengine', '1.42.2') +require_jar('com.google.api', 'gax-httpjson', '0.104.1') +require_jar('io.opencensus', 'opencensus-api', '0.31.1') +require_jar('io.opencensus', 'opencensus-contrib-http-util', '0.31.1') +require_jar('com.google.http-client', 'google-http-client-jackson2', '1.42.2') +require_jar('javax.annotation', 'javax.annotation-api', '1.3.2') +require_jar('com.google.http-client', 'google-http-client', '1.42.2') require_jar('org.apache.httpcomponents', 'httpclient', '4.5.13') require_jar('commons-logging', 'commons-logging', '1.2') -require_jar('commons-codec', 'commons-codec', '1.15') -require_jar('org.apache.httpcomponents', 'httpcore', '4.4.14') +require_jar('org.apache.httpcomponents', 'httpcore', '4.4.15') require_jar('com.google.j2objc', 'j2objc-annotations', '1.3') require_jar('org.checkerframework', 'checker-compat-qual', '2.5.5') -require_jar('com.google.auth', 'google-auth-library-oauth2-http', '1.0.0') +require_jar('org.checkerframework', 'checker-qual', '3.25.0') +require_jar('com.google.auth', 'google-auth-library-oauth2-http', '1.11.0') require_jar('com.google.code.findbugs', 'jsr305', '3.0.2') -require_jar('com.google.apis', 'google-api-services-bigquery', 'v2-rev20210726-1.32.1') -require_jar('com.google.api', 'api-common', '2.0.0') -require_jar('javax.annotation', 'javax.annotation-api', '1.3.2') -require_jar('com.google.guava', 'guava', '30.1.1-jre') +require_jar('com.google.apis', 'google-api-services-bigquery', 'v2-rev20220827-2.0.0') +require_jar('com.google.api', 'api-common', '2.2.1') +require_jar('com.google.guava', 'guava', '31.1-jre') require_jar('com.google.guava', 'failureaccess', '1.0.1') require_jar('com.google.guava', 'listenablefuture', '9999.0-empty-to-avoid-conflict-with-guava') -require_jar('org.checkerframework', 'checker-qual', '3.8.0') -require_jar('com.google.api', 'gax', '2.0.0') -require_jar('org.threeten', 'threetenbp', '1.5.1') -require_jar('com.google.errorprone', 'error_prone_annotations', '2.8.1') -require_jar('org.logstash.outputs', 'logstash-output-google_bigquery', '4.1.6') +require_jar('com.google.api', 'gax', '2.19.1') +require_jar('org.threeten', 'threetenbp', '1.6.1') +require_jar('com.google.code.gson', 'gson', '2.9.1') +require_jar('org.threeten', 'threeten-extra', '1.7.1') +require_jar('com.google.protobuf', 'protobuf-java', '3.21.6') +require_jar('com.google.cloud', 'google-cloud-bigquerystorage', '2.20.1') +require_jar('io.grpc', 'grpc-api', '1.49.0') +require_jar('io.grpc', 'grpc-context', '1.49.0') +require_jar('io.grpc', 'grpc-stub', '1.49.0') +require_jar('io.grpc', 'grpc-protobuf', '1.49.0') +require_jar('io.grpc', 'grpc-protobuf-lite', '1.49.0') +require_jar('com.google.api.grpc', 'proto-google-cloud-bigquerystorage-v1beta1', '0.144.1') +require_jar('com.google.api', 'gax-grpc', '2.19.1') +require_jar('io.grpc', 'grpc-alts', '1.49.0') +require_jar('io.grpc', 'grpc-grpclb', '1.49.0') +require_jar('io.grpc', 'grpc-auth', '1.49.0') +require_jar('io.grpc', 'grpc-netty-shaded', '1.49.0') +require_jar('io.grpc', 'grpc-googleapis', '1.49.0') +require_jar('org.json', 'json', '20200518') +require_jar('io.grpc', 'grpc-core', '1.49.0') +require_jar('com.google.android', 'annotations', '4.1.1.4') +require_jar('org.codehaus.mojo', 'animal-sniffer-annotations', '1.22') +require_jar('io.perfmark', 'perfmark-api', '0.25.0') +require_jar('com.google.api.grpc', 'grpc-google-cloud-bigquerystorage-v1beta1', '0.144.1') +require_jar('com.google.api.grpc', 'grpc-google-cloud-bigquerystorage-v1beta2', '0.144.1') +require_jar('com.google.api.grpc', 'grpc-google-cloud-bigquerystorage-v1', '2.20.1') +require_jar('com.google.api.grpc', 'proto-google-cloud-bigquerystorage-v1', '2.20.1') +require_jar('org.apache.arrow', 'arrow-vector', '9.0.0') +require_jar('org.apache.arrow', 'arrow-format', '9.0.0') +require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.13.4') +require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.13.4') +require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.13.4') +require_jar('com.fasterxml.jackson.datatype', 'jackson-datatype-jsr310', '2.13.4') +require_jar('commons-codec', 'commons-codec', '1.15') +require_jar('io.netty', 'netty-common', '4.1.78.Final') +require_jar('com.google.flatbuffers', 'flatbuffers-java', '1.12.0') +require_jar('org.slf4j', 'slf4j-api', '1.7.25') +require_jar('org.apache.arrow', 'arrow-memory-core', '9.0.0') +require_jar('org.apache.arrow', 'arrow-memory-netty', '9.0.0') +require_jar('io.netty', 'netty-buffer', '4.1.78.Final') +require_jar('com.google.errorprone', 'error_prone_annotations', '2.15.0') +require_jar('org.logstash.outputs', 'logstash-output-google_bigquery', '4.2.0') diff --git a/version b/version index ef8d756..8191138 100644 --- a/version +++ b/version @@ -1 +1 @@ -4.2.0 \ No newline at end of file +4.3.0 \ No newline at end of file