Skip to content

Commit

Permalink
PR#13484 Re-work
Browse files Browse the repository at this point in the history
* Update BC from 1.78 to 1.78.1 with latest fixes.
* Remove incorrect jdk15to18 module replacement definitions as artifacts are still supported.
* Add release notes.
* Update artifacts in buildSrc/build.gradle from jdk15to18 to jdk18on.
* Remove unneccessary license additions.

Signed-off-by: Milly Wilson <mwilson3@atlassian.com>
  • Loading branch information
mwilso3 committed May 1, 2024
1 parent 6115adc commit d1969d3
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 33 deletions.
5 changes: 0 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
### Added
### Dependencies
- OpenJDK Update (April 2024 Patch releases), update to Eclipse Temurin 11.0.23+9 ([#13406](https://github.com/opensearch-project/OpenSearch/pull/13406))
- [Backport] Bump `org.bouncycastle:bcpkix-jdk15to18` from 1.75 to 1.76 ([10219](https://github.com/opensearch-project/OpenSearch/pull/10219))
- [Backport] Bump `org.bouncycastle:bcprov-jdk15to18` to `org.bouncycastle:bcprov-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317))
- [Backport] Bump `org.bouncycastle:bcmail-jdk15to18` to `org.bouncycastle:bcmail-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317))
- [Backport] Bump `org.bouncycastle:bcpkix-jdk15to18` to `org.bouncycastle:bcpkix-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317))
- [Backport] Bump bouncycastle from 1.77 to 1.78 ([#13243](https://github.com/opensearch-project/OpenSearch/pull/13243))

### Changed
### Deprecated
Expand Down
8 changes: 4 additions & 4 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ dependencies {
api 'org.apache.maven:maven-model:3.6.2'
api 'com.networknt:json-schema-validator:1.0.36'
api "com.fasterxml.jackson.core:jackson-databind:${props.getProperty('jackson_databind')}"
api "org.bouncycastle:bcprov-jdk15to18:${props.getProperty('bouncycastle')}"
api "org.bouncycastle:bcpkix-jdk15to18:${props.getProperty('bouncycastle')}"
api "org.bouncycastle:bcpg-jdk15to18:${props.getProperty('bouncycastle')}"
api "org.bouncycastle:bcutil-jdk15to18:${props.getProperty('bouncycastle')}"
api "org.bouncycastle:bcprov-jdk18on:${props.getProperty('bouncycastle')}"
api "org.bouncycastle:bcpkix-jdk18on:${props.getProperty('bouncycastle')}"
api "org.bouncycastle:bcpg-jdk18on:${props.getProperty('bouncycastle')}"
api "org.bouncycastle:bcutil-jdk18on:${props.getProperty('bouncycastle')}"

testFixturesApi "junit:junit:${props.getProperty('junit')}"
testFixturesApi "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jetty = 9.4.53.v20231009
# when updating this version, you need to ensure compatibility with:
# - plugins/ingest-attachment (transitive dependency, check the upstream POM)
# - distribution/tools/plugin-cli
bouncycastle=1.78
bouncycastle=1.78.1
# test dependencies
randomizedrunner = 2.7.1
junit = 4.13.2
Expand Down
1 change: 0 additions & 1 deletion client/rest/licenses/bcprov-jdk18on-1.78.jar.sha1

This file was deleted.

22 changes: 0 additions & 22 deletions client/rest/licenses/bcprov-jdk18on-LICENSE.txt

This file was deleted.

Empty file.
8 changes: 8 additions & 0 deletions release-notes/opensearch.release-notes-1.3.17.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
## 2024-05-01 Version 1.3.17 Release Notes

### Upgrades
- Bump `org.bouncycastle:bcpkix-jdk15to18` from 1.75 to 1.76 ([10219](https://github.com/opensearch-project/OpenSearch/pull/10219))
- Bump `org.bouncycastle:bcprov-jdk15to18` to `org.bouncycastle:bcprov-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317))
- Bump `org.bouncycastle:bcmail-jdk15to18` to `org.bouncycastle:bcmail-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317))
- Bump `org.bouncycastle:bcpkix-jdk15to18` to `org.bouncycastle:bcpkix-jdk18on` version 1.77 ([#12317](https://github.com/opensearch-project/OpenSearch/pull/12317))
- Bump BouncyCastle from 1.77 to 1.78 ([#13243](https://github.com/opensearch-project/OpenSearch/pull/13243))

0 comments on commit d1969d3

Please sign in to comment.