From 92e233889a22ee9393c4207b8bd93bf1266bdd93 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 9 Aug 2022 05:06:50 +0000 Subject: [PATCH 1/6] chore(main): release 0.123.3 --- CHANGELOG.md | 7 +++++++ google-cloud-datalabeling-bom/pom.xml | 8 ++++---- google-cloud-datalabeling/pom.xml | 4 ++-- grpc-google-cloud-datalabeling-v1beta1/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-datalabeling-v1beta1/pom.xml | 4 ++-- versions.txt | 6 +++--- 7 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a946a843..c124e61b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.123.3](https://github.com/googleapis/java-datalabeling/compare/v0.123.2...v0.123.3) (2022-08-09) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v3 ([#769](https://github.com/googleapis/java-datalabeling/issues/769)) ([5f2e3c1](https://github.com/googleapis/java-datalabeling/commit/5f2e3c14bd4fc50653b7121d2239cab61f06d42b)) + ## [0.123.2](https://github.com/googleapis/java-datalabeling/compare/v0.123.1...v0.123.2) (2022-07-13) diff --git a/google-cloud-datalabeling-bom/pom.xml b/google-cloud-datalabeling-bom/pom.xml index 5fba8677..1225922e 100644 --- a/google-cloud-datalabeling-bom/pom.xml +++ b/google-cloud-datalabeling-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datalabeling-bom - 0.123.3-SNAPSHOT + 0.123.3 pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-datalabeling - 0.123.3-SNAPSHOT + 0.123.3 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.88.3-SNAPSHOT + 0.88.3 com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.88.3-SNAPSHOT + 0.88.3 diff --git a/google-cloud-datalabeling/pom.xml b/google-cloud-datalabeling/pom.xml index 5cdfac48..022e3e71 100644 --- a/google-cloud-datalabeling/pom.xml +++ b/google-cloud-datalabeling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datalabeling - 0.123.3-SNAPSHOT + 0.123.3 jar Google Cloud Data Labeling https://github.com/googleapis/java-datalabeling @@ -11,7 +11,7 @@ com.google.cloud google-cloud-datalabeling-parent - 0.123.3-SNAPSHOT + 0.123.3 google-cloud-datalabeling diff --git a/grpc-google-cloud-datalabeling-v1beta1/pom.xml b/grpc-google-cloud-datalabeling-v1beta1/pom.xml index b3f1c77c..e58d5cfe 100644 --- a/grpc-google-cloud-datalabeling-v1beta1/pom.xml +++ b/grpc-google-cloud-datalabeling-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.88.3-SNAPSHOT + 0.88.3 grpc-google-cloud-datalabeling-v1beta1 GRPC library for grpc-google-cloud-datalabeling-v1beta1 com.google.cloud google-cloud-datalabeling-parent - 0.123.3-SNAPSHOT + 0.123.3 diff --git a/pom.xml b/pom.xml index c47e5732..27cfca97 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datalabeling-parent pom - 0.123.3-SNAPSHOT + 0.123.3 Google Cloud Data Labeling Parent https://github.com/googleapis/java-datalabeling @@ -61,17 +61,17 @@ com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.88.3-SNAPSHOT + 0.88.3 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.88.3-SNAPSHOT + 0.88.3 com.google.cloud google-cloud-datalabeling - 0.123.3-SNAPSHOT + 0.123.3 diff --git a/proto-google-cloud-datalabeling-v1beta1/pom.xml b/proto-google-cloud-datalabeling-v1beta1/pom.xml index be588019..8dc374d1 100644 --- a/proto-google-cloud-datalabeling-v1beta1/pom.xml +++ b/proto-google-cloud-datalabeling-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.88.3-SNAPSHOT + 0.88.3 proto-google-cloud-datalabeling-v1beta1 PROTO library for proto-google-cloud-datalabeling-v1beta1 com.google.cloud google-cloud-datalabeling-parent - 0.123.3-SNAPSHOT + 0.123.3 diff --git a/versions.txt b/versions.txt index 0bd3840c..3afd9c63 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-datalabeling:0.123.2:0.123.3-SNAPSHOT -grpc-google-cloud-datalabeling-v1beta1:0.88.2:0.88.3-SNAPSHOT -proto-google-cloud-datalabeling-v1beta1:0.88.2:0.88.3-SNAPSHOT +google-cloud-datalabeling:0.123.3:0.123.3 +grpc-google-cloud-datalabeling-v1beta1:0.88.3:0.88.3 +proto-google-cloud-datalabeling-v1beta1:0.88.3:0.88.3 From 4ba04a7fd74fac817f6b72b701a687a199c45db4 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 11 Aug 2022 23:08:36 -0400 Subject: [PATCH 2/6] test: adding debug output --- .../java/com/google/cloud/datalabeling/it/ITSystemTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java b/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java index 7683b77e..1f9faa39 100644 --- a/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java +++ b/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java @@ -119,6 +119,12 @@ public void listDatasetsTest() { DataLabelingServiceClient.ListDatasetsPagedResponse pagedListResponse = client.listDatasets(PARENT, filter); List resources = Lists.newArrayList(pagedListResponse.iterateAll()); + + System.out.println("Dataset returned ("+resources.size()+"):"); + for (Dataset resource : resources) { + System.out.println(resource); + } + assertEquals(1, resources.size()); } From b34d87a11192134b28c4214faab270d455f9f16f Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Fri, 12 Aug 2022 03:11:15 +0000 Subject: [PATCH 3/6] =?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 --- .../java/com/google/cloud/datalabeling/it/ITSystemTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java b/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java index 1f9faa39..86addc97 100644 --- a/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java +++ b/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java @@ -120,7 +120,7 @@ public void listDatasetsTest() { client.listDatasets(PARENT, filter); List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - System.out.println("Dataset returned ("+resources.size()+"):"); + System.out.println("Dataset returned (" + resources.size() + "):"); for (Dataset resource : resources) { System.out.println(resource); } From 50447be82b77b58e49cc56abaafad1b283e501e7 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 11 Aug 2022 23:29:25 -0400 Subject: [PATCH 4/6] test: cleanup old dataset --- .../cloud/datalabeling/it/ITSystemTest.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java b/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java index 86addc97..0febc98d 100644 --- a/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java +++ b/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.datalabeling.v1beta1.it; +package com.google.cloud.datalabeling.it; import static org.junit.Assert.assertEquals; @@ -38,6 +38,7 @@ import org.junit.Test; public class ITSystemTest { + private static DataLabelingServiceClient client; private static String dataSetId; private static String annotationSpecSetId; @@ -97,11 +98,15 @@ public static void afterClass() { client.deleteAnnotationSpecSet(annotationSpecSetName); LOGGER.info("AnnotationSpecSet deleted successfully."); } - if (dataSetId != null) { - String dataSet = DatasetName.format(PROJECT_ID, dataSetId); - client.deleteDataset(dataSet); - LOGGER.info("Dataset deleted successfully."); + + DataLabelingServiceClient.ListDatasetsPagedResponse pagedListResponse = + client.listDatasets(PARENT, ""); + for (Dataset dataset : pagedListResponse.iterateAll()) { + String datasetId = dataset.getName().split("/")[3]; + client.deleteDataset(datasetId); + LOGGER.info("Dataset " + datasetId + " deleted successfully."); } + client.close(); } @@ -119,11 +124,8 @@ public void listDatasetsTest() { DataLabelingServiceClient.ListDatasetsPagedResponse pagedListResponse = client.listDatasets(PARENT, filter); List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - - System.out.println("Dataset returned (" + resources.size() + "):"); - for (Dataset resource : resources) { - System.out.println(resource); - } + // This filter ensures that other datasets in the project do not interfere. + resources.removeIf(dataset -> !dataset.getName().split("/")[3].equals(dataSetId)); assertEquals(1, resources.size()); } From 38eefa455b5bf17966703977fdc9ea36e51ad2e3 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 11 Aug 2022 23:43:43 -0400 Subject: [PATCH 5/6] test: reverted deletion logic --- .../google/cloud/datalabeling/it/ITSystemTest.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java b/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java index 0febc98d..aaa7bdc5 100644 --- a/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java +++ b/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java @@ -98,15 +98,11 @@ public static void afterClass() { client.deleteAnnotationSpecSet(annotationSpecSetName); LOGGER.info("AnnotationSpecSet deleted successfully."); } - - DataLabelingServiceClient.ListDatasetsPagedResponse pagedListResponse = - client.listDatasets(PARENT, ""); - for (Dataset dataset : pagedListResponse.iterateAll()) { - String datasetId = dataset.getName().split("/")[3]; - client.deleteDataset(datasetId); - LOGGER.info("Dataset " + datasetId + " deleted successfully."); + if (dataSetId != null) { + String dataSet = DatasetName.format(PROJECT_ID, dataSetId); + client.deleteDataset(dataSet); + LOGGER.info("Dataset deleted successfully."); } - client.close(); } From cf87fb836546a36b35e8d96ae97aee625947c09b Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 11 Aug 2022 23:55:35 -0400 Subject: [PATCH 6/6] test: avoid interference among integration tests --- .../com/google/cloud/datalabeling/it/ITSystemTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java b/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java index aaa7bdc5..bc2f0a45 100644 --- a/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java +++ b/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/it/ITSystemTest.java @@ -120,7 +120,7 @@ public void listDatasetsTest() { DataLabelingServiceClient.ListDatasetsPagedResponse pagedListResponse = client.listDatasets(PARENT, filter); List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - // This filter ensures that other datasets in the project do not interfere. + // This removal ensures that other integration tests on the same GCP project do not interfere. resources.removeIf(dataset -> !dataset.getName().split("/")[3].equals(dataSetId)); assertEquals(1, resources.size()); @@ -140,6 +140,11 @@ public void listAnnotationSpecSetsTest() { DataLabelingServiceClient.ListAnnotationSpecSetsPagedResponse pagedListResponse = client.listAnnotationSpecSets(PARENT, filter); List resources = Lists.newArrayList(pagedListResponse.iterateAll()); + // This removal ensures that other integration tests on the same GCP project do not interfere. + resources.removeIf( + annotationSpecSet -> + !annotationSpecSet.getName().split("/")[3].equals(annotationSpecSetId)); + assertEquals(1, resources.size()); } }