From 75a8bf5236e99f69654eb3287090f2b3038e46d0 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 5 Jun 2023 09:48:17 -0400 Subject: [PATCH 1/3] Match version of zstd-jni from core Signed-off-by: Craig Perkins --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b50a730307..832aa877de 100644 --- a/build.gradle +++ b/build.gradle @@ -285,6 +285,7 @@ configurations.all { force "io.netty:netty-transport:${versions.netty}" force "io.netty:netty-transport-native-unix-common:${versions.netty}" force "org.apache.bcel:bcel:6.6.0" // This line should be removed once Spotbugs is upgraded to 4.7.4 + force "com.github.luben:zstd-jni:${versions.zstd}" } } @@ -365,7 +366,7 @@ dependencies { runtimeOnly 'com.fasterxml.woodstox:woodstox-core:6.4.0' runtimeOnly 'org.apache.ws.xmlschema:xmlschema-core:2.2.5' runtimeOnly 'org.apache.santuario:xmlsec:2.2.3' - runtimeOnly 'com.github.luben:zstd-jni:1.5.2-1' + runtimeOnly "com.github.luben:zstd-jni:${versions.zstd}" runtimeOnly 'org.checkerframework:checker-qual:3.5.0' runtimeOnly "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}" From 675dd74e6959b525e1dcb373425be335e8029679 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 9 Jun 2023 17:16:42 -0400 Subject: [PATCH 2/3] Increment version to 2.9.0 Signed-off-by: Craig Perkins --- .github/workflows/plugin_install.yml | 2 +- build.gradle | 2 +- bwc-test/build.gradle | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml index 768bac1b0b..6cbdf2d61c 100644 --- a/.github/workflows/plugin_install.yml +++ b/.github/workflows/plugin_install.yml @@ -3,7 +3,7 @@ name: Plugin Install on: [push, pull_request, workflow_dispatch] env: - OPENSEARCH_VERSION: 2.8.0 + OPENSEARCH_VERSION: 2.9.0 PLUGIN_NAME: opensearch-security jobs: diff --git a/build.gradle b/build.gradle index 832aa877de..6be75216d9 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ import org.opensearch.gradle.test.RestIntegTestTask buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "2.8.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.9.0-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") buildVersionQualifier = System.getProperty("build.version_qualifier", "") diff --git a/bwc-test/build.gradle b/bwc-test/build.gradle index 0203935103..81732df698 100644 --- a/bwc-test/build.gradle +++ b/bwc-test/build.gradle @@ -47,7 +47,7 @@ ext { buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "2.8.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.9.0-SNAPSHOT") opensearch_group = "org.opensearch" } repositories { @@ -73,16 +73,16 @@ dependencies { testImplementation "org.opensearch.test:framework:${opensearch_version}" } -String bwcVersion = "2.6.0.0"; +String bwcVersion = "2.8.0.0"; String baseName = "securityBwcCluster" String bwcFilePath = "src/test/resources/" -String projectVersion = "2.8.0.0" +String projectVersion = "2.9.0.0" 2.times {i -> testClusters { "${baseName}$i" { testDistribution = "ARCHIVE" - versions = ["2.6.0","2.8.0"] + versions = ["2.8.0","2.9.0"] numberOfNodes = 3 plugin(provider(new Callable() { @Override From a24ad13beff6b67b9ad997cd49b87ca7b82127b4 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 9 Jun 2023 17:25:50 -0400 Subject: [PATCH 3/3] bump spotless Signed-off-by: Craig Perkins --- build.gradle | 2 +- bwc-test/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 6be75216d9..bb86b24cfb 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ plugins { id 'idea' id 'jacoco' id 'maven-publish' - id 'com.diffplug.spotless' version '6.16.0' + id 'com.diffplug.spotless' version '6.19.0' id 'checkstyle' id 'com.netflix.nebula.ospackage' version "11.0.0" id "org.gradle.test-retry" version "1.5.2" diff --git a/bwc-test/build.gradle b/bwc-test/build.gradle index 81732df698..a24a8815c9 100644 --- a/bwc-test/build.gradle +++ b/bwc-test/build.gradle @@ -73,7 +73,7 @@ dependencies { testImplementation "org.opensearch.test:framework:${opensearch_version}" } -String bwcVersion = "2.8.0.0"; +String bwcVersion = "2.6.0.0"; String baseName = "securityBwcCluster" String bwcFilePath = "src/test/resources/" String projectVersion = "2.9.0.0" @@ -82,7 +82,7 @@ String projectVersion = "2.9.0.0" testClusters { "${baseName}$i" { testDistribution = "ARCHIVE" - versions = ["2.8.0","2.9.0"] + versions = ["2.6.0","2.9.0"] numberOfNodes = 3 plugin(provider(new Callable() { @Override