-
Notifications
You must be signed in to change notification settings - Fork 69
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added support for jdk-21 #500
Added support for jdk-21 #500
Conversation
a002a03
to
6231080
Compare
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
6231080
to
d2c3bd0
Compare
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
cf7a60b
to
deb6bd4
Compare
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
deb6bd4
to
f02cccd
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #500 +/- ##
=========================================
Coverage 84.55% 84.55%
Complexity 532 532
=========================================
Files 40 40
Lines 1547 1547
Branches 244 244
=========================================
Hits 1308 1308
Misses 128 128
Partials 111 111 ☔ View full report in Codecov by Sentry. |
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
2e863d1
to
1b52576
Compare
I've up versioned all libraries that we're referencing directly. For some libraries later version is available, but we're blocked on upgrade due to other packages that we depend on. Unless that's fixed the Mend Security Check will stay there |
5daddfd
into
opensearch-project:main
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-500-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5daddfd2f10486ad4688742aa26db82461b6a73c
# Push it to GitHub
git push --set-upstream origin backport/backport-500-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
* Added support for jdk-21 Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de>
* Added support for jdk-21 Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de>
* Added support for jdk-21 Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de>
* Handle case with nested list of objects Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * fix validateEmbeddingsFieldValues Method Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * spotless formatting Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Onboard jenkins prod docker images on github actions (#483) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Update dependency org.json:json to v20231013 (#481) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (#438) (#479) * [bug fix] Fix async actions are left in neural_sparse query (#438) * add serialization and deserialization Signed-off-by: zhichao-aws <zhichaog@amazon.com> * hash, equals. + UT Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add test Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add changelog Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed exception for case when Hybrid query being wrapped into bool query (#490) * Adding null check for case when hybrid query wrapped into bool query Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed Hybrid query for cases when it's wrapped into other compound queries (#498) * Fixed nested field case Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added the github action to copy the attached issues label to PR. (#504) Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added support for jdk-21 (#500) * Added support for jdk-21 Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Add unit tests + small fixes Signed-off-by: krishy91 <crgkc.r@gmail.com> * fix indentation Signed-off-by: krishy91 <crgkc.r@gmail.com> * remove unused code + add 2nd level nesting test Signed-off-by: krishy91 <crgkc.r@gmail.com> * add integration test for list of nested objects Signed-off-by: krishy91 <crgkc.r@gmail.com> --------- Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: krishy91 <crgkc.r@gmail.com> Co-authored-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: zhichao-aws <zhichaog@amazon.com> Co-authored-by: Martin Gaievski <gaievski@amazon.com> Co-authored-by: Navneet Verma <navneev@amazon.com>
* Handle case with nested list of objects Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * fix validateEmbeddingsFieldValues Method Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * spotless formatting Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Onboard jenkins prod docker images on github actions (#483) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Update dependency org.json:json to v20231013 (#481) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (#438) (#479) * [bug fix] Fix async actions are left in neural_sparse query (#438) * add serialization and deserialization Signed-off-by: zhichao-aws <zhichaog@amazon.com> * hash, equals. + UT Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add test Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add changelog Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed exception for case when Hybrid query being wrapped into bool query (#490) * Adding null check for case when hybrid query wrapped into bool query Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed Hybrid query for cases when it's wrapped into other compound queries (#498) * Fixed nested field case Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added the github action to copy the attached issues label to PR. (#504) Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added support for jdk-21 (#500) * Added support for jdk-21 Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Add unit tests + small fixes Signed-off-by: krishy91 <crgkc.r@gmail.com> * fix indentation Signed-off-by: krishy91 <crgkc.r@gmail.com> * remove unused code + add 2nd level nesting test Signed-off-by: krishy91 <crgkc.r@gmail.com> * add integration test for list of nested objects Signed-off-by: krishy91 <crgkc.r@gmail.com> --------- Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: krishy91 <crgkc.r@gmail.com> Co-authored-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: zhichao-aws <zhichaog@amazon.com> Co-authored-by: Martin Gaievski <gaievski@amazon.com> Co-authored-by: Navneet Verma <navneev@amazon.com> (cherry picked from commit ea49d3c)
* Handle case with nested list of objects Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * fix validateEmbeddingsFieldValues Method Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * spotless formatting Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Onboard jenkins prod docker images on github actions (#483) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Update dependency org.json:json to v20231013 (#481) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (#438) (#479) * [bug fix] Fix async actions are left in neural_sparse query (#438) * add serialization and deserialization Signed-off-by: zhichao-aws <zhichaog@amazon.com> * hash, equals. + UT Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add test Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add changelog Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed exception for case when Hybrid query being wrapped into bool query (#490) * Adding null check for case when hybrid query wrapped into bool query Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed Hybrid query for cases when it's wrapped into other compound queries (#498) * Fixed nested field case Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added the github action to copy the attached issues label to PR. (#504) Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added support for jdk-21 (#500) * Added support for jdk-21 Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Add unit tests + small fixes Signed-off-by: krishy91 <crgkc.r@gmail.com> * fix indentation Signed-off-by: krishy91 <crgkc.r@gmail.com> * remove unused code + add 2nd level nesting test Signed-off-by: krishy91 <crgkc.r@gmail.com> * add integration test for list of nested objects Signed-off-by: krishy91 <crgkc.r@gmail.com> --------- Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: krishy91 <crgkc.r@gmail.com> Co-authored-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: zhichao-aws <zhichaog@amazon.com> Co-authored-by: Martin Gaievski <gaievski@amazon.com> Co-authored-by: Navneet Verma <navneev@amazon.com> (cherry picked from commit ea49d3c) Co-authored-by: Gopala-Krishna Char <crgkc.r@gmail.com>
* Handle case with nested list of objects Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * fix validateEmbeddingsFieldValues Method Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * spotless formatting Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Onboard jenkins prod docker images on github actions (opensearch-project#483) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Update dependency org.json:json to v20231013 (opensearch-project#481) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (opensearch-project#438) (opensearch-project#479) * [bug fix] Fix async actions are left in neural_sparse query (opensearch-project#438) * add serialization and deserialization Signed-off-by: zhichao-aws <zhichaog@amazon.com> * hash, equals. + UT Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add test Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <zhichaog@amazon.com> * add changelog Signed-off-by: zhichao-aws <zhichaog@amazon.com> * tidy Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed exception for case when Hybrid query being wrapped into bool query (opensearch-project#490) * Adding null check for case when hybrid query wrapped into bool query Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Fixed Hybrid query for cases when it's wrapped into other compound queries (opensearch-project#498) * Fixed nested field case Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added the github action to copy the attached issues label to PR. (opensearch-project#504) Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Added support for jdk-21 (opensearch-project#500) * Added support for jdk-21 Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> * Add unit tests + small fixes Signed-off-by: krishy91 <crgkc.r@gmail.com> * fix indentation Signed-off-by: krishy91 <crgkc.r@gmail.com> * remove unused code + add 2nd level nesting test Signed-off-by: krishy91 <crgkc.r@gmail.com> * add integration test for list of nested objects Signed-off-by: krishy91 <crgkc.r@gmail.com> --------- Signed-off-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: zhichao-aws <zhichaog@amazon.com> Signed-off-by: Martin Gaievski <gaievski@amazon.com> Signed-off-by: Navneet Verma <navneev@amazon.com> Signed-off-by: krishy91 <crgkc.r@gmail.com> Co-authored-by: Gopala-Krishna.Char <gopala-krishna.char@intrafind.de> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: zhichao-aws <zhichaog@amazon.com> Co-authored-by: Martin Gaievski <gaievski@amazon.com> Co-authored-by: Navneet Verma <navneev@amazon.com> Signed-off-by: yuye-aws <yuyezhu@amazon.com>
Description
Adding jdk-21 support:
This is a requirement for 2.12 release, core build system already switched to jdk-21 as default one opensearch-project/OpenSearch#11003. I've created a PR to fix this opensearch-project/opensearch-build#4268, but the build for plugin is failing in distribution build CI
Some additional changes:
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.