From 8c24bcdcf5f67accfc1a64629337144c69440e96 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Tue, 11 Oct 2022 13:53:15 -0400 Subject: [PATCH 1/5] fix(java): initialize classes at build-time to resolve GraalVM22.2 issues --- .../com/google/cloud/storage/native-image.properties | 2 ++ .../com/google/cloud/storage/native-image.properties | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 google-cloud-storage/src/main/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties diff --git a/google-cloud-storage/src/main/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties b/google-cloud-storage/src/main/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties new file mode 100644 index 000000000..c0e84a5b5 --- /dev/null +++ b/google-cloud-storage/src/main/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties @@ -0,0 +1,2 @@ +Args = --initialize-at-build-time=com.google.api.client.json.jackson2.JacksonParser$,\ + com.fasterxml.jackson.core.JsonToken \ No newline at end of file diff --git a/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties b/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties index 9f5d52d81..c007750d6 100644 --- a/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties +++ b/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties @@ -26,7 +26,9 @@ Args = \ com.google.gson.internal,\ com.google.gson.internal.sql.SqlTypesSupport,\ com.google.gson.FieldNamingPolicy$3,\ - com.google.gson.LongSerializationPolicy$2 + com.google.gson.LongSerializationPolicy$2,\ + com.google.api.client.json.jackson2.JacksonParser$,\ + com.fasterxml.jackson.core.JsonToken From 476a2a837eef380895baf62d2b8eb7682089d45f Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Wed, 12 Oct 2022 10:47:15 -0400 Subject: [PATCH 2/5] remove repeated configuration --- .../com/google/cloud/storage/native-image.properties | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties b/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties index c007750d6..3530fa668 100644 --- a/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties +++ b/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties @@ -26,9 +26,4 @@ Args = \ com.google.gson.internal,\ com.google.gson.internal.sql.SqlTypesSupport,\ com.google.gson.FieldNamingPolicy$3,\ - com.google.gson.LongSerializationPolicy$2,\ - com.google.api.client.json.jackson2.JacksonParser$,\ - com.fasterxml.jackson.core.JsonToken - - - + com.google.gson.LongSerializationPolicy$2 \ No newline at end of file From fac7ff522bc2dd20104e8cc0b57e3cb952927e48 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Fri, 14 Oct 2022 20:14:13 -0400 Subject: [PATCH 3/5] clean up build initialization --- .../com/google/cloud/storage/native-image.properties | 2 -- .../com/google/cloud/storage/native-image.properties | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 google-cloud-storage/src/main/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties diff --git a/google-cloud-storage/src/main/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties b/google-cloud-storage/src/main/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties deleted file mode 100644 index c0e84a5b5..000000000 --- a/google-cloud-storage/src/main/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties +++ /dev/null @@ -1,2 +0,0 @@ -Args = --initialize-at-build-time=com.google.api.client.json.jackson2.JacksonParser$,\ - com.fasterxml.jackson.core.JsonToken \ No newline at end of file diff --git a/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties b/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties index 3530fa668..cd9a0f607 100644 --- a/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties +++ b/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties @@ -4,8 +4,7 @@ # and other classes ITRetryConformanceTest references to also be initialized at # build time. Initializing these classes explicitly at build time results in a # successful build. -Args = \ - --initialize-at-build-time=com.google.cloud.conformance.storage.v1,\ +Args = --initialize-at-build-time=com.google.cloud.conformance.storage.v1,\ com.google.protobuf,\ com.google.auth.oauth2,\ com.google.cloud.storage.conformance.retry,\ @@ -13,8 +12,8 @@ Args = \ com.google.gson.stream.JsonReader,\ com.google.api.client.util,\ com.google.api.client.http.javanet.NetHttpTransport,\ - com.google.api.client.http.HttpTransport,\ - com.google.api.client.json,\ + com.google.api.client.json.JsonParser$1,\ + com.google.api.client.json.gson.GsonParser$1,\ com.google.common.io.BaseEncoding,\ com.google.common.math.IntMath$1,\ com.google.common.collect.Platform,\ @@ -26,4 +25,5 @@ Args = \ com.google.gson.internal,\ com.google.gson.internal.sql.SqlTypesSupport,\ com.google.gson.FieldNamingPolicy$3,\ - com.google.gson.LongSerializationPolicy$2 \ No newline at end of file + com.google.gson.LongSerializationPolicy$2 \ + --trace-class-initialization=com.fasterxml.jackson.core.JsonToken \ No newline at end of file From ec1b09e129dabf9803dc8aa6187ab397cfeed388 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Fri, 14 Oct 2022 20:26:01 -0400 Subject: [PATCH 4/5] restore initialization of HttpTransport --- .../com/google/cloud/storage/native-image.properties | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties b/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties index cd9a0f607..00d101779 100644 --- a/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties +++ b/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties @@ -4,7 +4,8 @@ # and other classes ITRetryConformanceTest references to also be initialized at # build time. Initializing these classes explicitly at build time results in a # successful build. -Args = --initialize-at-build-time=com.google.cloud.conformance.storage.v1,\ +Args = \ + --initialize-at-build-time=com.google.cloud.conformance.storage.v1,\ com.google.protobuf,\ com.google.auth.oauth2,\ com.google.cloud.storage.conformance.retry,\ @@ -12,6 +13,7 @@ Args = --initialize-at-build-time=com.google.cloud.conformance.storage.v1,\ com.google.gson.stream.JsonReader,\ com.google.api.client.util,\ com.google.api.client.http.javanet.NetHttpTransport,\ + com.google.api.client.http.HttpTransport,\ com.google.api.client.json.JsonParser$1,\ com.google.api.client.json.gson.GsonParser$1,\ com.google.common.io.BaseEncoding,\ @@ -25,5 +27,4 @@ Args = --initialize-at-build-time=com.google.cloud.conformance.storage.v1,\ com.google.gson.internal,\ com.google.gson.internal.sql.SqlTypesSupport,\ com.google.gson.FieldNamingPolicy$3,\ - com.google.gson.LongSerializationPolicy$2 \ - --trace-class-initialization=com.fasterxml.jackson.core.JsonToken \ No newline at end of file + com.google.gson.LongSerializationPolicy$2 \ No newline at end of file From 43b928275c29ae823a842a7b4d64fcee9de13e7b Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Sat, 15 Oct 2022 00:50:36 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c95a1cd63..c11d100fa 100644 --- a/README.md +++ b/README.md @@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.0.0') +implementation platform('com.google.cloud:libraries-bom:26.1.3') implementation 'com.google.cloud:google-cloud-storage' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-storage:2.10.0' +implementation 'com.google.cloud:google-cloud-storage:2.13.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.10.0" +libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.13.0" ``` ## Authentication