Merge branch 'main' into scheduled-job-identity-manager

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
         java: [11, 17]
 
     # Job name

build.gradle

@@ -150,11 +150,23 @@ repositories {
     maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
 }
 
+configurations {
+    all {
+        resolutionStrategy {
+            force 'com.google.guava:guava:32.0.1-jre'
+        }
+    }
+}
+
 dependencies {
     implementation project(path: ":${rootProject.name}-spi", configuration: 'shadow')
-    implementation group: 'com.google.guava', name: 'guava', version:'31.0.1-jre'
+    implementation group: 'com.google.guava', name: 'guava', version:'32.0.1-jre'
     implementation group: 'com.google.guava', name: 'failureaccess', version:'1.0.1'
     javaRestTestImplementation project.sourceSets.main.runtimeClasspath
+    //spotless
+    implementation('com.google.googlejavaformat:google-java-format:1.15.0') {
+        exclude group: 'com.google.guava'
+    }
 }
 
 // RPM & Debian build

sample-extension-plugin/build.gradle

@@ -9,6 +9,7 @@ apply plugin: 'opensearch.java-rest-test'
 
 import org.opensearch.gradle.test.RestIntegTestTask
 import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
+import org.apache.tools.ant.taskdefs.condition.Os
 
 import java.util.concurrent.Callable
 
@@ -278,7 +279,9 @@ task bwcTestSuite(type: StandaloneRestIntegTestTask) {
     dependsOn tasks.named("${baseName}#rollingUpgradeClusterTask")
     dependsOn tasks.named("${baseName}#fullRestartClusterTask")
 }
-tasks.named("check").configure {dependsOn(bwcTestSuite)}
+if (!(Os.isFamily(Os.FAMILY_MAC))) {
+    tasks.named("check").configure {dependsOn(bwcTestSuite)}
+}
 
 run {
     doFirst {