Skip to content

Commit

Permalink
Update main to 3.0.0 baseline
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <[email protected]>
  • Loading branch information
reta committed Jul 11, 2024
1 parent 9c802f6 commit eff6699
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 7 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
@@ -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
11 changes: 9 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
14 changes: 14 additions & 0 deletions oci-objectstorage-fixture/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
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'
}

apply plugin: 'opensearch.repositories'
apply plugin: 'io.freefair.lombok'
apply plugin: 'java'
apply plugin: 'java-library'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit eff6699

Please sign in to comment.