Merge branch 'opensearch-project:main' into nishcha-dev

Author: nishchay21

.github/workflows/delete_backport_branch.yml

@@ -7,9 +7,16 @@ on:
 jobs:
   delete-branch:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     if: startsWith(github.event.pull_request.head.ref,'backport/')
     steps:
-      - name: Delete merged branch
-        uses: SvanBoxel/delete-merged-branch@main
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Delete merged branch
+      uses: actions/github-script@v7
+      with:
+        script: |
+          github.rest.git.deleteRef({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            ref: `heads/${context.payload.pull_request.head.ref}`,
+          })

.github/workflows/gradle.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         java:
           - 21
-          - 23
+          - 24
       fail-fast: false
     runs-on: [ubuntu-latest]
     name: Building PA package

build.gradle

@@ -6,7 +6,7 @@
 buildscript {
 
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "3.1.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "3.2.0-SNAPSHOT")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
 
@@ -48,8 +48,8 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'com.netflix.nebula.ospackage' version "11.6.0"
-    id 'com.github.spotbugs' version '6.0.7'
+    id 'com.netflix.nebula.ospackage' version "12.0.0"
+    id 'com.github.spotbugs' version '6.2.2'
     id 'jacoco'
     id 'com.diffplug.spotless' version '6.25.0'
     id 'checkstyle'
@@ -59,7 +59,7 @@ plugins {
 }
 
 checkstyle {
-    toolVersion = '10.12.1'
+    toolVersion = '10.26.1'
     configFile file("checkstyle/checkstyle.xml")
 }
 
@@ -91,24 +91,6 @@ ext {
     rcaProjectDir = System.getProperty("performance-analyzer-rca.path", "../performance-analyzer-rca")
 }
 
-// Fix for CVE-2025-27820
-configurations.all {
-    resolutionStrategy {
-        force("org.apache.httpcomponents.client5:httpclient5:5.4.4")
-        force("org.apache.httpcomponents:httpcore:5.3.4")
-        force("org.apache.httpcomponents.core5:httpcore5-h2:5.3.4")
-        force("org.apache.httpcomponents.core5:httpcore5:5.3.4")
-        
-
-        // Alternatively, you can use this approach
-        eachDependency { DependencyResolveDetails details ->
-            if (details.requested.group == 'org.apache.httpcomponents.client5' &&
-                    details.requested.name == 'httpclient5') {
-                details.useVersion "${versions.httpclient5}"
-            }
-        }
-    }
-}
 
 allprojects {
     group = "org.opensearch"

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
-validateDistributionUrl=true
+distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,10 @@
+## Version 3.2.0 Release Notes
+
+Compatible with OpenSearch and OpenSearch Dashboards version 3.2.0
+
+### Infrastructure
+* Bump gradle to 8.14, fix backport-deletion and support JDK24 ([#831](https://github.com/opensearch-project/performance-analyzer/pull/831))
+
+### Maintenance
+* Bump spotbug to 6.2.2 and checkstyle 10.26.1 ([#826](https://github.com/opensearch-project/performance-analyzer/pull/826))
+* Increment version to 3.2.0-SNAPSHOT ([#823](https://github.com/opensearch-project/performance-analyzer/pull/823))

gradlew.bat

@@ -27,7 +27,7 @@
 description=Performance Analyzer Plugin
 #
 # 'version': plugin's version
-version=3.1.0.0
+version=3.2.0.0
 #
 # 'name': the plugin name
 name=performance-analyzer
@@ -42,4 +42,4 @@ classname=org.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin
 java.version=1.8
 #
 # 'opensearch.version' version of opensearch compiled against
-opensearch.version=3.1.0
+opensearch.version=3.2.0