diff --git a/google-api-grpc/grpc-google-cloud-asset-v1/pom.xml b/google-api-grpc/grpc-google-cloud-asset-v1/pom.xml index d22348cc901d..c8b786c92616 100644 --- a/google-api-grpc/grpc-google-cloud-asset-v1/pom.xml +++ b/google-api-grpc/grpc-google-cloud-asset-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-asset-v1 - 0.79.1-SNAPSHOT + 0.79.1-SNAPSHOT grpc-google-cloud-asset-v1 GRPC library for grpc-google-cloud-asset-v1 @@ -28,7 +28,30 @@ compile - + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + true + + + + + + org.apache.maven.plugins diff --git a/google-api-grpc/grpc-google-cloud-asset-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-asset-v1beta1/pom.xml index cb38d5e5e3ac..0c73fc073a95 100644 --- a/google-api-grpc/grpc-google-cloud-asset-v1beta1/pom.xml +++ b/google-api-grpc/grpc-google-cloud-asset-v1beta1/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-asset-v1beta1 - 0.79.1-SNAPSHOT + 0.79.1-SNAPSHOT grpc-google-cloud-asset-v1beta1 GRPC library for grpc-google-cloud-asset-v1beta1 @@ -28,6 +28,29 @@ compile + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + true + + + + + diff --git a/google-api-grpc/grpc-google-cloud-asset-v1p2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-asset-v1p2beta1/pom.xml index d19da4b3a1dc..631ec7f17e7d 100644 --- a/google-api-grpc/grpc-google-cloud-asset-v1p2beta1/pom.xml +++ b/google-api-grpc/grpc-google-cloud-asset-v1p2beta1/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-asset-v1p2beta1 - 0.79.1-SNAPSHOT + 0.79.1-SNAPSHOT grpc-google-cloud-asset-v1p2beta1 GRPC library for grpc-google-cloud-asset-v1p2beta1 @@ -28,6 +28,29 @@ compile + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + true + + + + + diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml index 31ba5deca7fc..49a9b675cc92 100644 --- a/google-api-grpc/pom.xml +++ b/google-api-grpc/pom.xml @@ -141,32 +141,32 @@ com.google.api.grpc proto-google-cloud-asset-v1 - 0.79.1-SNAPSHOT + 0.79.0 com.google.api.grpc grpc-google-cloud-asset-v1 - 0.79.1-SNAPSHOT + 0.79.0 com.google.api.grpc proto-google-cloud-asset-v1beta1 - 0.79.1-SNAPSHOT + 0.79.0 com.google.api.grpc grpc-google-cloud-asset-v1beta1 - 0.79.1-SNAPSHOT + 0.79.0 com.google.api.grpc proto-google-cloud-asset-v1p2beta1 - 0.79.1-SNAPSHOT + 0.79.0 com.google.api.grpc grpc-google-cloud-asset-v1p2beta1 - 0.79.1-SNAPSHOT + 0.79.0 com.google.api.grpc diff --git a/google-api-grpc/proto-google-cloud-asset-v1/pom.xml b/google-api-grpc/proto-google-cloud-asset-v1/pom.xml index bb244e5b8bf9..0dcc9273241c 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1/pom.xml +++ b/google-api-grpc/proto-google-cloud-asset-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-asset-v1 - 0.79.1-SNAPSHOT + 0.79.1-SNAPSHOT proto-google-cloud-asset-v1 PROTO library for proto-google-cloud-asset-v1 @@ -33,4 +33,26 @@ compile + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + true + + + + diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-asset-v1beta1/pom.xml index e8ebcd94ab64..9249fba8f359 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/pom.xml +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/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-asset-v1beta1 - 0.79.1-SNAPSHOT + 0.79.1-SNAPSHOT proto-google-cloud-asset-v1beta1 PROTO library for proto-google-cloud-asset-v1beta1 @@ -33,4 +33,27 @@ compile + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + true + + + + + diff --git a/google-api-grpc/proto-google-cloud-asset-v1p2beta1/pom.xml b/google-api-grpc/proto-google-cloud-asset-v1p2beta1/pom.xml index 35918cce4c22..ffc98fd3b952 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1p2beta1/pom.xml +++ b/google-api-grpc/proto-google-cloud-asset-v1p2beta1/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-asset-v1p2beta1 - 0.79.1-SNAPSHOT + 0.79.1-SNAPSHOT proto-google-cloud-asset-v1beta1 PROTO library for proto-google-cloud-asset-v1p2beta1 @@ -33,4 +33,26 @@ compile + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + true + + + + diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index c2e7a3d29aa5..2abc9663adf5 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -197,37 +197,37 @@ com.google.cloud google-cloud-asset - 0.114.1-beta-SNAPSHOT + 0.114.0-beta com.google.api.grpc proto-google-cloud-asset-v1 - 0.79.1-SNAPSHOT + 0.79.0 com.google.api.grpc grpc-google-cloud-asset-v1 - 0.79.1-SNAPSHOT + 0.79.0 com.google.api.grpc proto-google-cloud-asset-v1beta1 - 0.79.1-SNAPSHOT + 0.79.0 com.google.api.grpc grpc-google-cloud-asset-v1beta1 - 0.79.1-SNAPSHOT + 0.79.0 com.google.api.grpc proto-google-cloud-asset-v1p2beta1 - 0.79.1-SNAPSHOT + 0.79.0 com.google.api.grpc grpc-google-cloud-asset-v1p2beta1 - 0.79.1-SNAPSHOT + 0.79.0 com.google.cloud diff --git a/google-cloud-clients/google-cloud-asset/README.md b/google-cloud-clients/google-cloud-asset/README.md index b0cdcbbc8213..1c1c7a376e2e 100644 --- a/google-cloud-clients/google-cloud-asset/README.md +++ b/google-cloud-clients/google-cloud-asset/README.md @@ -16,7 +16,6 @@ Java idiomatic client for [Cloud Asset][cloud-asset]. Quickstart ---------- -[//]: # ({x-version-update-start:google-cloud-asset:released}) If you are using Maven, add this to your pom.xml file ```xml @@ -33,7 +32,6 @@ If you are using SBT, add this to your dependencies ```Scala libraryDependencies += "com.google.cloud" % "google-cloud-asset" % "0.114.0-beta" ``` -[//]: # ({x-version-update-end}) Authentication -------------- diff --git a/google-cloud-clients/google-cloud-asset/pom.xml b/google-cloud-clients/google-cloud-asset/pom.xml index 246ca555f7de..c502902167ec 100644 --- a/google-cloud-clients/google-cloud-asset/pom.xml +++ b/google-cloud-clients/google-cloud-asset/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-asset - 0.114.1-beta-SNAPSHOT + 0.114.1-beta-SNAPSHOT jar Google Cloud Asset https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-asset diff --git a/google-cloud-clients/google-cloud-asset/synth.metadata b/google-cloud-clients/google-cloud-asset/synth.metadata deleted file mode 100644 index aa7e32848446..000000000000 --- a/google-cloud-clients/google-cloud-asset/synth.metadata +++ /dev/null @@ -1,52 +0,0 @@ -{ - "updateTime": "2019-08-06T21:10:56.177392Z", - "sources": [ - { - "generator": { - "name": "artman", - "version": "0.32.1", - "dockerImage": "googleapis/artman@sha256:a684d40ba9a4e15946f5f2ca6b4bd9fe301192f522e9de4fff622118775f309b" - } - }, - { - "git": { - "name": "googleapis", - "remote": "https://github.com/googleapis/googleapis.git", - "sha": "ac06010e785940cd9dc6800faa2985a76ba04d3a", - "internalRef": "261988354" - } - } - ], - "destinations": [ - { - "client": { - "source": "googleapis", - "apiName": "asset", - "apiVersion": "v1", - "language": "java", - "generator": "gapic", - "config": "google/cloud/asset/artman_cloudasset_v1.yaml" - } - }, - { - "client": { - "source": "googleapis", - "apiName": "asset", - "apiVersion": "v1beta1", - "language": "java", - "generator": "gapic", - "config": "google/cloud/asset/artman_cloudasset_v1beta1.yaml" - } - }, - { - "client": { - "source": "googleapis", - "apiName": "asset", - "apiVersion": "v1p2beta1", - "language": "java", - "generator": "gapic", - "config": "google/cloud/asset/artman_cloudasset_v1p2beta1.yaml" - } - } - ] -} \ No newline at end of file diff --git a/google-cloud-clients/google-cloud-asset/synth.py b/google-cloud-clients/google-cloud-asset/synth.py deleted file mode 100644 index 4f015a2eb14f..000000000000 --- a/google-cloud-clients/google-cloud-asset/synth.py +++ /dev/null @@ -1,40 +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 = 'asset' -versions = ['v1', 'v1beta1', 'v1p2beta1'] -config_pattern = '/google/cloud/asset/artman_cloudasset_{version}.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') - - 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 9b1d8f9d4cd3..ec1d99b42fe6 100644 --- a/versions.txt +++ b/versions.txt @@ -7,7 +7,6 @@ google-cloud-appengineflexcompat:0.114.0-alpha:0.114.1-alpha-SNAPSHOT google-cloud-appengineflexcustom:0.114.0-alpha:0.114.1-alpha-SNAPSHOT google-cloud-appengineflexjava:0.114.0-alpha:0.114.1-alpha-SNAPSHOT google-cloud-appenginejava8:0.114.0-alpha:0.114.1-alpha-SNAPSHOT -google-cloud-asset:0.114.0-beta:0.114.1-beta-SNAPSHOT google-cloud-bigquery:1.96.0:1.96.1-SNAPSHOT google-cloud-bigquerydatatransfer:0.114.0-beta:0.114.1-beta-SNAPSHOT google-cloud-bigquerystorage:0.114.0-beta:0.114.1-beta-SNAPSHOT @@ -64,9 +63,6 @@ google-cloud-vision:1.96.0:1.96.1-SNAPSHOT google-cloud-webrisk:0.29.0-alpha:0.29.1-alpha-SNAPSHOT google-cloud-websecurityscanner:0.114.0:0.114.1-SNAPSHOT grafeas:0.17.0:0.17.1-SNAPSHOT -grpc-google-cloud-asset-v1:0.79.0:0.79.1-SNAPSHOT -grpc-google-cloud-asset-v1beta1:0.79.0:0.79.1-SNAPSHOT -grpc-google-cloud-asset-v1p2beta1:0.79.0:0.79.1-SNAPSHOT grpc-google-cloud-bigquerydatatransfer-v1:0.79.0:0.79.1-SNAPSHOT grpc-google-cloud-bigquerystorage-v1beta1:0.79.0:0.79.1-SNAPSHOT grpc-google-cloud-bigtable-admin-v2:0.79.0:0.79.1-SNAPSHOT @@ -126,9 +122,6 @@ grpc-google-cloud-vision-v1p4beta1:0.79.0:0.79.1-SNAPSHOT grpc-google-cloud-webrisk-v1beta1:0.29.0-alpha:0.29.1-alpha-SNAPSHOT grpc-google-cloud-websecurityscanner-v1alpha:0.79.0:0.79.1-SNAPSHOT grpc-google-cloud-websecurityscanner-v1beta:0.79.0:0.79.1-SNAPSHOT -proto-google-cloud-asset-v1:0.79.0:0.79.1-SNAPSHOT -proto-google-cloud-asset-v1beta1:0.79.0:0.79.1-SNAPSHOT -proto-google-cloud-asset-v1p2beta1:0.79.0:0.79.1-SNAPSHOT proto-google-cloud-bigquerydatatransfer-v1:0.79.0:0.79.1-SNAPSHOT proto-google-cloud-bigquerystorage-v1beta1:0.79.0:0.79.1-SNAPSHOT proto-google-cloud-bigtable-admin-v2:0.79.0:0.79.1-SNAPSHOT