diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml index 891dcb9cb0..e19db4e6f0 100644 --- a/.github/workflows/draft-release-notes-workflow.yml +++ b/.github/workflows/draft-release-notes-workflow.yml @@ -16,6 +16,6 @@ jobs: with: config-name: draft-release-notes-config.yml tag: (None) - version: 1.3.0.0 + version: 1.3.1.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml index 7097475aa6..6740635c1b 100644 --- a/.github/workflows/sql-test-and-build-workflow.yml +++ b/.github/workflows/sql-test-and-build-workflow.yml @@ -3,7 +3,7 @@ name: SQL Java CI on: [push, pull_request] env: - OPENSEARCH_VERSION: '1.3.0-SNAPSHOT' + OPENSEARCH_VERSION: '1.3.4-SNAPSHOT' jobs: build: diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml index a534dac831..e2ca0012fb 100644 --- a/.github/workflows/sql-workbench-test-and-build-workflow.yml +++ b/.github/workflows/sql-workbench-test-and-build-workflow.yml @@ -4,8 +4,8 @@ on: [pull_request, push] env: PLUGIN_NAME: query-workbench-dashboards - OPENSEARCH_VERSION: '1.x' - OPENSEARCH_PLUGIN_VERSION: 1.3.0.0 + OPENSEARCH_VERSION: '1.3' + OPENSEARCH_PLUGIN_VERSION: 1.3.4.0 jobs: diff --git a/build.gradle b/build.gradle index cb140922eb..a0d351666c 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "1.3.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.3.4-SNAPSHOT") } repositories { diff --git a/core/build.gradle b/core/build.gradle index 32a14bad3b..17bb1e1a71 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -40,8 +40,8 @@ repositories { dependencies { compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' - compile group: 'org.springframework', name: 'spring-context', version: '5.2.19.RELEASE' - compile group: 'org.springframework', name: 'spring-beans', version: '5.2.19.RELEASE' + compile group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE' + compile group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' compile group: 'com.facebook.presto', name: 'presto-matching', version: '0.240' compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1' @@ -49,7 +49,7 @@ dependencies { testImplementation('org.junit.jupiter:junit-jupiter:5.6.2') testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1' - testCompile group: 'org.springframework', name: 'spring-test', version: '5.2.19.RELEASE' + testCompile group: 'org.springframework', name: 'spring-test', version: '5.2.20.RELEASE' testCompile group: 'org.mockito', name: 'mockito-core', version: '3.3.3' testCompile group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.3.3' } diff --git a/doctest/build.gradle b/doctest/build.gradle index f310806147..d889287bef 100644 --- a/doctest/build.gradle +++ b/doctest/build.gradle @@ -48,6 +48,9 @@ doctest.finalizedBy stopOpenSearch build.dependsOn doctest clean.dependsOn(cleanBootstrap) +String mlCommonsRemoteFile = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.4/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-ml-1.3.4.0.zip' +String mlCommonsPlugin = "ml-commons" + testClusters { docTestCluster { plugin(provider(new Callable(){ @@ -56,7 +59,15 @@ testClusters { return new RegularFile() { @Override File getAsFile() { - return fileTree("resources/ml-commons").getSingleFile() + File dir = new File('./doctest/' + mlCommonsPlugin) + if (!dir.exists()) { + dir.mkdirs() + } + File f = new File(mlCommonsPlugin, dir) + if (!f.exists()) { + new URL(mlCommonsRemoteFile).withInputStream{ ins -> f.withOutputStream{ it << ins }} + } + return fileTree(mlCommonsPlugin).getSingleFile() } } } diff --git a/doctest/resources/ml-commons/opensearch-ml-1.3.3.0-SNAPSHOT.zip b/doctest/resources/ml-commons/opensearch-ml-1.3.3.0-SNAPSHOT.zip new file mode 100644 index 0000000000..3c8be74f4f Binary files /dev/null and b/doctest/resources/ml-commons/opensearch-ml-1.3.3.0-SNAPSHOT.zip differ diff --git a/integ-test/build.gradle b/integ-test/build.gradle index 6079eede9f..3a828d8677 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -52,8 +52,6 @@ configurations.all { // enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379 resolutionStrategy.force 'commons-codec:commons-codec:1.13' resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre' - resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.12.6' - resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.6' } dependencies { diff --git a/opensearch/build.gradle b/opensearch/build.gradle index eed277d938..a7814de228 100644 --- a/opensearch/build.gradle +++ b/opensearch/build.gradle @@ -32,12 +32,12 @@ dependencies { compile project(':core') compile group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}" compile "io.github.resilience4j:resilience4j-retry:1.5.0" - compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.6' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.6' - compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.12.6' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.2' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2' + compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.2' compile group: 'org.json', name: 'json', version:'20180813' compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}" - compile group: 'org.opensearch', name:'opensearch-ml-client', version: '1.3.0.0-SNAPSHOT' + compile group: 'org.opensearch', name:'opensearch-ml-client', version: '1.3.4.0-SNAPSHOT' testImplementation('org.junit.jupiter:junit-jupiter:5.6.2') testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1' diff --git a/plugin/build.gradle b/plugin/build.gradle index b934a804a3..f6aa1fd63c 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -56,16 +56,13 @@ configurations.all { resolutionStrategy.force 'junit:junit:4.13.2' // conflict with spring-jcl exclude group: "commons-logging", module: "commons-logging" - // enforce 2.12.6, https://github.com/opensearch-project/sql/issues/424 - resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.12.6' // enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379 resolutionStrategy.force 'commons-codec:commons-codec:1.13' resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre' - resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.6' } dependencies { - compile group: 'org.springframework', name: 'spring-beans', version: '5.2.19.RELEASE' + compile group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' compile project(":ppl") compile project(':legacy') compile project(':opensearch') diff --git a/ppl/build.gradle b/ppl/build.gradle index 4b88c000fe..4b0d361555 100644 --- a/ppl/build.gradle +++ b/ppl/build.gradle @@ -48,8 +48,8 @@ dependencies { compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' compile group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}" compile group: 'org.json', name: 'json', version: '20180813' - compile group: 'org.springframework', name: 'spring-context', version: '5.2.19.RELEASE' - compile group: 'org.springframework', name: 'spring-beans', version: '5.2.19.RELEASE' + compile group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE' + compile group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1' compile project(':common') compile project(':core') diff --git a/protocol/build.gradle b/protocol/build.gradle index 5e1464a0a4..c77a50ec87 100644 --- a/protocol/build.gradle +++ b/protocol/build.gradle @@ -30,9 +30,9 @@ plugins { dependencies { compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.6' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.6' - compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.12.6' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.2' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2' + compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.2' implementation 'com.google.code.gson:gson:2.8.9' compile project(':core') compile project(':opensearch') diff --git a/sql-jdbc/docs/img/tableau_graph.PNG b/sql-jdbc/docs/img/tableau_graph.PNG deleted file mode 100644 index 40437a1067..0000000000 Binary files a/sql-jdbc/docs/img/tableau_graph.PNG and /dev/null differ diff --git a/sql/build.gradle b/sql/build.gradle index 1acb115137..e49810fb5f 100644 --- a/sql/build.gradle +++ b/sql/build.gradle @@ -47,8 +47,8 @@ dependencies { compile "org.antlr:antlr4-runtime:4.7.1" implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' compile group: 'org.json', name: 'json', version:'20180813' - compile group: 'org.springframework', name: 'spring-context', version: '5.2.19.RELEASE' - compile group: 'org.springframework', name: 'spring-beans', version: '5.2.19.RELEASE' + compile group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE' + compile group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' compile project(':common') compile project(':core') compile project(':protocol') diff --git a/workbench/opensearch_dashboards.json b/workbench/opensearch_dashboards.json index 339e6c6c56..235aafe0b8 100644 --- a/workbench/opensearch_dashboards.json +++ b/workbench/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "queryWorkbenchDashboards", - "version": "1.3.0.0", - "opensearchDashboardsVersion": "1.3.0", + "version": "1.3.4.0", + "opensearchDashboardsVersion": "1.3.4", "server": true, "ui": true, "requiredPlugins": ["navigation"], diff --git a/workbench/package.json b/workbench/package.json index d53daaabb3..4082fa9061 100644 --- a/workbench/package.json +++ b/workbench/package.json @@ -1,14 +1,10 @@ { "name": "opensearch-query-workbench", - "version": "1.3.0.0", + "version": "1.3.4.0", "description": "Query Workbench", "main": "index.js", "license": "Apache-2.0", "homepage": "https://github.com/opensearch-project/sql/tree/main/workbench", - "opensearchDashboards": { - "version": "1.3.0", - "templateVersion": "1.0.0" - }, "repository": { "type": "git", "url": "https://github.com/opensearch-project/sql/tree/main/workbench" diff --git a/workbench/yarn.lock b/workbench/yarn.lock index 07ac016f23..d87a3582f2 100644 --- a/workbench/yarn.lock +++ b/workbench/yarn.lock @@ -2297,10 +2297,10 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= -semver-regex@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz#b2bcc6f97f63269f286994e297e229b6245d0dc3" - integrity sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ== +semver-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338" + integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw== semver@7.x: version "7.3.4"