From 917cb4d3ac972bb1f8af92f24da93b9dbf89083d Mon Sep 17 00:00:00 2001 From: blakeli Date: Tue, 11 Feb 2025 20:41:21 +0800 Subject: [PATCH 1/2] Update protobuf-java to protobuf-javalite --- gapic-generator-java-bom/pom.xml | 5 +++++ gax-java/gax-httpjson/pom.xml | 2 +- gax-java/gax/pom.xml | 2 +- gax-java/pom.xml | 5 +++++ java-common-protos/grpc-google-common-protos/pom.xml | 2 +- java-common-protos/pom.xml | 11 ++++++++--- java-common-protos/proto-google-common-protos/pom.xml | 2 +- java-core/google-cloud-core/pom.xml | 2 +- java-iam/grpc-google-iam-v1/pom.xml | 2 +- java-iam/grpc-google-iam-v2/pom.xml | 2 +- java-iam/grpc-google-iam-v2beta/pom.xml | 2 +- java-iam/pom.xml | 11 ++++++++--- java-iam/proto-google-iam-v1/pom.xml | 2 +- java-iam/proto-google-iam-v2/pom.xml | 2 +- java-iam/proto-google-iam-v2beta/pom.xml | 2 +- java-shared-dependencies/upper-bound-check/pom.xml | 2 +- showcase/gapic-showcase/pom.xml | 2 +- showcase/grpc-gapic-showcase-v1beta1/pom.xml | 2 +- showcase/proto-gapic-showcase-v1beta1/pom.xml | 2 +- 19 files changed, 41 insertions(+), 21 deletions(-) diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index 086fab666e..0608230e73 100644 --- a/gapic-generator-java-bom/pom.xml +++ b/gapic-generator-java-bom/pom.xml @@ -63,6 +63,11 @@ pom import + + com.google.protobuf + protobuf-javalite + ${protobuf.version} + io.grpc grpc-bom diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index cea01dc75e..c27ef29291 100644 --- a/gax-java/gax-httpjson/pom.xml +++ b/gax-java/gax-httpjson/pom.xml @@ -50,7 +50,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite org.threeten diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index 0bbe3a8f7c..fc9b6c7d6b 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -36,7 +36,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite org.threeten diff --git a/gax-java/pom.xml b/gax-java/pom.xml index fda6ea43ff..c8b531dbf3 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -148,6 +148,11 @@ pom import + + com.google.protobuf + protobuf-javalite + ${protobuf.version} + io.opentelemetry opentelemetry-bom diff --git a/java-common-protos/grpc-google-common-protos/pom.xml b/java-common-protos/grpc-google-common-protos/pom.xml index d6866eb689..0681575024 100644 --- a/java-common-protos/grpc-google-common-protos/pom.xml +++ b/java-common-protos/grpc-google-common-protos/pom.xml @@ -27,7 +27,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite com.google.guava diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index 4dc39cb547..6e8288a5b3 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -55,12 +55,17 @@ pom import + + + + + + + com.google.protobuf - protobuf-bom + protobuf-javalite ${protobuf.version} - pom - import com.google.api.grpc diff --git a/java-common-protos/proto-google-common-protos/pom.xml b/java-common-protos/proto-google-common-protos/pom.xml index 8dda45c616..de193c39ac 100644 --- a/java-common-protos/proto-google-common-protos/pom.xml +++ b/java-common-protos/proto-google-common-protos/pom.xml @@ -14,7 +14,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite diff --git a/java-core/google-cloud-core/pom.xml b/java-core/google-cloud-core/pom.xml index 759281bb68..8fa70882f4 100644 --- a/java-core/google-cloud-core/pom.xml +++ b/java-core/google-cloud-core/pom.xml @@ -68,7 +68,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite com.google.errorprone diff --git a/java-iam/grpc-google-iam-v1/pom.xml b/java-iam/grpc-google-iam-v1/pom.xml index 242988f375..39be14ccff 100644 --- a/java-iam/grpc-google-iam-v1/pom.xml +++ b/java-iam/grpc-google-iam-v1/pom.xml @@ -27,7 +27,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite com.google.guava diff --git a/java-iam/grpc-google-iam-v2/pom.xml b/java-iam/grpc-google-iam-v2/pom.xml index 9e7c5ca27c..76c05b4c1f 100644 --- a/java-iam/grpc-google-iam-v2/pom.xml +++ b/java-iam/grpc-google-iam-v2/pom.xml @@ -27,7 +27,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite com.google.api.grpc diff --git a/java-iam/grpc-google-iam-v2beta/pom.xml b/java-iam/grpc-google-iam-v2beta/pom.xml index ffe7bc43cd..24d3f84da5 100644 --- a/java-iam/grpc-google-iam-v2beta/pom.xml +++ b/java-iam/grpc-google-iam-v2beta/pom.xml @@ -27,7 +27,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite com.google.api.grpc diff --git a/java-iam/pom.xml b/java-iam/pom.xml index 4974c54057..10b71bd627 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -61,12 +61,17 @@ pom import + + + + + + + com.google.protobuf - protobuf-bom + protobuf-javalite ${protobuf.version} - pom - import io.grpc diff --git a/java-iam/proto-google-iam-v1/pom.xml b/java-iam/proto-google-iam-v1/pom.xml index 9c6c593c09..572b1fba5e 100644 --- a/java-iam/proto-google-iam-v1/pom.xml +++ b/java-iam/proto-google-iam-v1/pom.xml @@ -14,7 +14,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite com.google.api.grpc diff --git a/java-iam/proto-google-iam-v2/pom.xml b/java-iam/proto-google-iam-v2/pom.xml index 0da16d6f72..91d042159b 100644 --- a/java-iam/proto-google-iam-v2/pom.xml +++ b/java-iam/proto-google-iam-v2/pom.xml @@ -15,7 +15,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite com.google.api.grpc diff --git a/java-iam/proto-google-iam-v2beta/pom.xml b/java-iam/proto-google-iam-v2beta/pom.xml index a3e5efbc6b..c5275c79c5 100644 --- a/java-iam/proto-google-iam-v2beta/pom.xml +++ b/java-iam/proto-google-iam-v2beta/pom.xml @@ -15,7 +15,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite com.google.api.grpc diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml index 2fc2bd51c8..584ac24a41 100644 --- a/java-shared-dependencies/upper-bound-check/pom.xml +++ b/java-shared-dependencies/upper-bound-check/pom.xml @@ -139,7 +139,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite com.google.protobuf diff --git a/showcase/gapic-showcase/pom.xml b/showcase/gapic-showcase/pom.xml index 2549eb199f..8bc38ad533 100644 --- a/showcase/gapic-showcase/pom.xml +++ b/showcase/gapic-showcase/pom.xml @@ -95,7 +95,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite com.google.api.grpc diff --git a/showcase/grpc-gapic-showcase-v1beta1/pom.xml b/showcase/grpc-gapic-showcase-v1beta1/pom.xml index 9fce31015f..2a2becfc1b 100644 --- a/showcase/grpc-gapic-showcase-v1beta1/pom.xml +++ b/showcase/grpc-gapic-showcase-v1beta1/pom.xml @@ -32,7 +32,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite com.google.api.grpc diff --git a/showcase/proto-gapic-showcase-v1beta1/pom.xml b/showcase/proto-gapic-showcase-v1beta1/pom.xml index cef41f54ff..35ade46a01 100644 --- a/showcase/proto-gapic-showcase-v1beta1/pom.xml +++ b/showcase/proto-gapic-showcase-v1beta1/pom.xml @@ -20,7 +20,7 @@ com.google.protobuf - protobuf-java + protobuf-javalite com.google.api.grpc From b8eb1874a483299a932b1d6054c21171a4953cbf Mon Sep 17 00:00:00 2001 From: blakeli Date: Tue, 11 Feb 2025 20:46:30 +0800 Subject: [PATCH 2/2] generate lite version of gen code --- hermetic_build/library_generation/generate_library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hermetic_build/library_generation/generate_library.sh b/hermetic_build/library_generation/generate_library.sh index 2625021ea6..f77f04c879 100755 --- a/hermetic_build/library_generation/generate_library.sh +++ b/hermetic_build/library_generation/generate_library.sh @@ -220,7 +220,7 @@ case "${proto_path}" in done ;; esac -"$protoc_path"/protoc "--java_out=${temp_destination_path}/java_proto.jar" ${proto_files} +"$protoc_path"/protoc "--java_out=lite:${temp_destination_path}/java_proto.jar" ${proto_files} if [[ "${proto_only}" == "false" ]]; then # move java_gapic_srcjar/proto/src/main/java (generated resource name helper class) # to proto-*/src/main