fix(deps): update dependency com.google.cloud:libraries-bom to v26.18…

….0 (main) (#1985)

* fix(deps): update dependency com.google.cloud:libraries-bom to v26.18.0

* chore: update starter modules in spring-cloud-previews

* Empty Commit

---------

Co-authored-by: Cloud Java Bot <cloud-java-bot@google.com>
Co-authored-by: Min Zhu <zhumin@google.com>

spring-cloud-gcp-dependencies/pom.xml

@@ -34,7 +34,7 @@
 	</distributionManagement>
 
 	<properties>
-		<gcp-libraries-bom.version>26.17.0</gcp-libraries-bom.version>
+		<gcp-libraries-bom.version>26.18.0</gcp-libraries-bom.version>
 		<cloud-sql-socket-factory.version>1.12.0</cloud-sql-socket-factory.version>
 		<guava.version>31.1-jre</guava.version>
 		<r2dbc-postgres-driver.version>1.0.1.RELEASE</r2dbc-postgres-driver.version>

spring-cloud-previews/google-cloud-channel-spring-starter/src/main/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringAutoConfiguration.java

@@ -344,6 +344,19 @@ public CloudChannelServiceSettings cloudChannelServiceSettings(
           .deleteChannelPartnerRepricingConfigSettings()
           .setRetrySettings(deleteChannelPartnerRepricingConfigRetrySettings);
 
+      RetrySettings listSkuGroupsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.listSkuGroupsSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.listSkuGroupsSettings().setRetrySettings(listSkuGroupsRetrySettings);
+
+      RetrySettings listSkuGroupBillableSkusRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.listSkuGroupBillableSkusSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .listSkuGroupBillableSkusSettings()
+          .setRetrySettings(listSkuGroupBillableSkusRetrySettings);
+
       RetrySettings lookupOfferRetrySettings =
           RetryUtil.updateRetrySettings(
               clientSettingsBuilder.lookupOfferSettings().getRetrySettings(), serviceRetry);
@@ -756,6 +769,30 @@ public CloudChannelServiceSettings cloudChannelServiceSettings(
             "Configured method-level retry settings for deleteChannelPartnerRepricingConfig from properties.");
       }
     }
+    Retry listSkuGroupsRetry = clientProperties.getListSkuGroupsRetry();
+    if (listSkuGroupsRetry != null) {
+      RetrySettings listSkuGroupsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.listSkuGroupsSettings().getRetrySettings(), listSkuGroupsRetry);
+      clientSettingsBuilder.listSkuGroupsSettings().setRetrySettings(listSkuGroupsRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for listSkuGroups from properties.");
+      }
+    }
+    Retry listSkuGroupBillableSkusRetry = clientProperties.getListSkuGroupBillableSkusRetry();
+    if (listSkuGroupBillableSkusRetry != null) {
+      RetrySettings listSkuGroupBillableSkusRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.listSkuGroupBillableSkusSettings().getRetrySettings(),
+              listSkuGroupBillableSkusRetry);
+      clientSettingsBuilder
+          .listSkuGroupBillableSkusSettings()
+          .setRetrySettings(listSkuGroupBillableSkusRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for listSkuGroupBillableSkus from properties.");
+      }
+    }
     Retry lookupOfferRetry = clientProperties.getLookupOfferRetry();
     if (lookupOfferRetry != null) {
       RetrySettings lookupOfferRetrySettings =

spring-cloud-previews/google-cloud-channel-spring-starter/src/main/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringProperties.java

@@ -167,6 +167,16 @@ public class CloudChannelServiceSpringProperties implements CredentialsSupplier
    * defined, this takes precedence over service-level retry configurations for that RPC method.
    */
   @NestedConfigurationProperty private Retry deleteChannelPartnerRepricingConfigRetry;
+  /**
+   * Allow override of retry settings at method-level for listSkuGroups. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry listSkuGroupsRetry;
+  /**
+   * Allow override of retry settings at method-level for listSkuGroupBillableSkus. If defined, this
+   * takes precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry listSkuGroupBillableSkusRetry;
   /**
    * Allow override of retry settings at method-level for lookupOffer. If defined, this takes
    * precedence over service-level retry configurations for that RPC method.
@@ -460,6 +470,22 @@ public void setDeleteChannelPartnerRepricingConfigRetry(
     this.deleteChannelPartnerRepricingConfigRetry = deleteChannelPartnerRepricingConfigRetry;
   }
 
+  public Retry getListSkuGroupsRetry() {
+    return this.listSkuGroupsRetry;
+  }
+
+  public void setListSkuGroupsRetry(Retry listSkuGroupsRetry) {
+    this.listSkuGroupsRetry = listSkuGroupsRetry;
+  }
+
+  public Retry getListSkuGroupBillableSkusRetry() {
+    return this.listSkuGroupBillableSkusRetry;
+  }
+
+  public void setListSkuGroupBillableSkusRetry(Retry listSkuGroupBillableSkusRetry) {
+    this.listSkuGroupBillableSkusRetry = listSkuGroupBillableSkusRetry;
+  }
+
   public Retry getLookupOfferRetry() {
     return this.lookupOfferRetry;
   }

spring-cloud-previews/google-cloud-language-spring-starter/src/main/java/com/google/cloud/language/v1/spring/LanguageServiceSpringAutoConfiguration.java

@@ -191,6 +191,11 @@ public LanguageServiceSettings languageServiceSettings(
               clientSettingsBuilder.classifyTextSettings().getRetrySettings(), serviceRetry);
       clientSettingsBuilder.classifyTextSettings().setRetrySettings(classifyTextRetrySettings);
 
+      RetrySettings moderateTextRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.moderateTextSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.moderateTextSettings().setRetrySettings(moderateTextRetrySettings);
+
       RetrySettings annotateTextRetrySettings =
           RetryUtil.updateRetrySettings(
               clientSettingsBuilder.annotateTextSettings().getRetrySettings(), serviceRetry);
@@ -261,6 +266,16 @@ public LanguageServiceSettings languageServiceSettings(
         LOGGER.trace("Configured method-level retry settings for classifyText from properties.");
       }
     }
+    Retry moderateTextRetry = clientProperties.getModerateTextRetry();
+    if (moderateTextRetry != null) {
+      RetrySettings moderateTextRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.moderateTextSettings().getRetrySettings(), moderateTextRetry);
+      clientSettingsBuilder.moderateTextSettings().setRetrySettings(moderateTextRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for moderateText from properties.");
+      }
+    }
     Retry annotateTextRetry = clientProperties.getAnnotateTextRetry();
     if (annotateTextRetry != null) {
       RetrySettings annotateTextRetrySettings =

spring-cloud-previews/google-cloud-language-spring-starter/src/main/java/com/google/cloud/language/v1/spring/LanguageServiceSpringProperties.java

@@ -69,6 +69,11 @@ public class LanguageServiceSpringProperties implements CredentialsSupplier {
    * precedence over service-level retry configurations for that RPC method.
    */
   @NestedConfigurationProperty private Retry classifyTextRetry;
+  /**
+   * Allow override of retry settings at method-level for moderateText. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry moderateTextRetry;
   /**
    * Allow override of retry settings at method-level for annotateText. If defined, this takes
    * precedence over service-level retry configurations for that RPC method.
@@ -152,6 +157,14 @@ public void setClassifyTextRetry(Retry classifyTextRetry) {
     this.classifyTextRetry = classifyTextRetry;
   }
 
+  public Retry getModerateTextRetry() {
+    return this.moderateTextRetry;
+  }
+
+  public void setModerateTextRetry(Retry moderateTextRetry) {
+    this.moderateTextRetry = moderateTextRetry;
+  }
+
   public Retry getAnnotateTextRetry() {
     return this.annotateTextRetry;
   }

spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/src/main/java/com/google/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringAutoConfiguration.java

@@ -171,6 +171,36 @@ public EnvironmentsSettings environmentsSettings(
           .listEnvironmentsSettings()
           .setRetrySettings(listEnvironmentsRetrySettings);
 
+      RetrySettings executeAirflowCommandRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.executeAirflowCommandSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .executeAirflowCommandSettings()
+          .setRetrySettings(executeAirflowCommandRetrySettings);
+
+      RetrySettings stopAirflowCommandRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.stopAirflowCommandSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder
+          .stopAirflowCommandSettings()
+          .setRetrySettings(stopAirflowCommandRetrySettings);
+
+      RetrySettings pollAirflowCommandRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.pollAirflowCommandSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder
+          .pollAirflowCommandSettings()
+          .setRetrySettings(pollAirflowCommandRetrySettings);
+
+      RetrySettings fetchDatabasePropertiesRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.fetchDatabasePropertiesSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .fetchDatabasePropertiesSettings()
+          .setRetrySettings(fetchDatabasePropertiesRetrySettings);
+
       if (LOGGER.isTraceEnabled()) {
         LOGGER.trace("Configured service-level retry settings from properties.");
       }
@@ -200,6 +230,62 @@ public EnvironmentsSettings environmentsSettings(
             "Configured method-level retry settings for listEnvironments from properties.");
       }
     }
+    Retry executeAirflowCommandRetry = clientProperties.getExecuteAirflowCommandRetry();
+    if (executeAirflowCommandRetry != null) {
+      RetrySettings executeAirflowCommandRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.executeAirflowCommandSettings().getRetrySettings(),
+              executeAirflowCommandRetry);
+      clientSettingsBuilder
+          .executeAirflowCommandSettings()
+          .setRetrySettings(executeAirflowCommandRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for executeAirflowCommand from properties.");
+      }
+    }
+    Retry stopAirflowCommandRetry = clientProperties.getStopAirflowCommandRetry();
+    if (stopAirflowCommandRetry != null) {
+      RetrySettings stopAirflowCommandRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.stopAirflowCommandSettings().getRetrySettings(),
+              stopAirflowCommandRetry);
+      clientSettingsBuilder
+          .stopAirflowCommandSettings()
+          .setRetrySettings(stopAirflowCommandRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for stopAirflowCommand from properties.");
+      }
+    }
+    Retry pollAirflowCommandRetry = clientProperties.getPollAirflowCommandRetry();
+    if (pollAirflowCommandRetry != null) {
+      RetrySettings pollAirflowCommandRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.pollAirflowCommandSettings().getRetrySettings(),
+              pollAirflowCommandRetry);
+      clientSettingsBuilder
+          .pollAirflowCommandSettings()
+          .setRetrySettings(pollAirflowCommandRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for pollAirflowCommand from properties.");
+      }
+    }
+    Retry fetchDatabasePropertiesRetry = clientProperties.getFetchDatabasePropertiesRetry();
+    if (fetchDatabasePropertiesRetry != null) {
+      RetrySettings fetchDatabasePropertiesRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.fetchDatabasePropertiesSettings().getRetrySettings(),
+              fetchDatabasePropertiesRetry);
+      clientSettingsBuilder
+          .fetchDatabasePropertiesSettings()
+          .setRetrySettings(fetchDatabasePropertiesRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for fetchDatabaseProperties from properties.");
+      }
+    }
     return clientSettingsBuilder.build();
   }
 

spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/src/main/java/com/google/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringProperties.java

@@ -52,6 +52,26 @@ public class EnvironmentsSpringProperties implements CredentialsSupplier {
    * precedence over service-level retry configurations for that RPC method.
    */
   @NestedConfigurationProperty private Retry listEnvironmentsRetry;
+  /**
+   * Allow override of retry settings at method-level for executeAirflowCommand. If defined, this
+   * takes precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry executeAirflowCommandRetry;
+  /**
+   * Allow override of retry settings at method-level for stopAirflowCommand. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry stopAirflowCommandRetry;
+  /**
+   * Allow override of retry settings at method-level for pollAirflowCommand. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry pollAirflowCommandRetry;
+  /**
+   * Allow override of retry settings at method-level for fetchDatabaseProperties. If defined, this
+   * takes precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry fetchDatabasePropertiesRetry;
 
   @Override
   public Credentials getCredentials() {
@@ -105,4 +125,36 @@ public Retry getListEnvironmentsRetry() {
   public void setListEnvironmentsRetry(Retry listEnvironmentsRetry) {
     this.listEnvironmentsRetry = listEnvironmentsRetry;
   }
+
+  public Retry getExecuteAirflowCommandRetry() {
+    return this.executeAirflowCommandRetry;
+  }
+
+  public void setExecuteAirflowCommandRetry(Retry executeAirflowCommandRetry) {
+    this.executeAirflowCommandRetry = executeAirflowCommandRetry;
+  }
+
+  public Retry getStopAirflowCommandRetry() {
+    return this.stopAirflowCommandRetry;
+  }
+
+  public void setStopAirflowCommandRetry(Retry stopAirflowCommandRetry) {
+    this.stopAirflowCommandRetry = stopAirflowCommandRetry;
+  }
+
+  public Retry getPollAirflowCommandRetry() {
+    return this.pollAirflowCommandRetry;
+  }
+
+  public void setPollAirflowCommandRetry(Retry pollAirflowCommandRetry) {
+    this.pollAirflowCommandRetry = pollAirflowCommandRetry;
+  }
+
+  public Retry getFetchDatabasePropertiesRetry() {
+    return this.fetchDatabasePropertiesRetry;
+  }
+
+  public void setFetchDatabasePropertiesRetry(Retry fetchDatabasePropertiesRetry) {
+    this.fetchDatabasePropertiesRetry = fetchDatabasePropertiesRetry;
+  }
 }