From 97cda5a9b992de7a8597d33c92f67c5fb910787c Mon Sep 17 00:00:00 2001 From: Cody Oss Date: Thu, 24 Oct 2019 10:03:02 -0600 Subject: [PATCH 1/2] chore: stop release of tasks --- .../grpc-google-cloud-tasks-v2/pom.xml | 23 +++++++- .../grpc-google-cloud-tasks-v2beta2/pom.xml | 23 +++++++- .../grpc-google-cloud-tasks-v2beta3/pom.xml | 23 +++++++- google-api-grpc/pom.xml | 12 ++--- .../proto-google-cloud-tasks-v2/pom.xml | 23 +++++++- .../proto-google-cloud-tasks-v2beta2/pom.xml | 23 +++++++- .../proto-google-cloud-tasks-v2beta3/pom.xml | 23 +++++++- google-cloud-bom/pom.xml | 14 ++--- .../google-cloud-tasks/README.md | 2 - .../google-cloud-tasks/pom.xml | 25 ++++++++- .../google-cloud-tasks/synth.metadata | 52 ------------------- .../google-cloud-tasks/synth.py | 40 -------------- versions.txt | 3 -- 13 files changed, 168 insertions(+), 118 deletions(-) delete mode 100644 google-cloud-clients/google-cloud-tasks/synth.metadata delete mode 100644 google-cloud-clients/google-cloud-tasks/synth.py diff --git a/google-api-grpc/grpc-google-cloud-tasks-v2/pom.xml b/google-api-grpc/grpc-google-cloud-tasks-v2/pom.xml index 2da6825d6477..b6ef030d338b 100644 --- a/google-api-grpc/grpc-google-cloud-tasks-v2/pom.xml +++ b/google-api-grpc/grpc-google-cloud-tasks-v2/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-tasks-v2 - 1.25.1-SNAPSHOT + 1.25.0 grpc-google-cloud-tasks-v2 GRPC library for grpc-google-cloud-tasks-v2 @@ -28,6 +28,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/grpc-google-cloud-tasks-v2beta2/pom.xml b/google-api-grpc/grpc-google-cloud-tasks-v2beta2/pom.xml index 45c21580dfc6..00d3324c7789 100644 --- a/google-api-grpc/grpc-google-cloud-tasks-v2beta2/pom.xml +++ b/google-api-grpc/grpc-google-cloud-tasks-v2beta2/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-tasks-v2beta2 - 0.81.1-SNAPSHOT + 0.81.0 grpc-google-cloud-tasks-v2beta2 GRPC library for grpc-google-cloud-tasks-v2beta2 @@ -28,6 +28,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/grpc-google-cloud-tasks-v2beta3/pom.xml b/google-api-grpc/grpc-google-cloud-tasks-v2beta3/pom.xml index fc5d6cb7c0b2..6813f834f751 100644 --- a/google-api-grpc/grpc-google-cloud-tasks-v2beta3/pom.xml +++ b/google-api-grpc/grpc-google-cloud-tasks-v2beta3/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-tasks-v2beta3 - 0.81.1-SNAPSHOT + 0.81.0 grpc-google-cloud-tasks-v2beta3 GRPC library for grpc-google-cloud-tasks-v2beta3 @@ -28,6 +28,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/pom.xml b/google-api-grpc/pom.xml index 10c9ce908a98..b8918e74be41 100644 --- a/google-api-grpc/pom.xml +++ b/google-api-grpc/pom.xml @@ -536,32 +536,32 @@ com.google.api.grpc proto-google-cloud-tasks-v2 - 1.25.1-SNAPSHOT + 1.25.0 com.google.api.grpc grpc-google-cloud-tasks-v2 - 1.25.1-SNAPSHOT + 1.25.0 com.google.api.grpc proto-google-cloud-tasks-v2beta2 - 0.81.1-SNAPSHOT + 0.81.0 com.google.api.grpc grpc-google-cloud-tasks-v2beta2 - 0.81.1-SNAPSHOT + 0.81.0 com.google.api.grpc proto-google-cloud-tasks-v2beta3 - 0.81.1-SNAPSHOT + 0.81.0 com.google.api.grpc grpc-google-cloud-tasks-v2beta3 - 0.81.1-SNAPSHOT + 0.81.0 com.google.api.grpc diff --git a/google-api-grpc/proto-google-cloud-tasks-v2/pom.xml b/google-api-grpc/proto-google-cloud-tasks-v2/pom.xml index b32ce38af34d..9276d4a9f02a 100644 --- a/google-api-grpc/proto-google-cloud-tasks-v2/pom.xml +++ b/google-api-grpc/proto-google-cloud-tasks-v2/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-tasks-v2 - 1.25.1-SNAPSHOT + 1.25.0 proto-google-cloud-tasks-v2 PROTO library for proto-google-cloud-tasks-v2 @@ -33,4 +33,25 @@ 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-tasks-v2beta2/pom.xml b/google-api-grpc/proto-google-cloud-tasks-v2beta2/pom.xml index 229a8a971c05..1a48e5c5f9b7 100644 --- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/pom.xml +++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/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-tasks-v2beta2 - 0.81.1-SNAPSHOT + 0.81.0 proto-google-cloud-tasks-v2beta2 PROTO library for proto-google-cloud-tasks-v2beta2 @@ -33,4 +33,25 @@ 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-tasks-v2beta3/pom.xml b/google-api-grpc/proto-google-cloud-tasks-v2beta3/pom.xml index aa598add27cd..cde686160d94 100644 --- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/pom.xml +++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/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-tasks-v2beta3 - 0.81.1-SNAPSHOT + 0.81.0 proto-google-cloud-tasks-v2beta3 PROTO library for proto-google-cloud-tasks-v2beta3 @@ -33,4 +33,25 @@ 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 e5d3a385e2f6..63242e1532f7 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -798,37 +798,37 @@ com.google.cloud google-cloud-tasks - 1.25.1-SNAPSHOT + 1.25.0 com.google.api.grpc proto-google-cloud-tasks-v2 - 1.25.1-SNAPSHOT + 1.25.0 com.google.api.grpc grpc-google-cloud-tasks-v2 - 1.25.1-SNAPSHOT + 1.25.0 com.google.api.grpc proto-google-cloud-tasks-v2beta2 - 0.81.1-SNAPSHOT + 0.81.0 com.google.api.grpc grpc-google-cloud-tasks-v2beta2 - 0.81.1-SNAPSHOT + 0.81.0 com.google.api.grpc proto-google-cloud-tasks-v2beta3 - 0.81.1-SNAPSHOT + 0.81.0 com.google.api.grpc grpc-google-cloud-tasks-v2beta3 - 0.81.1-SNAPSHOT + 0.81.0 com.google.cloud diff --git a/google-cloud-clients/google-cloud-tasks/README.md b/google-cloud-clients/google-cloud-tasks/README.md index acfa445e2e4c..d701576ab4c2 100644 --- a/google-cloud-clients/google-cloud-tasks/README.md +++ b/google-cloud-clients/google-cloud-tasks/README.md @@ -16,7 +16,6 @@ Java idiomatic client for [Cloud Tasks][cloud-tasks]. Quickstart ---------- -[//]: # ({x-version-update-start:google-cloud-tasks: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-tasks" % "1.25.0" ``` -[//]: # ({x-version-update-end}) Authentication -------------- diff --git a/google-cloud-clients/google-cloud-tasks/pom.xml b/google-cloud-clients/google-cloud-tasks/pom.xml index 788b2965923e..8ebb327a6518 100644 --- a/google-cloud-clients/google-cloud-tasks/pom.xml +++ b/google-cloud-clients/google-cloud-tasks/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-tasks - 1.25.1-SNAPSHOT + 1.25.0 jar Google Cloud Tasks https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-tasks @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.116.1-alpha-SNAPSHOT + 0.116.0-alpha google-cloud-tasks-v2 @@ -65,6 +65,27 @@ + + + + + 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-clients/google-cloud-tasks/synth.metadata b/google-cloud-clients/google-cloud-tasks/synth.metadata deleted file mode 100644 index f1634a3125cd..000000000000 --- a/google-cloud-clients/google-cloud-tasks/synth.metadata +++ /dev/null @@ -1,52 +0,0 @@ -{ - "updateTime": "2019-10-03T07:56:56.094608Z", - "sources": [ - { - "generator": { - "name": "artman", - "version": "0.37.1", - "dockerImage": "googleapis/artman@sha256:6068f67900a3f0bdece596b97bda8fc70406ca0e137a941f4c81d3217c994a80" - } - }, - { - "git": { - "name": "googleapis", - "remote": "https://github.com/googleapis/googleapis.git", - "sha": "c372c656aef153931708c80ac1a8186060841cdf", - "internalRef": "272521892" - } - } - ], - "destinations": [ - { - "client": { - "source": "googleapis", - "apiName": "tasks", - "apiVersion": "v2beta2", - "language": "java", - "generator": "gapic", - "config": "google/cloud/tasks/artman_cloudtasks_v2beta2.yaml" - } - }, - { - "client": { - "source": "googleapis", - "apiName": "tasks", - "apiVersion": "v2beta3", - "language": "java", - "generator": "gapic", - "config": "google/cloud/tasks/artman_cloudtasks_v2beta3.yaml" - } - }, - { - "client": { - "source": "googleapis", - "apiName": "tasks", - "apiVersion": "v2", - "language": "java", - "generator": "gapic", - "config": "google/cloud/tasks/artman_cloudtasks_v2.yaml" - } - } - ] -} \ No newline at end of file diff --git a/google-cloud-clients/google-cloud-tasks/synth.py b/google-cloud-clients/google-cloud-tasks/synth.py deleted file mode 100644 index 5258d39de1f9..000000000000 --- a/google-cloud-clients/google-cloud-tasks/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 = 'tasks' -versions = ['v2beta2', 'v2beta3', 'v2'] -config_pattern = '/google/cloud/tasks/artman_cloudtasks_{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 d16148b3f177..bc11fecddf31 100644 --- a/versions.txt +++ b/versions.txt @@ -118,6 +118,3 @@ proto-google-cloud-spanner-admin-database-v1:1.43.0:1.43.1-SNAPSHOT proto-google-cloud-spanner-admin-instance-v1:1.43.0:1.43.1-SNAPSHOT proto-google-cloud-spanner-v1:1.43.0:1.43.1-SNAPSHOT proto-google-cloud-talent-v4beta1:0.33.0-beta:0.33.1-beta-SNAPSHOT -proto-google-cloud-tasks-v2:1.25.0:1.25.1-SNAPSHOT -proto-google-cloud-tasks-v2beta2:0.81.0:0.81.1-SNAPSHOT -proto-google-cloud-tasks-v2beta3:0.81.0:0.81.1-SNAPSHOT From 6a2029a4a090543cbd4d51a2a6488a1383156a9c Mon Sep 17 00:00:00 2001 From: Cody Oss Date: Thu, 24 Oct 2019 10:54:48 -0600 Subject: [PATCH 2/2] fix pom issue --- google-cloud-clients/google-cloud-tasks/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-clients/google-cloud-tasks/pom.xml b/google-cloud-clients/google-cloud-tasks/pom.xml index 8ebb327a6518..926312949b58 100644 --- a/google-cloud-clients/google-cloud-tasks/pom.xml +++ b/google-cloud-clients/google-cloud-tasks/pom.xml @@ -12,7 +12,7 @@ com.google.cloud google-cloud-clients - 0.116.0-alpha + 0.116.1-alpha-SNAPSHOT google-cloud-tasks-v2