From f3f0e8bb85f403e86011e95524abf3afaf9d48b2 Mon Sep 17 00:00:00 2001 From: David Cui <53581635+davidcui-amzn@users.noreply.github.com> Date: Thu, 4 Feb 2021 18:23:10 -0800 Subject: [PATCH 1/7] Workflow Fix for JDBC & Workbench (#1031) --- .github/workflows/sql-jdbc-release-workflow.yml | 11 +++++++++-- .github/workflows/sql-workbench-release-workflow.yml | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sql-jdbc-release-workflow.yml b/.github/workflows/sql-jdbc-release-workflow.yml index 4eaf5be43f..0c1a2603ae 100644 --- a/.github/workflows/sql-jdbc-release-workflow.yml +++ b/.github/workflows/sql-jdbc-release-workflow.yml @@ -24,8 +24,8 @@ jobs: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 with: - aws-access-key-id: ${{ secrets.AWS_STAGING_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_STAGING_SECRET_ACCESS_KEY }} + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 - name: Setup Java ${{ matrix.java }} @@ -37,6 +37,13 @@ jobs: run: | ./gradlew publishShadowPublicationToInternal-releasesRepository '-Dorg.gradle.jvmargs=--add-modules java.xml.bind' -Dbuild.snapshot=false + - name: Configure Staging AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_STAGING_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_STAGING_SECRET_ACCESS_KEY }} + aws-region: us-east-1 + - name: Publish to S3 shell: bash run: | diff --git a/.github/workflows/sql-workbench-release-workflow.yml b/.github/workflows/sql-workbench-release-workflow.yml index 785b38bb7c..ebca361215 100644 --- a/.github/workflows/sql-workbench-release-workflow.yml +++ b/.github/workflows/sql-workbench-release-workflow.yml @@ -59,12 +59,13 @@ jobs: - name: Upload to S3 shell: bash run: | + cd kibana/plugins/workbench zip=`ls ./build/*.zip` # Inject the build number before the suffix zip_outfile=`basename ${zip%.zip}-build-${GITHUB_RUN_NUMBER}.zip` - s3_prefix="s3://staging.artifacts.opendistroforelasticsearch.amazon.com/snapshots/kibana-plugins/sql-workbench/" + s3_prefix="s3://staging.artifacts.opendistroforelasticsearch.amazon.com/snapshots/kibana-plugins/query-workbench/" echo "Copying ${zip} to ${s3_prefix}${zip_outfile}" aws s3 cp --quiet $zip ${s3_prefix}${zip_outfile} From 30f97a87af7b33365b05caf0cc93194e3833a57f Mon Sep 17 00:00:00 2001 From: David Cui <53581635+davidcui-amzn@users.noreply.github.com> Date: Wed, 10 Feb 2021 15:51:26 -0800 Subject: [PATCH 2/7] Merge Cypress Fix into 1.13 Release Branch (#1041) Update PPL docs, cypress test and nested field display --- docs/experiment/ppl/cmd/rare.rst | 2 +- docs/experiment/ppl/cmd/sort.rst | 19 ++++++++++++++++++- docs/experiment/ppl/cmd/stats.rst | 4 ++-- .../data/utils/ElasticsearchJsonContent.java | 2 +- .../ElasticsearchExprValueFactoryTest.java | 5 +++++ workbench/.cypress/integration/ui.spec.js | 11 ++++++++--- workbench/.cypress/utils/constants.js | 8 ++++---- 7 files changed, 39 insertions(+), 12 deletions(-) diff --git a/docs/experiment/ppl/cmd/rare.rst b/docs/experiment/ppl/cmd/rare.rst index 90611b408c..5450a794f9 100644 --- a/docs/experiment/ppl/cmd/rare.rst +++ b/docs/experiment/ppl/cmd/rare.rst @@ -13,7 +13,7 @@ Description ============ | Using ``rare`` command to find the least common tuple of values of all fields in the field list. -A maximum of 10 results is returned for each distinct tuple of values of the group-by fields. +**Note**: A maximum of 10 results is returned for each distinct tuple of values of the group-by fields. Syntax ============ diff --git a/docs/experiment/ppl/cmd/sort.rst b/docs/experiment/ppl/cmd/sort.rst index 2c83c15b7d..022fa54f7e 100644 --- a/docs/experiment/ppl/cmd/sort.rst +++ b/docs/experiment/ppl/cmd/sort.rst @@ -19,7 +19,7 @@ Syntax sort <[+|-] sort-field>... -* [+|-]: optional. The plus [+] for ascending order and a minus [-] for descending order. **Default:** ascending order. +* [+|-]: optional. The plus [+] stands for ascending order and NULL/MISSING first and a minus [-] stands for descending order and NULL/MISSING last. **Default:** ascending order and NULL/MISSING first. * sort-field: mandatory. The field used to sort. @@ -97,3 +97,20 @@ PPL query:: | 1 | M | 32 | +------------------+----------+-------+ +Example 4: Sort by field include null value +=========================================== + +The example show sort employer field by default option (ascending order and null first), the result show that null value is in the first row. + +PPL query:: + + od> source=accounts | sort employer | fields employer; + fetched rows / total rows = 4/4 + +------------+ + | employer | + |------------| + | null | + | Netagy | + | Pyrami | + | Quility | + +------------+ diff --git a/docs/experiment/ppl/cmd/stats.rst b/docs/experiment/ppl/cmd/stats.rst index 88e8d6ce94..ea8cd82c8f 100644 --- a/docs/experiment/ppl/cmd/stats.rst +++ b/docs/experiment/ppl/cmd/stats.rst @@ -13,7 +13,7 @@ Description ============ | Using ``stats`` command to calculate the aggregation from search result. -The following table catalogs the aggregation functions and also indicates how each one handles NULL/MISSING values is handled: +The following table catalogs the aggregation functions and also indicates how the NULL/MISSING values is handled: +----------+-------------+-------------+ | Function | NULL | MISSING | @@ -35,7 +35,7 @@ Syntax stats ... [by-clause]... -* aggregation: mandatory. A statistical aggregation function. The argument of aggregation must be field. +* aggregation: mandatory. A aggregation function. The argument of aggregation must be field. * by-clause: optional. The one or more fields to group the results by. **Default**: If no is specified, the stats command returns only one row, which is the aggregation over the entire result set. Example 1: Calculate the count of events diff --git a/elasticsearch/src/main/java/com/amazon/opendistroforelasticsearch/sql/elasticsearch/data/utils/ElasticsearchJsonContent.java b/elasticsearch/src/main/java/com/amazon/opendistroforelasticsearch/sql/elasticsearch/data/utils/ElasticsearchJsonContent.java index dd6bf6330c..e5b0ae64cb 100644 --- a/elasticsearch/src/main/java/com/amazon/opendistroforelasticsearch/sql/elasticsearch/data/utils/ElasticsearchJsonContent.java +++ b/elasticsearch/src/main/java/com/amazon/opendistroforelasticsearch/sql/elasticsearch/data/utils/ElasticsearchJsonContent.java @@ -90,7 +90,7 @@ public Iterator array() { @Override public boolean isNull() { - return value == null || value.isNull(); + return value == null || value.isNull() || (value.isArray() && value.isEmpty()); } @Override diff --git a/elasticsearch/src/test/java/com/amazon/opendistroforelasticsearch/sql/elasticsearch/data/value/ElasticsearchExprValueFactoryTest.java b/elasticsearch/src/test/java/com/amazon/opendistroforelasticsearch/sql/elasticsearch/data/value/ElasticsearchExprValueFactoryTest.java index f4e8b816f7..9fb03562bb 100644 --- a/elasticsearch/src/test/java/com/amazon/opendistroforelasticsearch/sql/elasticsearch/data/value/ElasticsearchExprValueFactoryTest.java +++ b/elasticsearch/src/test/java/com/amazon/opendistroforelasticsearch/sql/elasticsearch/data/value/ElasticsearchExprValueFactoryTest.java @@ -105,6 +105,11 @@ public void constructNullValue() { assertTrue(new ElasticsearchJsonContent(null).isNull()); } + @Test + public void constructNullArrayValue() { + assertEquals(nullValue(), tupleValue("{\"intV\":[]}").get("intV")); + } + @Test public void constructByte() { assertEquals(byteValue((byte) 1), tupleValue("{\"byteV\":1}").get("byteV")); diff --git a/workbench/.cypress/integration/ui.spec.js b/workbench/.cypress/integration/ui.spec.js index 11f03c8598..43301c047f 100644 --- a/workbench/.cypress/integration/ui.spec.js +++ b/workbench/.cypress/integration/ui.spec.js @@ -133,7 +133,7 @@ describe('Test SQL UI', () => { cy.wait(delay); // hard to get euiCodeBlock content, check length instead - cy.get('.euiCodeBlock__code').children().should('have.length', 37); + cy.get('.euiCodeBlock__code').children().should('have.length', 13); }); it('Test Clear button', () => { @@ -175,7 +175,12 @@ describe('Test and verify SQL downloads', () => { 'query': 'select * from accounts where balance > 49500' } }).then((response) => { - expect(response.body.data.resp).to.have.string(files[file]); + if (title === 'Download and verify CSV') { + expect(response.body.data.body).to.have.string(files[file]); + } + else { + expect(response.body.data.resp).to.have.string(files[file]); + } }); }); }); @@ -223,7 +228,7 @@ describe('Test table display', () => { cy.get('span.euiTableCellContent__text') .eq(24) .should((cell) => { - expect(cell).to.contain('2018-06-23'); + expect(cell).to.contain('comment_2_1'); }); }); }); diff --git a/workbench/.cypress/utils/constants.js b/workbench/.cypress/utils/constants.js index 9f696d0244..069c0e9b35 100644 --- a/workbench/.cypress/utils/constants.js +++ b/workbench/.cypress/utils/constants.js @@ -43,19 +43,19 @@ export const testQueries = [ title: 'Test GROUP BY', query: 'select count(*) from accounts group by gender;', cell_idx: 3, - expected_string: '507' + expected_string: '493' }, { title: 'Test GROUP BY with aliases and scalar function', query: 'SELECT ABS(age) AS a FROM accounts GROUP BY ABS(age);', cell_idx: 17, - expected_string: '28.0' + expected_string: '27' }, { title: 'Test GROUP BY and HAVING', query: 'SELECT age, MAX(balance) FROM accounts GROUP BY age HAVING MIN(balance) > 3000;', cell_idx: 5, - expected_string: '47257' + expected_string: '49119' }, { title: 'Test ORDER BY', @@ -75,7 +75,7 @@ export const files = { JSONFile: `"hits":[{"_index":"accounts","_type":"_doc","_id":"842","_score":0,"_source":{"account_number":842,"balance":49587,"firstname":"Meagan","lastname":"Buckner","age":23,"gender":"F","address":"833 Bushwick Court","employer":"Biospan","email":"meaganbuckner@biospan.com","city":"Craig","state":"TX"}},{"_index":"accounts","_type":"_doc","_id":"854","_score":0,"_source":{"account_number":854,"balance":49795,"firstname":"Jimenez","lastname":"Barry","age":25,"gender":"F","address":"603 Cooper Street","employer":"Verton","email":"jimenezbarry@verton.com","city":"Moscow","state":"AL"}},{"_index":"accounts","_type":"_doc","_id":"97","_score":0,"_source":{"account_number":97,"balance":49671,"firstname":"Karen","lastname":"Trujillo","age":40,"gender":"F","address":"512 Cumberland Walk","employer":"Tsunamia","email":"karentrujillo@tsunamia.com","city":"Fredericktown","state":"MO"}},{"_index":"accounts","_type":"_doc","_id":"168","_score":0,"_source":{"account_number":168,"balance":49568,"firstname":"Carissa","lastname":"Simon","age":20,"gender":"M","address":"975 Flatbush Avenue","employer":"Zillacom","email":"carissasimon@zillacom.com","city":"Neibert","state":"IL"}},{"_index":"accounts","_type":"_doc","_id":"240","_score":0,"_source":{"account_number":240,"balance":49741,"firstname":"Oconnor","lastname":"Clay","age":35,"gender":"F","address":"659 Highland Boulevard","employer":"Franscene","email":"oconnorclay@franscene.com","city":"Kilbourne","state":"NH"}},{"_index":"accounts","_type":"_doc","_id":"803","_score":0,"_source":{"account_number":803,"balance":49567,"firstname":"Marissa","lastname":"Spears","age":25,"gender":"M","address":"963 Highland Avenue","employer":"Centregy","email":"marissaspears@centregy.com","city":"Bloomington","state":"MS"}},{"_index":"accounts","_type":"_doc","_id":"248","_score":0,"_source":{"account_number":248,"balance":49989,"firstname":"West","lastname":"England","age":36,"gender":"M","address":"717 Hendrickson Place","employer":"Obliq","email":"westengland@obliq.com","city":"Maury","state":"WA"}}]`, JDBCFile: - `{"schema":[{"name":"account_number","type":"long"},{"name":"firstname","type":"text"},{"name":"gender","type":"text"},{"name":"city","type":"text"},{"name":"balance","type":"long"},{"name":"employer","type":"text"},{"name":"state","type":"text"},{"name":"email","type":"text"},{"name":"address","type":"text"},{"name":"lastname","type":"text"},{"name":"age","type":"long"}],"total":7,"datarows":[[842,"Meagan","F","Craig",49587,"Biospan","TX","meaganbuckner@biospan.com","833 Bushwick Court","Buckner",23],[854,"Jimenez","F","Moscow",49795,"Verton","AL","jimenezbarry@verton.com","603 Cooper Street","Barry",25],[97,"Karen","F","Fredericktown",49671,"Tsunamia","MO","karentrujillo@tsunamia.com","512 Cumberland Walk","Trujillo",40],[168,"Carissa","M","Neibert",49568,"Zillacom","IL","carissasimon@zillacom.com","975 Flatbush Avenue","Simon",20],[240,"Oconnor","F","Kilbourne",49741,"Franscene","NH","oconnorclay@franscene.com","659 Highland Boulevard","Clay",35],[803,"Marissa","M","Bloomington",49567,"Centregy","MS","marissaspears@centregy.com","963 Highland Avenue","Spears",25],[248,"West","M","Maury",49989,"Obliq","WA","westengland@obliq.com","717 Hendrickson Place","England",36]],"size":7,"status":200}`, + `{"schema":[{"name":"account_number","type":"long"},{"name":"firstname","type":"text"},{"name":"address","type":"text"},{"name":"balance","type":"long"},{"name":"gender","type":"text"},{"name":"city","type":"text"},{"name":"employer","type":"text"},{"name":"state","type":"text"},{"name":"age","type":"long"},{"name":"email","type":"text"},{"name":"lastname","type":"text"}],"datarows":[[842,"Meagan","833 Bushwick Court",49587,"F","Craig","Biospan","TX",23,"meaganbuckner@biospan.com","Buckner"],[854,"Jimenez","603 Cooper Street",49795,"F","Moscow","Verton","AL",25,"jimenezbarry@verton.com","Barry"],[97,"Karen","512 Cumberland Walk",49671,"F","Fredericktown","Tsunamia","MO",40,"karentrujillo@tsunamia.com","Trujillo"],[168,"Carissa","975 Flatbush Avenue",49568,"M","Neibert","Zillacom","IL",20,"carissasimon@zillacom.com","Simon"],[240,"Oconnor","659 Highland Boulevard",49741,"F","Kilbourne","Franscene","NH",35,"oconnorclay@franscene.com","Clay"],[803,"Marissa","963 Highland Avenue",49567,"M","Bloomington","Centregy","MS",25,"marissaspears@centregy.com","Spears"],[248,"West","717 Hendrickson Place",49989,"M","Maury","Obliq","WA",36,"westengland@obliq.com","England"]],"total":7,"size":7,"status":200}`, CSVFile: `account_number,firstname,address,balance,gender,city,employer,state,age,email,lastname 842,Meagan,833 Bushwick Court,49587,F,Craig,Biospan,TX,23,meaganbuckner@biospan.com,Buckner From 447e8fa1017fd08da325548f52ac90a9c12db051 Mon Sep 17 00:00:00 2001 From: David Cui <53581635+davidcui-amzn@users.noreply.github.com> Date: Thu, 11 Feb 2021 16:15:32 -0800 Subject: [PATCH 3/7] odfe security fix (#1048) --- .../sql/legacy/ODFERestTestCase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/legacy/ODFERestTestCase.java b/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/legacy/ODFERestTestCase.java index 87c65ab453..9007e2cd01 100644 --- a/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/legacy/ODFERestTestCase.java +++ b/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/legacy/ODFERestTestCase.java @@ -71,7 +71,7 @@ protected RestClient buildClient(Settings settings, HttpHost[] hosts) throws IOE configureClient(builder, settings); } - builder.setStrictDeprecationMode(true); + builder.setStrictDeprecationMode(false); return builder.build(); } @@ -84,7 +84,7 @@ protected static void wipeAllODFEIndices() throws IOException { JSONObject jsonObject = (JSONObject) object; String indexName = jsonObject.getString("index"); //.opendistro_security isn't allowed to delete from cluster - if (!".opendistro_security".equals(indexName)) { + if (!indexName.startsWith(".kibana") && !indexName.startsWith(".opendistro")) { client().performRequest(new Request("DELETE", "/" + indexName)); } } From 28956de0148ceec2a1f26dc26324b2a9f3acb629 Mon Sep 17 00:00:00 2001 From: David Cui <53581635+davidcui-amzn@users.noreply.github.com> Date: Tue, 30 Mar 2021 12:10:05 -0700 Subject: [PATCH 4/7] merge in CVE fix on workbench --- workbench/package.json | 4 +++- workbench/yarn.lock | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/workbench/package.json b/workbench/package.json index f78cd6ab6b..0556154474 100644 --- a/workbench/package.json +++ b/workbench/package.json @@ -57,6 +57,8 @@ "**/@types/react-dom": "^16.0.5", "**/@types/react-router-dom": "^4.3.1", "eslint-utils": "^2.0.0", - "**/@types/react": "16.3.14" + "**/@types/react": "16.3.14", + "lodash": "^4.17.21", + "ssri": "8.0.1" } } \ No newline at end of file diff --git a/workbench/yarn.lock b/workbench/yarn.lock index 036705fbec..1a7c9851ca 100644 --- a/workbench/yarn.lock +++ b/workbench/yarn.lock @@ -3148,6 +3148,13 @@ minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minipass@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" + integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== + dependencies: + yallist "^4.0.0" + mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -4184,12 +4191,12 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -ssri@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" - integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== +ssri@8.0.1, ssri@^6.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" + integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== dependencies: - figgy-pudding "^3.5.1" + minipass "^3.1.1" static-extend@^0.1.1: version "0.1.2" From da16c7af7226573c2594a257aaf9a2e632bd8a19 Mon Sep 17 00:00:00 2001 From: David Cui <53581635+davidcui-amzn@users.noreply.github.com> Date: Tue, 16 Mar 2021 09:44:32 -0700 Subject: [PATCH 5/7] Bump jackson-dataformat-cbor Version (#1074) --- elasticsearch/build.gradle | 3 ++- integ-test/build.gradle | 1 + plugin/build.gradle | 1 + protocol/build.gradle | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/elasticsearch/build.gradle b/elasticsearch/build.gradle index fc499124f6..9b99c1789f 100644 --- a/elasticsearch/build.gradle +++ b/elasticsearch/build.gradle @@ -13,7 +13,8 @@ dependencies { compile group: 'org.elasticsearch', name: 'elasticsearch', version: "${es_version}" compile "io.github.resilience4j:resilience4j-retry:1.5.0" compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.10.5' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.5.1' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.4' + compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.11.4' compile group: 'org.json', name: 'json', version:'20180813' compileOnly group: 'org.elasticsearch.client', name: 'elasticsearch-rest-high-level-client', version: "${es_version}" diff --git a/integ-test/build.gradle b/integ-test/build.gradle index 6bf88ebbc4..e47372df07 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -29,6 +29,7 @@ configurations.all { resolutionStrategy.force 'commons-codec:commons-codec:1.13' resolutionStrategy.force 'com.google.guava:guava:29.0-jre' resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.10.5' + resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.4' } dependencies { diff --git a/plugin/build.gradle b/plugin/build.gradle index 2ef6a9de6c..c28f9bd954 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -35,6 +35,7 @@ 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:29.0-jre' + resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.4' } dependencies { diff --git a/protocol/build.gradle b/protocol/build.gradle index 8259d13217..61bd5ded89 100644 --- a/protocol/build.gradle +++ b/protocol/build.gradle @@ -12,7 +12,8 @@ dependencies { // https://github.com/google/guava/wiki/CVE-2018-10237 compile group: 'com.google.guava', name: 'guava', version: '29.0-jre' compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.10.5' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.5.1' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.4' + compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.11.4' implementation 'com.google.code.gson:gson:2.8.6' compile project(':core') compile project(':elasticsearch') From 691b516ef74bc1142497de1b972f1e77d4130bc4 Mon Sep 17 00:00:00 2001 From: David Cui Date: Wed, 31 Mar 2021 12:12:34 -0700 Subject: [PATCH 6/7] bump to od 1.13.2 in workbench workflows and gradle properties --- .github/workflows/sql-workbench-release-workflow.yml | 2 +- .github/workflows/sql-workbench-test-and-build-workflow.yml | 2 +- gradle.properties | 2 +- workbench/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sql-workbench-release-workflow.yml b/.github/workflows/sql-workbench-release-workflow.yml index fb83c5a23b..820054f1a9 100644 --- a/.github/workflows/sql-workbench-release-workflow.yml +++ b/.github/workflows/sql-workbench-release-workflow.yml @@ -7,7 +7,7 @@ on: env: PLUGIN_NAME: opendistroQueryWorkbenchKibana - OD_VERSION: 1.13.0.0 + OD_VERSION: 1.13.2.0 jobs: diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml index a173605921..8969cfa6ca 100644 --- a/.github/workflows/sql-workbench-test-and-build-workflow.yml +++ b/.github/workflows/sql-workbench-test-and-build-workflow.yml @@ -4,7 +4,7 @@ on: [pull_request, push] env: PLUGIN_NAME: opendistroQueryWorkbenchKibana - OD_VERSION: 1.13.0.0 + OD_VERSION: 1.13.2.0 jobs: diff --git a/gradle.properties b/gradle.properties index 7f8918e354..cd8ae6da3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,5 +13,5 @@ # permissions and limitations under the License. # -version=1.13.0 +version=1.13.2 org.gradle.jvmargs=-Duser.language=en -Duser.country=US diff --git a/workbench/package.json b/workbench/package.json index 0556154474..182b5303ed 100644 --- a/workbench/package.json +++ b/workbench/package.json @@ -1,6 +1,6 @@ { "name": "opendistro-query-workbench", - "version": "1.13.0.0", + "version": "1.13.2.0", "description": "Query Workbench", "main": "index.js", "license": "Apache-2.0", From 74706b65e2f9c7a38bd70ab88b9c6b67c5409007 Mon Sep 17 00:00:00 2001 From: David Cui Date: Wed, 31 Mar 2021 12:31:31 -0700 Subject: [PATCH 7/7] bump all OD versions --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4960147400..d0245d2e27 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ repositories { } ext { - opendistroVersion = '1.13.0' + opendistroVersion = '1.13.2' isSnapshot = "true" == System.getProperty("build.snapshot", "true") }