Update main to 3.0.0 baseline

Signed-off-by: Andriy Redko <[email protected]>

.github/workflows/backport.yml

@@ -0,0 +1,40 @@
+name: Backport
+on:
+ pull_request_target:
+ types:
+ - closed
+ - labeled
+
+jobs:
+ backport:
+ name: Backport
+ runs-on: ubuntu-latest
+ # Only react to merged PRs for security reasons.
+ # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
+ if: >
+ github.event.pull_request.merged
+ && (
+ github.event.action == 'closed'
+ || (
+ github.event.action == 'labeled'
+ && contains(github.event.label.name, 'backport')
+ )
+ )
+ permissions:
+ contents: write
+ pull-requests: write
+ steps:
+ - name: GitHub App token
+ id: github_app_token
+ uses: tibdex/[email protected]
+ with:
+ app_id: ${{ secrets.APP_ID }}
+ private_key: ${{ secrets.APP_PRIVATE_KEY }}
+ installation_id: 22958780
+
+ - name: Backport
+ uses: VachaShah/[email protected]
+ with:
+ github_token: ${{ steps.github_app_token.outputs.token }}
+ head_template: backport/backport-<%= number %>-to-<%= base %>
+ failure_labels: backport-failed

.github/workflows/gradle.yml

@@ -2,9 +2,16 @@ name: Java CI with Gradle
 
 on:
  push:
- branches: [ "main" ]
+ branches:
+ - main
+ - '[0-9]+.[0-9]+'
+ - '[0-9]+.x'
  pull_request:
- branches: [ "main" ]
+ branches:
+ - main
+ - '[0-9]+.[0-9]+'
+ - '[0-9]+.x'
+
 
 permissions:
  contents: read

build.gradle

@@ -19,7 +19,7 @@ repositories {
 }
 
 allprojects {
- version = '2.16.0-SNAPSHOT'
+ version = '3.0.0-SNAPSHOT'
 
  // Force using a newer version, due to guava vulnerability CVE-2023-2976. Remove after Gradle upgrades its default version.
  checkstyle {
@@ -35,9 +35,9 @@ subprojects {
  apply plugin: 'com.diffplug.spotless'
 
  ext {
- opensearch_version = System.getProperty("opensearch.version", "2.16.0-SNAPSHOT")
+ opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
  sdk_version = "3.24.0"
- jackson_version = "2.17.1"
+ jackson_version = "2.17.2"
  }
 
  repositories {

oci-objectstorage-fixture/build.gradle

@@ -1,3 +1,16 @@
+buildscript {
+ repositories {
+ mavenLocal()
+ maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
+ mavenCentral()
+ maven { url "https://plugins.gradle.org/m2/" }
+ }
+
+ dependencies {
+ classpath "org.opensearch.gradle:build-tools:${opensearch_version}"
+ }
+}
+
 plugins {
  id 'java-library'
  id 'java'

oci-repository-plugin/src/test/java/org/opensearch/repositories/oci/OciObjectStoragePluginTests.java

@@ -34,7 +34,7 @@
 import org.opensearch.plugins.Plugin;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.test.OpenSearchIntegTestCase;
-import org.opensearch.transport.Netty4Plugin;
+import org.opensearch.transport.Netty4ModulePlugin;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -62,7 +62,7 @@ protected boolean addMockHttpTransport() {
  @Override
  protected Collection<Class<? extends Plugin>> nodePlugins() {
  return Collections.unmodifiableCollection(
- Lists.newArrayList(Netty4Plugin.class, OciObjectStoragePlugin.class));
+ Lists.newArrayList(Netty4ModulePlugin.class, OciObjectStoragePlugin.class));
  }
  /** ******************************* */
  @Test