Resolve build issue #1572
Merged
Resolve build issue #1572
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Eric <menwe@amazon.com>
Signed-off-by: Eric <menwe@amazon.com>
mengweieric
requested review from
pjfitzgibbons,
ps48,
kavithacm,
derek-ho,
joshuali925,
dai-chen,
YANG-DB,
rupal-bq,
vamsi-amazon,
Swiddis,
penghuo and
seankao-az
as code owners
pjfitzgibbons
previously approved these changes
Jul 17, 2023
TackAdam
approved these changes
Jul 17, 2023
derek-ho
reviewed
Jul 17, 2023
| @@ -21,7 +21,7 @@ buildscript { | |||
| opensearch_build += "-SNAPSHOT" | |||
| } | |||
| common_utils_version = System.getProperty("common_utils.version", opensearch_build) | |||
| kotlin_version = System.getProperty("kotlin.version", "1.6.0") | |||
There was a problem hiding this comment.
are these coming from upstream somewhere/so we don't have to manually change it every time?
There was a problem hiding this comment.
I see that notification plugin also changes their kotlin version - this will probably be a global move soon
see here
derek-ho
previously approved these changes
Jul 17, 2023
vamsi-amazon
previously approved these changes
Jul 18, 2023
Signed-off-by: Derek Ho <dxho@amazon.com>
derek-ho
dismissed stale reviews from vamsi-amazon, pjfitzgibbons, and themself
via
8116d7e
derek-ho
approved these changes
Jul 18, 2023
YANG-DB
approved these changes
Jul 18, 2023
|
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-1572-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4345041ed16ba89082c481c9e8e326ffa1f73739
# Push it to GitHub
git push --set-upstream origin backport/backport-1572-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.xThen, create a pull request where the |
derek-ho
added a commit
to derek-ho/observability
that referenced
this pull request
Jul 31, 2023
* resolve dependency issues Signed-off-by: Eric <menwe@amazon.com> * resolve jacocoagent missing issue Signed-off-by: Eric <menwe@amazon.com> * bump up build.gradle Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Eric <menwe@amazon.com> Signed-off-by: Derek Ho <dxho@amazon.com> Co-authored-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 4345041) Signed-off-by: Derek Ho <dxho@amazon.com>
This was referenced Aug 1, 2023
derek-ho
added a commit
that referenced
this pull request
Aug 1, 2023
* remove job scheduler (#1560) * remove job scheduler Signed-off-by: Derek Ho <dxho@amazon.com> * remove job scheduler files and build.gradle Signed-off-by: Derek Ho <dxho@amazon.com> * ktlint Signed-off-by: Derek Ho <dxho@amazon.com> * add back job scheduler to fix bwc Signed-off-by: Derek Ho <dxho@amazon.com> * remove job scheduler and add it back for older version Signed-off-by: Derek Ho <dxho@amazon.com> * remove job scheduler in prepare Bwc Tests Signed-off-by: Derek Ho <dxho@amazon.com> * bump bwc version Signed-off-by: Derek Ho <dxho@amazon.com> * add todo of removing job scheduler things after 2.9 release Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 4e0ca5a) Signed-off-by: Derek Ho <dxho@amazon.com> * Resolve build issue (#1572) * resolve dependency issues Signed-off-by: Eric <menwe@amazon.com> * resolve jacocoagent missing issue Signed-off-by: Eric <menwe@amazon.com> * bump up build.gradle Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Eric <menwe@amazon.com> Signed-off-by: Derek Ho <dxho@amazon.com> Co-authored-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 4345041) Signed-off-by: Derek Ho <dxho@amazon.com> * try get older common utils Signed-off-by: Derek Ho <dxho@amazon.com> * revert back Signed-off-by: Derek Ho <dxho@amazon.com> * revert kotlin version change Signed-off-by: Derek Ho <dxho@amazon.com> * additional core changes Signed-off-by: Derek Ho <dxho@amazon.com> * update import orderings Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> Signed-off-by: Eric <menwe@amazon.com> Co-authored-by: Eric Wei <menwe@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Resolve build issues
Issues Resolved
[List any issues this PR will resolve]
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.