From ac4686849437691c96d770424485c0865fbdd17b Mon Sep 17 00:00:00 2001 From: Sayali Rohidas Gaikawad Date: Wed, 13 Jul 2022 22:11:09 +0000 Subject: [PATCH] Incremented version to 2.1.1. Signed-off-by: Sayali Rohidas Gaikawad --- build.gradle | 2 +- legacy/build.gradle | 2 +- opensearch/build.gradle | 2 +- ppl/build.gradle | 2 +- sql-jdbc/build.gradle | 4 ++-- sql/build.gradle | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 30c7a9a52a..f939461081 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.1.1-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") buildVersionQualifier = System.getProperty("build.version_qualifier", "") version_tokens = opensearch_version.tokenize('-') diff --git a/legacy/build.gradle b/legacy/build.gradle index f605ced7ba..89006df6fc 100644 --- a/legacy/build.gradle +++ b/legacy/build.gradle @@ -89,7 +89,7 @@ dependencies { } } implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' - implementation group: 'org.json', name: 'json', version:'20180813' + implementation group: 'org.json', name: 'json', version:'2.1.1813' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}" api project(':sql') diff --git a/opensearch/build.gradle b/opensearch/build.gradle index e448933005..b7f070c2a3 100644 --- a/opensearch/build.gradle +++ b/opensearch/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.2' implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2.2' implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.2' - implementation group: 'org.json', name: 'json', version:'20180813' + implementation group: 'org.json', name: 'json', version:'2.1.1813' compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}" implementation group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}" diff --git a/ppl/build.gradle b/ppl/build.gradle index c4becfa3d8..9c3754c586 100644 --- a/ppl/build.gradle +++ b/ppl/build.gradle @@ -47,7 +47,7 @@ dependencies { implementation "org.antlr:antlr4-runtime:4.7.1" implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' api group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}" - api group: 'org.json', name: 'json', version: '20180813' + api group: 'org.json', name: 'json', version: '2.1.1813' implementation group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE' implementation group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1' diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle index 0937619dc1..12351cdfda 100644 --- a/sql-jdbc/build.gradle +++ b/sql-jdbc/build.gradle @@ -24,7 +24,7 @@ plugins { group 'org.opensearch.client' // keep version in sync with version in Driver source -version '2.1.0.0' +version '2.1.1.0' boolean snapshot = "true".equals(System.getProperty("build.snapshot", "false")); if (snapshot) { @@ -55,7 +55,7 @@ dependencies { testImplementation('org.mockito:mockito-core:2.23.0') testImplementation('org.junit.jupiter:junit-jupiter-engine:5.3.1') testImplementation('org.junit-pioneer:junit-pioneer:0.3.0') - testImplementation('org.eclipse.jetty:jetty-server:9.2.24.v20180105') + testImplementation('org.eclipse.jetty:jetty-server:9.2.24.v2.1.1105') testRuntimeOnly('org.slf4j:slf4j-simple:1.7.25') // capture WireMock logging } diff --git a/sql/build.gradle b/sql/build.gradle index d04e28c03d..c046a3ff9c 100644 --- a/sql/build.gradle +++ b/sql/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation "org.antlr:antlr4-runtime:4.7.1" implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' - implementation group: 'org.json', name: 'json', version:'20180813' + implementation group: 'org.json', name: 'json', version:'2.1.1813' implementation group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE' implementation group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' implementation project(':common')