Merge branch 'main' into dependabot/gradle/com.google.guava-guava-32.…

…1.3-jre

Signed-off-by: Craig Perkins <cwperx@amazon.com>

.github/workflows/backport.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   backport:
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -25,4 +26,5 @@ jobs:
         uses: VachaShah/backport@v2.2.0
         with:
           github_token: ${{ steps.github_app_token.outputs.token }}
-          branch_name: backport/backport-${{ github.event.number }}
+          head_template: backport/backport-<%= number %>-to-<%= base %>
+          failure_labels: backport-failed

build.gradle

@@ -24,9 +24,9 @@ buildscript {
 }
 
 plugins {
-    id 'com.netflix.nebula.ospackage' version "11.5.0"
+    id 'com.netflix.nebula.ospackage' version "11.6.0"
     id 'java-library'
-    id "com.diffplug.spotless" version "6.22.0" apply false
+    id "com.diffplug.spotless" version "6.25.0" apply false
 }
 
 apply plugin: 'opensearch.opensearchplugin'
@@ -161,7 +161,7 @@ configurations {
 dependencies {
     implementation project(path: ":${rootProject.name}-spi", configuration: 'shadow')
     implementation group: 'com.google.guava', name: 'guava', version:'32.1.3-jre'
-    implementation group: 'com.google.guava', name: 'failureaccess', version:'1.0.1'
+    implementation group: 'com.google.guava', name: 'failureaccess', version:'1.0.2'
     javaRestTestImplementation project.sourceSets.main.runtimeClasspath
     //spotless
     implementation('com.google.googlejavaformat:google-java-format:1.17.0') {