diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 6a5aba4b..191c1da8 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -16,6 +16,7 @@ docker: image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest" deep-remove-regex: +- "/samples/snippets/generated" - "/grpc-google-.*/src" - "/proto-google-.*/src" - "/google-.*/src" @@ -27,3 +28,5 @@ deep-copy-regex: dest: "/owl-bot-staging/$1/grpc-google-cloud-channel-$1/src" - source: "/google/cloud/channel/(v.*)/.*-java/gapic-google-.*/src" dest: "/owl-bot-staging/$1/google-cloud-channel/src" +- source: "/google/cloud/channel/(v.*)/.*-java/samples/snippets/generated" + dest: "/owl-bot-staging/$1/samples/snippets/generated" diff --git a/CHANGELOG.md b/CHANGELOG.md index ab01ebea..d0d1309b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [3.6.1](https://github.com/googleapis/java-channel/compare/v3.6.0...v3.6.1) (2022-06-23) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.13.0 ([#310](https://github.com/googleapis/java-channel/issues/310)) ([21611ec](https://github.com/googleapis/java-channel/commit/21611ece39440d9c43dad80e95efde4176dafea9)) + ## [3.6.0](https://github.com/googleapis/java-channel/compare/v3.5.2...v3.6.0) (2022-05-24) diff --git a/README.md b/README.md index 06e4ab8b..a0be57dd 100644 --- a/README.md +++ b/README.md @@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-channel - 3.5.2 + 3.6.0 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-channel:3.5.2' +implementation 'com.google.cloud:google-cloud-channel:3.6.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-channel" % "3.5.2" +libraryDependencies += "com.google.cloud" % "google-cloud-channel" % "3.6.0" ``` ## Authentication diff --git a/google-cloud-channel-bom/pom.xml b/google-cloud-channel-bom/pom.xml index 8f8ad5a9..ec5ef15d 100644 --- a/google-cloud-channel-bom/pom.xml +++ b/google-cloud-channel-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-channel-bom - 3.6.0 + 3.6.1 pom com.google.cloud google-cloud-shared-config - 1.4.0 + 1.5.0 Google Channel Services BOM @@ -56,17 +56,17 @@ com.google.cloud google-cloud-channel - 3.6.0 + 3.6.1 com.google.api.grpc grpc-google-cloud-channel-v1 - 3.6.0 + 3.6.1 com.google.api.grpc proto-google-cloud-channel-v1 - 3.6.0 + 3.6.1 diff --git a/google-cloud-channel/pom.xml b/google-cloud-channel/pom.xml index 76d6f6c9..1cdaa7d1 100644 --- a/google-cloud-channel/pom.xml +++ b/google-cloud-channel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-channel - 3.6.0 + 3.6.1 jar Google Channel Services https://github.com/googleapis/java-channel @@ -11,7 +11,7 @@ com.google.cloud google-cloud-channel-parent - 3.6.0 + 3.6.1 google-cloud-channel diff --git a/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java index 7c8c62e6..1806bf65 100644 --- a/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java +++ b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.longrunning.OperationFuture; import com.google.api.gax.paging.AbstractFixedSizeCollection; @@ -147,7 +146,6 @@ public static final CloudChannelServiceClient create(CloudChannelServiceSettings * Constructs an instance of CloudChannelServiceClient, using the given stub for making calls. * This is for advanced usage - prefer using create(CloudChannelServiceSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final CloudChannelServiceClient create(CloudChannelServiceStub stub) { return new CloudChannelServiceClient(stub); } @@ -163,7 +161,6 @@ protected CloudChannelServiceClient(CloudChannelServiceSettings settings) throws this.operationsClient = OperationsClient.create(this.stub.getOperationsStub()); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected CloudChannelServiceClient(CloudChannelServiceStub stub) { this.settings = null; this.stub = stub; @@ -174,7 +171,6 @@ public final CloudChannelServiceSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public CloudChannelServiceStub getStub() { return stub; } @@ -301,7 +297,7 @@ public final ListCustomersPagedResponse listCustomers(ListCustomersRequest reque * while (true) { * ListCustomersResponse response = * cloudChannelServiceClient.listCustomersCallable().call(request); - * for (Customer element : response.getResponsesList()) { + * for (Customer element : response.getCustomersList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -1193,7 +1189,7 @@ public final ListEntitlementsPagedResponse listEntitlements(ListEntitlementsRequ * while (true) { * ListEntitlementsResponse response = * cloudChannelServiceClient.listEntitlementsCallable().call(request); - * for (Entitlement element : response.getResponsesList()) { + * for (Entitlement element : response.getEntitlementsList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -1345,7 +1341,7 @@ public final ListTransferableSkusPagedResponse listTransferableSkus( * while (true) { * ListTransferableSkusResponse response = * cloudChannelServiceClient.listTransferableSkusCallable().call(request); - * for (TransferableSku element : response.getResponsesList()) { + * for (TransferableSku element : response.getTransferableSkusList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -1497,7 +1493,7 @@ public final ListTransferableOffersPagedResponse listTransferableOffers( * while (true) { * ListTransferableOffersResponse response = * cloudChannelServiceClient.listTransferableOffersCallable().call(request); - * for (TransferableOffer element : response.getResponsesList()) { + * for (TransferableOffer element : response.getTransferableOffersList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -3270,7 +3266,7 @@ public final ListChannelPartnerLinksPagedResponse listChannelPartnerLinks( * while (true) { * ListChannelPartnerLinksResponse response = * cloudChannelServiceClient.listChannelPartnerLinksCallable().call(request); - * for (ChannelPartnerLink element : response.getResponsesList()) { + * for (ChannelPartnerLink element : response.getChannelPartnerLinksList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -3996,7 +3992,7 @@ public final ListCustomerRepricingConfigsPagedResponse listCustomerRepricingConf * while (true) { * ListCustomerRepricingConfigsResponse response = * cloudChannelServiceClient.listCustomerRepricingConfigsCallable().call(request); - * for (CustomerRepricingConfig element : response.getResponsesList()) { + * for (CustomerRepricingConfig element : response.getCustomerRepricingConfigsList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -5114,7 +5110,8 @@ public final ListChannelPartnerRepricingConfigsPagedResponse listChannelPartnerR * while (true) { * ListChannelPartnerRepricingConfigsResponse response = * cloudChannelServiceClient.listChannelPartnerRepricingConfigsCallable().call(request); - * for (ChannelPartnerRepricingConfig element : response.getResponsesList()) { + * for (ChannelPartnerRepricingConfig element : + * response.getChannelPartnerRepricingConfigsList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -5958,7 +5955,7 @@ public final ListProductsPagedResponse listProducts(ListProductsRequest request) * while (true) { * ListProductsResponse response = * cloudChannelServiceClient.listProductsCallable().call(request); - * for (Product element : response.getResponsesList()) { + * for (Product element : response.getProductsList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -6074,7 +6071,7 @@ public final UnaryCallable listSkusPaged * .build(); * while (true) { * ListSkusResponse response = cloudChannelServiceClient.listSkusCallable().call(request); - * for (Sku element : response.getResponsesList()) { + * for (Sku element : response.getSkusList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -6191,7 +6188,7 @@ public final UnaryCallable listOffer * .build(); * while (true) { * ListOffersResponse response = cloudChannelServiceClient.listOffersCallable().call(request); - * for (Offer element : response.getResponsesList()) { + * for (Offer element : response.getOffersList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -6327,7 +6324,7 @@ public final ListPurchasableSkusPagedResponse listPurchasableSkus( * while (true) { * ListPurchasableSkusResponse response = * cloudChannelServiceClient.listPurchasableSkusCallable().call(request); - * for (PurchasableSku element : response.getResponsesList()) { + * for (PurchasableSku element : response.getPurchasableSkusList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -6464,7 +6461,7 @@ public final ListPurchasableOffersPagedResponse listPurchasableOffers( * while (true) { * ListPurchasableOffersResponse response = * cloudChannelServiceClient.listPurchasableOffersCallable().call(request); - * for (PurchasableOffer element : response.getResponsesList()) { + * for (PurchasableOffer element : response.getPurchasableOffersList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -6784,7 +6781,7 @@ public final ListSubscribersPagedResponse listSubscribers(ListSubscribersRequest * while (true) { * ListSubscribersResponse response = * cloudChannelServiceClient.listSubscribersCallable().call(request); - * for (String element : response.getResponsesList()) { + * for (String element : response.getServiceAccountsList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); diff --git a/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/stub/CloudChannelServiceStubSettings.java b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/stub/CloudChannelServiceStubSettings.java index 53600a2e..8293bfca 100644 --- a/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/stub/CloudChannelServiceStubSettings.java +++ b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/stub/CloudChannelServiceStubSettings.java @@ -1479,7 +1479,6 @@ public UnaryCallSettings lookupOfferSettings() { return listSubscribersSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public CloudChannelServiceStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/grpc-google-cloud-channel-v1/pom.xml b/grpc-google-cloud-channel-v1/pom.xml index e8ed79b8..54aa7be8 100644 --- a/grpc-google-cloud-channel-v1/pom.xml +++ b/grpc-google-cloud-channel-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-channel-v1 - 3.6.0 + 3.6.1 grpc-google-cloud-channel-v1 GRPC library for google-cloud-channel com.google.cloud google-cloud-channel-parent - 3.6.0 + 3.6.1 diff --git a/pom.xml b/pom.xml index 6c2fb7dc..fe661b9a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-channel-parent pom - 3.6.0 + 3.6.1 Google Channel Services Parent https://github.com/googleapis/java- @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.4.0 + 1.5.0 @@ -61,23 +61,23 @@ com.google.cloud google-cloud-channel - 3.6.0 + 3.6.1 com.google.api.grpc proto-google-cloud-channel-v1 - 3.6.0 + 3.6.1 com.google.api.grpc grpc-google-cloud-channel-v1 - 3.6.0 + 3.6.1 com.google.cloud google-cloud-shared-dependencies - 2.12.0 + 2.13.0 pom import diff --git a/proto-google-cloud-channel-v1/pom.xml b/proto-google-cloud-channel-v1/pom.xml index 83b663b7..e8ff9004 100644 --- a/proto-google-cloud-channel-v1/pom.xml +++ b/proto-google-cloud-channel-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-channel-v1 - 3.6.0 + 3.6.1 proto-google-cloud-channel-v1 Proto library for google-cloud-channel com.google.cloud google-cloud-channel-parent - 3.6.0 + 3.6.1 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index e86a6205..40d3bb00 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-channel - 3.5.2 + 3.6.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 7de10edb..0a83891b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-channel - 3.5.2 + 3.6.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 430d0fdb..a2863c0a 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-channel - 3.5.2 + 3.6.0 diff --git a/versions.txt b/versions.txt index 12c4b070..a4586686 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-channel:3.6.0:3.6.0 -grpc-google-cloud-channel-v1:3.6.0:3.6.0 -proto-google-cloud-channel-v1:3.6.0:3.6.0 +google-cloud-channel:3.6.1:3.6.1 +grpc-google-cloud-channel-v1:3.6.1:3.6.1 +proto-google-cloud-channel-v1:3.6.1:3.6.1