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

Bump BouncyCastle version from jdk15on to jdk15to18 #8247

Merged
merged 1 commit into from
Jun 28, 2023

Conversation

willyborankin
Copy link
Contributor

@willyborankin willyborankin commented Jun 24, 2023

Description

BouncyCastle jdk15on is not supported anymore since based development was moved to jdk18on.

Packaging Change (users of 1.70 or earlier): BC 1.71 changed the jdk15on jars to jdk18on so the base has now moved to Java 8. For earlier JVMs, or containers/applications that cannot cope with multi-release jars, you should now use the jdk15to18 jars.

jdk18on contains fixes for:

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

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:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@willyborankin willyborankin force-pushed the bumpup-bouncycastle branch 2 times, most recently from 9704154 to e1149d0 Compare June 24, 2023 08:38
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

Signed-off-by: Andrey Pleskach <[email protected]>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testNodeDropWithOngoingReplication

@willyborankin
Copy link
Contributor Author

@willyborankin DCO check is failing :(

Fixed

@dblock dblock merged commit 9856cb7 into opensearch-project:main Jun 28, 2023
@dblock dblock added backport 1.x backport 2.x Backport to 2.x branch labels Jun 28, 2023
@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-8247-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9856cb77bc1bf6908210d91af7f95cc29d41b3a5
# Push it to GitHub
git push --set-upstream origin backport/backport-8247-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-8247-to-1.x.

@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-8247-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9856cb77bc1bf6908210d91af7f95cc29d41b3a5
# Push it to GitHub
git push --set-upstream origin backport/backport-8247-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-8247-to-2.x.

@dblock
Copy link
Member

dblock commented Jun 28, 2023

@willyborankin Needs manual backports, please, if you want this in 2.x.

willyborankin added a commit to willyborankin/OpenSearch that referenced this pull request Jun 29, 2023
jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit 9856cb7)
Signed-off-by: Andrey Pleskach <[email protected]>
@willyborankin
Copy link
Contributor Author

Hi @dblock, should I create a backport for 1.x?

willyborankin added a commit to willyborankin/OpenSearch that referenced this pull request Jun 29, 2023
…h-project#8247)

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit 9856cb7)
Signed-off-by: Andrey Pleskach <[email protected]>
willyborankin added a commit to willyborankin/OpenSearch that referenced this pull request Jun 29, 2023
…h-project#8247)

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit 9856cb7)
Signed-off-by: Andrey Pleskach <[email protected]>
willyborankin added a commit to willyborankin/OpenSearch that referenced this pull request Jun 29, 2023
…h-project#8247)

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit 9856cb7)
Signed-off-by: Andrey Pleskach <[email protected]>
willyborankin added a commit to willyborankin/OpenSearch that referenced this pull request Jun 29, 2023
…h-project#8247)

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit 9856cb7)
Signed-off-by: Andrey Pleskach <[email protected]>
willyborankin added a commit to willyborankin/OpenSearch that referenced this pull request Jun 29, 2023
…h-project#8247)

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit 9856cb7)
Signed-off-by: Andrey Pleskach <[email protected]>
willyborankin added a commit to willyborankin/OpenSearch that referenced this pull request Jun 29, 2023
…h-project#8247)

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit 9856cb7)
Signed-off-by: Andrey Pleskach <[email protected]>
willyborankin added a commit to willyborankin/OpenSearch that referenced this pull request Jun 29, 2023
…h-project#8247)

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit 9856cb7)
Signed-off-by: Andrey Pleskach <[email protected]>
reta pushed a commit that referenced this pull request Jun 29, 2023
…8349)

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146


(cherry picked from commit 9856cb7)

Signed-off-by: Andrey Pleskach <[email protected]>
willyborankin added a commit to willyborankin/OpenSearch that referenced this pull request Jun 29, 2023
…h-project#8247) (opensearch-project#8349)

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

(cherry picked from commit 9856cb7)

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit c8a63ba)
Signed-off-by: Andrey Pleskach <[email protected]>
willyborankin added a commit to willyborankin/OpenSearch that referenced this pull request Jun 29, 2023
…h-project#8247) (opensearch-project#8349)

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

(cherry picked from commit 9856cb7)

Signed-off-by: Andrey Pleskach <[email protected]>
(cherry picked from commit c8a63ba)
Signed-off-by: Andrey Pleskach <[email protected]>
reta pushed a commit that referenced this pull request Jun 29, 2023
…8349) (#8365)

jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

(cherry picked from commit 9856cb7)


(cherry picked from commit c8a63ba)

Signed-off-by: Andrey Pleskach <[email protected]>
@dblock
Copy link
Member

dblock commented Jul 6, 2023

Hi @dblock, should I create a backport for 1.x?

Sorry late to reply. Generally yes for high severity security fixes only or if you need it in 1.x for any other reason.

baba-devv pushed a commit to baba-devv/OpenSearch that referenced this pull request Jul 29, 2023
jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

Signed-off-by: Andrey Pleskach <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
jdk15on are not supported anymore since based development was moved from jsk15on to jdk18on.

jdk15to18 contains fixed for:
- CVE-2023-33201
- CVE-2022-45146

Signed-off-by: Andrey Pleskach <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
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.

3 participants