Skip to content
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

Merged
merged 6 commits into from
Oct 30, 2022
Merged

Conversation

VachaShah
Copy link
Collaborator

@VachaShah VachaShah commented Oct 28, 2022

Description

  • Upgradingjetty-server (which brings in jetty-http) due to GHSA-cj7v-27pg-wf7q which is brought in by hadoop-minicluster.
  • Upgrading kotlin-stdlib which is brought in through hadoop-minicluster. See GHSA-cqj8-47ch-rvvq.
  • Upgrading snakeyaml which is brought in by com.avast.gradle:gradle-docker-compose-plugin. See GHSA-98wm-3w3q-mw94

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@@ -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'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Collaborator Author

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

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@VachaShah
Copy link
Collaborator Author

Gradle Check (Jenkins) Run Completed with:

The log says no test failures

@VachaShah VachaShah requested a review from reta October 28, 2022 19:10
@@ -116,6 +116,7 @@ dependencies {
api 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10'
Copy link
Collaborator

@reta reta Oct 28, 2022

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:/opensearch-project/OpenSearch/pull/4963/files#diff-6ffeac346fb766ef182207bf47e9f4472bae38bc46196eb14bb690de71c4e4cdR54) , could we put the version in versions.properties instead?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense! Done.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov-commenter
Copy link

codecov-commenter commented Oct 28, 2022

Codecov Report

Merging #4963 (2857aca) into main (d2c2ade) will decrease coverage by 0.00%.
The diff coverage is n/a.

@@             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     
Impacted Files Coverage Δ
...nsearch/index/shard/IndexShardClosedException.java 66.66% <0.00%> (-33.34%) ⬇️
...search/aggregations/pipeline/HoltWintersModel.java 21.47% <0.00%> (-30.88%) ⬇️
...opensearch/index/reindex/BulkByScrollResponse.java 48.38% <0.00%> (-27.42%) ⬇️
...opensearch/snapshots/SnapshotRestoreException.java 25.00% <0.00%> (-25.00%) ⬇️
...ava/org/opensearch/threadpool/ThreadPoolStats.java 58.66% <0.00%> (-22.67%) ⬇️
...opensearch/persistent/AllocatedPersistentTask.java 44.23% <0.00%> (-21.16%) ⬇️
...c/main/java/org/opensearch/geometry/MultiLine.java 80.00% <0.00%> (-20.00%) ⬇️
...pensearch/test/rest/yaml/section/SetupSection.java 74.07% <0.00%> (-18.52%) ⬇️
...ions/bucket/terms/heuristic/MutualInformation.java 53.84% <0.00%> (-17.95%) ⬇️
...ations/bucket/terms/heuristic/PercentageScore.java 34.78% <0.00%> (-17.40%) ⬇️
... and 451 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@reta reta added dependencies Pull requests that update a dependency file backport 2.x Backport to 2.x branch labels Oct 28, 2022
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@VachaShah
Copy link
Collaborator Author

Windows precommit failing with:

JVM crash log found: file:///D:/a/OpenSearch/OpenSearch/hs_err_pid1884.log

FAILURE: Build failed with an exception.

* What went wrong:
Gradle build daemon disappeared unexpectedly (it may have been killed or may have crashed)

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@VachaShah
Copy link
Collaborator Author

Gradle Check (Jenkins) Run Completed with:

Test failing:

org.opensearch.cluster.allocation.AwarenessAllocationIT.testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness

Flakey test reported in #3603

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@VachaShah VachaShah merged commit 28ba311 into opensearch-project:main Oct 30, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

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 base branch is 2.x and the compare/head branch is backport/backport-4963-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 128

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 base branch is 1.x and the compare/head branch is backport/backport-4963-to-1.x.

VachaShah added a commit to VachaShah/OpenSearch that referenced this pull request Oct 30, 2022
* 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]>
VachaShah added a commit to VachaShah/OpenSearch that referenced this pull request Oct 30, 2022
* 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]>
reta pushed a commit that referenced this pull request Oct 31, 2022
* 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]>
reta pushed a commit that referenced this pull request Oct 31, 2022
* 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]>
@ryanbogan ryanbogan mentioned this pull request Jan 27, 2023
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport 2.x Backport to 2.x branch dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants