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

Exclude jettison version brought in with hadoop-minicluster. #4787

Merged
merged 1 commit into from
Oct 18, 2022

Conversation

mch2
Copy link
Member

@mch2 mch2 commented Oct 13, 2022

Signed-off-by: Marc Handalian handalm@amazon.com

Description

See GHSA-56h3-78gp-v83r. The version was previously bumped in discovery-azure-classic but hadoop-minicluster still brings in a vulnerable version of jettison. This excludes the transitive dependency and brings in the patched version 1.5.1. This PR also moves the version declaration to version.properties.

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:

@codecov-commenter
Copy link

Codecov Report

Merging #4787 (00e9dbb) into main (d15795a) will increase coverage by 0.12%.
The diff coverage is 44.81%.

@@             Coverage Diff              @@
##               main    #4787      +/-   ##
============================================
+ Coverage     70.66%   70.78%   +0.12%     
- Complexity    57578    57670      +92     
============================================
  Files          4661     4675      +14     
  Lines        276662   276918     +256     
  Branches      40325    40347      +22     
============================================
+ Hits         195501   196020     +519     
+ Misses        64926    64595     -331     
- Partials      16235    16303      +68     
Impacted Files Coverage Δ
.../delete/DeleteDecommissionStateRequestBuilder.java 0.00% <0.00%> (ø)
...te/ClusterDeleteWeightedRoutingRequestBuilder.java 0.00% <0.00%> (ø)
...apshots/restore/RestoreSnapshotRequestBuilder.java 15.78% <0.00%> (-0.88%) ⬇️
.../org/opensearch/client/support/AbstractClient.java 32.77% <0.00%> (-0.16%) ⬇️
.../java/org/opensearch/common/util/FeatureFlags.java 50.00% <ø> (ø)
...ateway/TransportNodesListGatewayStartedShards.java 51.00% <0.00%> (-0.68%) ⬇️
...h/index/shard/RemoveCorruptedShardDataCommand.java 81.51% <ø> (ø)
...java/org/opensearch/index/shard/StoreRecovery.java 67.88% <ø> (+0.01%) ⬆️
...h/index/store/InMemoryRemoteSnapshotDirectory.java 0.00% <0.00%> (ø)
...in/java/org/opensearch/indices/IndicesService.java 69.19% <0.00%> (-0.72%) ⬇️
... and 505 more

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

Signed-off-by: Marc Handalian <handalm@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@mch2 mch2 marked this pull request as ready for review October 18, 2022 19:36
@mch2 mch2 requested review from a team and reta as code owners October 18, 2022 19:36
@mch2
Copy link
Member Author

mch2 commented Oct 18, 2022

windows precommit failure again with timeouts to central.

      > Could not resolve org.apache.httpcomponents:fluent-hc:4.5.13.
         > Could not get resource 'https://repo.maven.apache.org/maven2/org/apache/httpcomponents/fluent-hc/4.5.13/fluent-hc-4.5.13.pom'.
            > Could not GET 'https://repo.maven.apache.org/maven2/org/apache/httpcomponents/fluent-hc/4.5.13/fluent-hc-4.5.13.pom'.
               > Connect to repo.maven.apache.org:443 [repo.maven.apache.org/146.75.28.215] failed: Connection timed out: connect
   > Could not resolve org.apache.logging.log4j:log4j-jcl:2.17.1.
     Required by:
         project :qa:os
      > Could not resolve org.apache.logging.log4j:log4j-jcl:2.17.1.
         > Could not get resource 'https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-jcl/2.17.1/log4j-jcl-2.17.1.pom'.
            > Could not GET 'https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-jcl/2.17.1/log4j-jcl-2.17.1.pom'.
               > Connect to repo.maven.apache.org:443 [repo.maven.apache.org/146.75.28.215] failed: Connection timed out: connect

@mch2
Copy link
Member Author

mch2 commented Oct 18, 2022

#4829

@mch2 mch2 merged commit f0b759d into opensearch-project:main Oct 18, 2022
@mch2 mch2 deleted the CVE-2022-40150 branch October 18, 2022 21:08
@ryanbogan ryanbogan added backport 1.x backport 2.x Backport to 2.x branch labels Oct 18, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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-4787-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f0b759d19fe0b2650cf3e51ae639d621e5c041c7
# Push it to GitHub
git push --set-upstream origin backport/backport-4787-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 base branch is 2.x and the compare/head branch is backport/backport-4787-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

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

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
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-4787-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f0b759d19fe0b2650cf3e51ae639d621e5c041c7
# Push it to GitHub
git push --set-upstream origin backport/backport-4787-to-1.x
# Go back to the original working tree
cd ../..
# 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-4787-to-1.x.

ashking94 pushed a commit to ashking94/OpenSearch that referenced this pull request Nov 7, 2022
…rch-project#4787)

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants