From ff864c164328a4aa22d3e8c6a3456237bbc2e7e6 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Thu, 2 Mar 2023 18:55:14 -0800 Subject: [PATCH 1/6] bumping plugin version, jackson-core Signed-off-by: Sean Li --- build.gradle | 4 ++-- release-notes/search-processor.release-notes-2.6.0.md | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 release-notes/search-processor.release-notes-2.6.0.md diff --git a/build.gradle b/build.gradle index 1602bdf..d9381da 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ validateNebulaPom.enabled = false buildscript { ext { - opensearch_version = "2.5.0" + opensearch_version = "2.6.0" } repositories { @@ -81,7 +81,7 @@ dependencies { implementation 'org.apache.httpcomponents:httpclient:4.5.13' implementation 'org.apache.httpcomponents:httpcore:4.4.15' implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.1' - implementation 'com.fasterxml.jackson.core:jackson-core:2.14.1' + implementation 'com.fasterxml.jackson.core:jackson-core:2.14.2' implementation 'com.fasterxml.jackson.core:jackson-annotations:2.14.1' implementation 'commons-logging:commons-logging:1.2' implementation 'com.amazonaws:aws-java-sdk-sts:1.12.300' diff --git a/release-notes/search-processor.release-notes-2.6.0.md b/release-notes/search-processor.release-notes-2.6.0.md new file mode 100644 index 0000000..d1d3b16 --- /dev/null +++ b/release-notes/search-processor.release-notes-2.6.0.md @@ -0,0 +1,10 @@ +## Version 2.6.0 Release Notes + +### Enhancements +* Add more test coverage [#105](https://github.com/opensearch-project/search-processor/pull/105) + +### Infrastructure +* Update artifact name [#109](https://github.com/opensearch-project/search-processor/pull/109) + +### Maintenance +* From f534a478fc27042e4983833e3b935b9ba39a190a Mon Sep 17 00:00:00 2001 From: Sean Li Date: Thu, 2 Mar 2023 19:17:18 -0800 Subject: [PATCH 2/6] Adding 2.6.0 release notes Signed-off-by: Sean Li --- release-notes/search-processor.release-notes-2.6.0.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release-notes/search-processor.release-notes-2.6.0.md b/release-notes/search-processor.release-notes-2.6.0.md index d1d3b16..6a651a5 100644 --- a/release-notes/search-processor.release-notes-2.6.0.md +++ b/release-notes/search-processor.release-notes-2.6.0.md @@ -7,4 +7,7 @@ * Update artifact name [#109](https://github.com/opensearch-project/search-processor/pull/109) ### Maintenance -* +* Bumping plugin version to `2.6.0` and `jackson-core` version to `2.14.2` [#110](https://github.com/opensearch-project/search-processor/pull/110) + +### Documentation +* Adding `2.6.0` release notes [#110](https://github.com/opensearch-project/search-processor/pull/110) From 2adb323e9a602aac47e9de173b48ce90175625c3 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Fri, 3 Mar 2023 09:35:01 -0800 Subject: [PATCH 3/6] updating PR links to point to main branch PRs Signed-off-by: Sean Li --- release-notes/search-processor.release-notes-2.6.0.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release-notes/search-processor.release-notes-2.6.0.md b/release-notes/search-processor.release-notes-2.6.0.md index 6a651a5..fa1a22f 100644 --- a/release-notes/search-processor.release-notes-2.6.0.md +++ b/release-notes/search-processor.release-notes-2.6.0.md @@ -1,10 +1,10 @@ ## Version 2.6.0 Release Notes ### Enhancements -* Add more test coverage [#105](https://github.com/opensearch-project/search-processor/pull/105) +* Add more test coverage [#100](https://github.com/opensearch-project/search-processor/pull/100) ### Infrastructure -* Update artifact name [#109](https://github.com/opensearch-project/search-processor/pull/109) +* Update artifact name [#106](https://github.com/opensearch-project/search-processor/pull/106) ### Maintenance * Bumping plugin version to `2.6.0` and `jackson-core` version to `2.14.2` [#110](https://github.com/opensearch-project/search-processor/pull/110) From 042396f972a0502d1ce338f3f94ef03262f80f50 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Fri, 3 Mar 2023 09:38:55 -0800 Subject: [PATCH 4/6] bumping versions Signed-off-by: Sean Li --- .github/workflows/backwards_compatibility_tests_workflow.yml | 4 ++-- helpers/search_processing_kendra_quickstart.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/backwards_compatibility_tests_workflow.yml b/.github/workflows/backwards_compatibility_tests_workflow.yml index 996de2a..6e5217c 100644 --- a/.github/workflows/backwards_compatibility_tests_workflow.yml +++ b/.github/workflows/backwards_compatibility_tests_workflow.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: java: [ 11, 17 ] - bwc_version : [ "2.5.0" ] + bwc_version : [ "2.6.0" ] opensearch_version : [ "3.0.0-SNAPSHOT" ] name: SRP Restart-Upgrade BWC Tests @@ -42,7 +42,7 @@ jobs: strategy: matrix: java: [ 11, 17 ] - bwc_version: [ "2.5.0" ] + bwc_version: [ "2.6.0" ] opensearch_version: [ "3.0.0-SNAPSHOT" ] name: SRP Rolling-Upgrade BWC Tests diff --git a/helpers/search_processing_kendra_quickstart.sh b/helpers/search_processing_kendra_quickstart.sh index 6cfc1b9..638a2fb 100755 --- a/helpers/search_processing_kendra_quickstart.sh +++ b/helpers/search_processing_kendra_quickstart.sh @@ -7,7 +7,7 @@ set -o nounset # Some useful constants readonly DOCKER_IMAGE_TAG="opensearch-with-ranking-plugin" -readonly OPENSEARCH_VERSION="2.5.0" +readonly OPENSEARCH_VERSION="2.6.0" # # Set default values for OpenSearch (+Dashboards) image tags and plugin URL. From 03584e1ce3232386090362e6964f748874491936 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Fri, 3 Mar 2023 10:39:04 -0800 Subject: [PATCH 5/6] changing url in script Signed-off-by: Sean Li --- helpers/search_processing_kendra_quickstart.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/search_processing_kendra_quickstart.sh b/helpers/search_processing_kendra_quickstart.sh index 638a2fb..3ae1690 100755 --- a/helpers/search_processing_kendra_quickstart.sh +++ b/helpers/search_processing_kendra_quickstart.sh @@ -20,7 +20,7 @@ if [ -z "${OPENSEARCH_DASHBOARDS_IMAGE_TAG:-}" ]; then OPENSEARCH_DASHBOARDS_IMAGE_TAG="opensearchproject/opensearch-dashboards:${OPENSEARCH_VERSION}" fi if [ -z "${SEARCH_PROCESSOR_PLUGIN_URL:-}" ]; then - SEARCH_PROCESSOR_PLUGIN_URL="https://github.com/opensearch-project/search-processor/releases/download/${OPENSEARCH_VERSION}/search-processor.zip" + SEARCH_PROCESSOR_PLUGIN_URL="https://github.com/opensearch-project/search-processor/releases/download/${OPENSEARCH_VERSION}/opensearch-search-processor-${OPENSEARCH_VERSION}-0.zip" fi function print_help() { From 7f40c24f37ccb18550a645c70e1144964c1c1031 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Fri, 3 Mar 2023 10:39:31 -0800 Subject: [PATCH 6/6] changing url in script Signed-off-by: Sean Li --- helpers/search_processing_kendra_quickstart.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/search_processing_kendra_quickstart.sh b/helpers/search_processing_kendra_quickstart.sh index 3ae1690..09a90c8 100755 --- a/helpers/search_processing_kendra_quickstart.sh +++ b/helpers/search_processing_kendra_quickstart.sh @@ -20,7 +20,7 @@ if [ -z "${OPENSEARCH_DASHBOARDS_IMAGE_TAG:-}" ]; then OPENSEARCH_DASHBOARDS_IMAGE_TAG="opensearchproject/opensearch-dashboards:${OPENSEARCH_VERSION}" fi if [ -z "${SEARCH_PROCESSOR_PLUGIN_URL:-}" ]; then - SEARCH_PROCESSOR_PLUGIN_URL="https://github.com/opensearch-project/search-processor/releases/download/${OPENSEARCH_VERSION}/opensearch-search-processor-${OPENSEARCH_VERSION}-0.zip" + SEARCH_PROCESSOR_PLUGIN_URL="https://github.com/opensearch-project/search-processor/releases/download/${OPENSEARCH_VERSION}/opensearch-search-processor-${OPENSEARCH_VERSION}.0.zip" fi function print_help() {