diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml index e6aa611947..c281a7fbc4 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.9.0 + OPENSEARCH_VERSION: 2.10.0 PLUGIN_NAME: opensearch-security jobs: diff --git a/build.gradle b/build.gradle index fd70351cd5..1817f3c0d7 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ import groovy.json.JsonBuilder buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "2.9.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.10.0-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") buildVersionQualifier = System.getProperty("build.version_qualifier", "") @@ -25,6 +25,7 @@ buildscript { common_utils_version = System.getProperty("common_utils.version", '2.9.0.0-SNAPSHOT') kafka_version = '3.5.0' jaxb_version = '2.3.8' + guava_version = '32.1.1-jre' if (buildVersionQualifier) { opensearch_build += "-${buildVersionQualifier}" @@ -35,8 +36,8 @@ buildscript { } repositories { - mavenCentral() mavenLocal() + mavenCentral() maven { url "https://plugins.gradle.org/m2/" } maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } maven { url "https://d1nvenhzbhpy0q.cloudfront.net/snapshots/lucene/" } @@ -365,8 +366,8 @@ publishing { } repositories { - mavenCentral() mavenLocal() + mavenCentral() maven { url "https://plugins.gradle.org/m2/" } maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } maven { url "https://d1nvenhzbhpy0q.cloudfront.net/snapshots/lucene/" } @@ -422,14 +423,14 @@ configurations.all { 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}" force "org.xerial.snappy:snappy-java:1.1.10.1" - force 'com.google.guava:guava:32.0.1-jre' + force "com.google.guava:guava:${guava_version}" } } dependencies { implementation "org.opensearch.plugin:transport-netty4-client:${opensearch_version}" implementation "org.opensearch.client:opensearch-rest-high-level-client:${opensearch_version}" - implementation 'com.google.guava:guava:32.0.1-jre' + implementation "com.google.guava:guava:${guava_version}" implementation 'org.greenrobot:eventbus:3.2.0' implementation 'commons-cli:commons-cli:1.5.0' implementation "org.bouncycastle:bcprov-jdk15to18:${versions.bouncycastle}" @@ -490,11 +491,10 @@ dependencies { runtimeOnly "org.glassfish.jaxb:jaxb-runtime:${jaxb_version}" runtimeOnly 'com.google.j2objc:j2objc-annotations:1.3' runtimeOnly 'com.google.code.findbugs:jsr305:3.0.2' - runtimeOnly 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' runtimeOnly 'org.lz4:lz4-java:1.8.0' runtimeOnly 'io.dropwizard.metrics:metrics-core:3.1.2' runtimeOnly 'org.slf4j:slf4j-api:1.7.30' - runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1' + runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}" runtimeOnly 'org.xerial.snappy:snappy-java:1.1.10.1' runtimeOnly 'org.codehaus.woodstox:stax2-api:4.2.1' runtimeOnly "org.glassfish.jaxb:txw2:${jaxb_version}" @@ -514,7 +514,7 @@ dependencies { testImplementation "org.opensearch.plugin:lang-mustache-client:${opensearch_version}" testImplementation "org.opensearch.plugin:parent-join-client:${opensearch_version}" testImplementation "org.opensearch.plugin:aggs-matrix-stats-client:${opensearch_version}" - testImplementation 'org.apache.logging.log4j:log4j-core:2.17.1' + testImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}" testImplementation 'commons-io:commons-io:2.7' testImplementation 'javax.servlet:servlet-api:2.5' testImplementation 'com.unboundid:unboundid-ldapsdk:4.0.9'