-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Fix dependencies #4963
Fix dependencies #4963
Conversation
af4652d
to
a097b31
Compare
Gradle Check (Jenkins) Run Completed with:
|
buildSrc/build.gradle
Outdated
@@ -116,6 +116,7 @@ dependencies { | |||
api 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10' | |||
api 'de.thetaphi:forbiddenapis:3.3' | |||
api 'com.avast.gradle:gradle-docker-compose-plugin:0.15.2' | |||
api 'org.yaml:snakeyaml:1.32' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please ${versions.snakeyaml}
, from https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh yes! Updated to use from the version.properties file
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
The log says no test failures |
buildSrc/build.gradle
Outdated
@@ -116,6 +116,7 @@ dependencies { | |||
api 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for being peeky, it seems like we have a number of org.jetbrains.kotlin
deps (like here and [here])(https://github.com/opensearch-project/OpenSearch/pull/4963/files#diff-6ffeac346fb766ef182207bf47e9f4472bae38bc46196eb14bb690de71c4e4cdR54) , could we put the version in versions.properties
instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense! Done.
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #4963 +/- ##
============================================
- Coverage 70.95% 70.94% -0.01%
+ Complexity 57971 57936 -35
============================================
Files 4688 4688
Lines 276901 276901
Branches 40299 40299
============================================
- Hits 196472 196455 -17
+ Misses 64181 64139 -42
- Partials 16248 16307 +59
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
Gradle Check (Jenkins) Run Completed with:
|
Windows precommit failing with:
|
Gradle Check (Jenkins) Run Completed with:
|
Test failing:
Flakey test reported in #3603 |
Signed-off-by: Vacha Shah <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
d7a5508
to
2857aca
Compare
Gradle Check (Jenkins) Run Completed with:
|
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
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-4963-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 28ba311ae34480cd158cbf7fc986ce4954e01204
# Push it to GitHub
git push --set-upstream origin backport/backport-4963-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x Then, create a pull request where the |
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-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-4963-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 28ba311ae34480cd158cbf7fc986ce4954e01204
# Push it to GitHub
git push --set-upstream origin backport/backport-4963-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.x Then, create a pull request where the |
* Upgrading kotlin-stdlib and excluding jetty-http Signed-off-by: Vacha Shah <[email protected]> * Upgrading indirect snakeyaml dependency Signed-off-by: Vacha Shah <[email protected]> * Update CHANGELOG Signed-off-by: Vacha Shah <[email protected]> * Using snakeyaml version from version file Signed-off-by: Vacha Shah <[email protected]> * Upgrading jetty-http instead of excluding since it is used Signed-off-by: Vacha Shah <[email protected]> * Extracting kotlin version Signed-off-by: Vacha Shah <[email protected]> Signed-off-by: Vacha Shah <[email protected]>
* Upgrading kotlin-stdlib and excluding jetty-http Signed-off-by: Vacha Shah <[email protected]> * Upgrading indirect snakeyaml dependency Signed-off-by: Vacha Shah <[email protected]> * Update CHANGELOG Signed-off-by: Vacha Shah <[email protected]> * Using snakeyaml version from version file Signed-off-by: Vacha Shah <[email protected]> * Upgrading jetty-http instead of excluding since it is used Signed-off-by: Vacha Shah <[email protected]> * Extracting kotlin version Signed-off-by: Vacha Shah <[email protected]> Signed-off-by: Vacha Shah <[email protected]>
* Fix dependencies (#4963) * Upgrading kotlin-stdlib and excluding jetty-http Signed-off-by: Vacha Shah <[email protected]> * Upgrading indirect snakeyaml dependency Signed-off-by: Vacha Shah <[email protected]> * Update CHANGELOG Signed-off-by: Vacha Shah <[email protected]> * Using snakeyaml version from version file Signed-off-by: Vacha Shah <[email protected]> * Upgrading jetty-http instead of excluding since it is used Signed-off-by: Vacha Shah <[email protected]> * Extracting kotlin version Signed-off-by: Vacha Shah <[email protected]> Signed-off-by: Vacha Shah <[email protected]> * Update CHANGELOG Signed-off-by: Vacha Shah <[email protected]> Signed-off-by: Vacha Shah <[email protected]>
* Fix dependencies (#4963) * Upgrading kotlin-stdlib and excluding jetty-http Signed-off-by: Vacha Shah <[email protected]> * Upgrading indirect snakeyaml dependency Signed-off-by: Vacha Shah <[email protected]> * Update CHANGELOG Signed-off-by: Vacha Shah <[email protected]> * Using snakeyaml version from version file Signed-off-by: Vacha Shah <[email protected]> * Upgrading jetty-http instead of excluding since it is used Signed-off-by: Vacha Shah <[email protected]> * Extracting kotlin version Signed-off-by: Vacha Shah <[email protected]> Signed-off-by: Vacha Shah <[email protected]> * Update CHANGELOG Signed-off-by: Vacha Shah <[email protected]> Signed-off-by: Vacha Shah <[email protected]>
Description
jetty-server
(which brings injetty-http
) due to GHSA-cj7v-27pg-wf7q which is brought in byhadoop-minicluster
.kotlin-stdlib
which is brought in throughhadoop-minicluster
. See GHSA-cqj8-47ch-rvvq.snakeyaml
which is brought in bycom.avast.gradle:gradle-docker-compose-plugin
. See GHSA-98wm-3w3q-mw94Issues 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.