From fc27c960dea42d1250a179ba61fbf7ce4e77de51 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 21 Nov 2019 15:37:45 -0800 Subject: [PATCH] Prepare Pub/Sub for extraction --- .../grpc-google-cloud-pubsub-v1/pom.xml | 2 +- google-api-grpc/pom.xml | 4 +- .../proto-google-cloud-pubsub-v1/pom.xml | 2 +- google-cloud-bom/pom.xml | 6 +-- .../google-cloud-pubsub/README.md | 3 +- .../google-cloud-pubsub/pom.xml | 2 +- .../google-cloud-pubsub/synth.metadata | 32 ------------- .../google-cloud-pubsub/synth.py | 46 ------------------- versions.txt | 3 -- 9 files changed, 9 insertions(+), 91 deletions(-) delete mode 100644 google-cloud-clients/google-cloud-pubsub/synth.metadata delete mode 100644 google-cloud-clients/google-cloud-pubsub/synth.py diff --git a/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml b/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml index 06996ac407de..c5b779f4bce1 100644 --- a/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml +++ b/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 grpc-google-cloud-pubsub-v1 - 1.83.1-SNAPSHOT + 1.83.0 grpc-google-cloud-pubsub-v1 GRPC library for grpc-google-cloud-pubsub-v1 diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml index 6ac130f5c5fc..d509e9abb6cc 100644 --- a/google-api-grpc/pom.xml +++ b/google-api-grpc/pom.xml @@ -426,12 +426,12 @@ com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.83.1-SNAPSHOT + 1.83.0 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.83.1-SNAPSHOT + 1.83.0 com.google.api.grpc diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml b/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml index cd5f479a3e8e..3f81f968f760 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 proto-google-cloud-pubsub-v1 - 1.83.1-SNAPSHOT + 1.83.0 proto-google-cloud-pubsub-v1 PROTO library for proto-google-cloud-pubsub-v1 diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index 7fa1501c1d7e..bc7033f1c71e 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -560,17 +560,17 @@ com.google.cloud google-cloud-pubsub - 1.101.1-SNAPSHOT + 1.101.0 com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.83.1-SNAPSHOT + 1.83.0 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.83.1-SNAPSHOT + 1.83.0 com.google.cloud diff --git a/google-cloud-clients/google-cloud-pubsub/README.md b/google-cloud-clients/google-cloud-pubsub/README.md index 3f5ad7133804..6929de0d78a1 100644 --- a/google-cloud-clients/google-cloud-pubsub/README.md +++ b/google-cloud-clients/google-cloud-pubsub/README.md @@ -31,7 +31,7 @@ If you are using Maven with a BOM, add this to your pom.xml file. google-cloud-pubsub ``` -[//]: # ({x-version-update-start:google-cloud-pubsub:released}) + If you are using Maven without a BOM, add this to your dependencies. ```xml @@ -48,7 +48,6 @@ If you are using SBT, add this to your dependencies ```Scala libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.101.0" ``` -[//]: # ({x-version-update-end}) Authentication -------------- diff --git a/google-cloud-clients/google-cloud-pubsub/pom.xml b/google-cloud-clients/google-cloud-pubsub/pom.xml index 7e822cf7dcb5..61afd5d6e464 100644 --- a/google-cloud-clients/google-cloud-pubsub/pom.xml +++ b/google-cloud-clients/google-cloud-pubsub/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-pubsub - 1.101.1-SNAPSHOT + 1.101.0 jar Google Cloud Pub/Sub https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-pubsub diff --git a/google-cloud-clients/google-cloud-pubsub/synth.metadata b/google-cloud-clients/google-cloud-pubsub/synth.metadata deleted file mode 100644 index ee6c12c1a56b..000000000000 --- a/google-cloud-clients/google-cloud-pubsub/synth.metadata +++ /dev/null @@ -1,32 +0,0 @@ -{ - "updateTime": "2019-08-22T07:52:52.479802Z", - "sources": [ - { - "generator": { - "name": "artman", - "version": "0.34.0", - "dockerImage": "googleapis/artman@sha256:38a27ba6245f96c3e86df7acb2ebcc33b4f186d9e475efe2d64303aec3d4e0ea" - } - }, - { - "git": { - "name": "googleapis", - "remote": "https://github.com/googleapis/googleapis.git", - "sha": "92bebf78345af8b2d3585220527115bda8bdedf8", - "internalRef": "264715111" - } - } - ], - "destinations": [ - { - "client": { - "source": "googleapis", - "apiName": "pubsub", - "apiVersion": "v1", - "language": "java", - "generator": "gapic", - "config": "google/pubsub/artman_pubsub.yaml" - } - } - ] -} \ No newline at end of file diff --git a/google-cloud-clients/google-cloud-pubsub/synth.py b/google-cloud-clients/google-cloud-pubsub/synth.py deleted file mode 100644 index 3961bdff1fac..000000000000 --- a/google-cloud-clients/google-cloud-pubsub/synth.py +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2018 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""This script is used to synthesize generated parts of this library.""" - -import synthtool as s -import synthtool.gcp as gcp -import synthtool.languages.java as java - -gapic = gcp.GAPICGenerator() - -service = 'pubsub' -versions = ['v1'] -config_pattern = '/google/pubsub/artman_pubsub.yaml' - -for version in versions: - library = gapic.java_library( - service=service, - version=version, - config_path=config_pattern.format(version=version), - artman_output_name='') - - s.copy(library / f'gapic-google-cloud-{service}-{version}/src', 'src') - s.copy(library / f'grpc-google-cloud-{service}-{version}/src', f'../../google-api-grpc/grpc-google-cloud-{service}-{version}/src') - s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src') - - s.replace( - '**/stub/SubscriberStubSettings.java', - r'setMaxInboundMessageSize\(Integer.MAX_VALUE\)', - 'setMaxInboundMessageSize(20 << 20)' - ) - - java.format_code('./src') - java.format_code(f'../../google-api-grpc/grpc-google-cloud-{service}-{version}/src') - java.format_code(f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src') diff --git a/versions.txt b/versions.txt index 3991410e730c..6f9aee9d6c63 100644 --- a/versions.txt +++ b/versions.txt @@ -22,7 +22,6 @@ google-cloud-managedtest:0.119.0-alpha:0.119.1-alpha-SNAPSHOT google-cloud-nio:0.119.0-alpha:0.119.1-alpha-SNAPSHOT google-cloud-nio-examples:0.119.0-alpha:0.119.1-alpha-SNAPSHOT google-cloud-notification:0.119.0-beta:0.119.1-beta-SNAPSHOT -google-cloud-pubsub:1.101.0:1.101.1-SNAPSHOT google-cloud-spanner:1.46.0:1.46.1-SNAPSHOT google-cloud-spanner-jdbc:1.11.0:1.11.1-SNAPSHOT google-cloud-storage:1.101.0:1.101.1-SNAPSHOT @@ -34,7 +33,6 @@ grpc-google-cloud-bigquerystorage-v1beta1:0.84.0:0.84.1-SNAPSHOT grpc-google-cloud-firestore-admin-v1:1.31.0:1.31.1-SNAPSHOT grpc-google-cloud-firestore-v1:1.31.0:1.31.1-SNAPSHOT grpc-google-cloud-firestore-v1beta1:0.84.0:0.84.1-SNAPSHOT -grpc-google-cloud-pubsub-v1:1.83.0:1.83.1-SNAPSHOT grpc-google-cloud-spanner-admin-database-v1:1.46.0:1.46.1-SNAPSHOT grpc-google-cloud-spanner-admin-instance-v1:1.46.0:1.46.1-SNAPSHOT grpc-google-cloud-spanner-v1:1.46.0:1.46.1-SNAPSHOT @@ -44,7 +42,6 @@ proto-google-cloud-datastore-v1:0.84.0:0.84.1-SNAPSHOT proto-google-cloud-firestore-admin-v1:1.31.0:1.31.1-SNAPSHOT proto-google-cloud-firestore-v1:1.31.0:1.31.1-SNAPSHOT proto-google-cloud-firestore-v1beta1:0.84.0:0.84.1-SNAPSHOT -proto-google-cloud-pubsub-v1:1.83.0:1.83.1-SNAPSHOT proto-google-cloud-spanner-admin-database-v1:1.46.0:1.46.1-SNAPSHOT proto-google-cloud-spanner-admin-instance-v1:1.46.0:1.46.1-SNAPSHOT proto-google-cloud-spanner-v1:1.46.0:1.46.1-SNAPSHOT