Skip to content

Commit

Permalink
[Backport 2.x] Bump commons-cli:commons-cli from 1.6.0 to 1.7.0, Bump…
Browse files Browse the repository at this point in the history
… jakarta.enterprise:jakarta.enterprise.cdi-api from 4.0.1 to 4.1.0 (opensearch-project#13354)

* Bump commons-cli:commons-cli from 1.6.0 to 1.7.0 in /plugins/repository-hdfs (opensearch-project#13331)

* Bump commons-cli:commons-cli in /plugins/repository-hdfs

Bumps commons-cli:commons-cli from 1.6.0 to 1.7.0.

---
updated-dependencies:
- dependency-name: commons-cli:commons-cli
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Updating SHAs

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit c9f1565)

* Bump jakarta.enterprise:jakarta.enterprise.cdi-api from 4.0.1 to 4.1.0 in /qa/wildfly (opensearch-project#13328)

* Bump jakarta.enterprise:jakarta.enterprise.cdi-api in /qa/wildfly

Bumps [jakarta.enterprise:jakarta.enterprise.cdi-api](https://github.com/cdi-spec/cdi) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/cdi-spec/cdi/releases)
- [Commits](jakartaee/cdi@4.0.1...4.1.0)

---
updated-dependencies:
- dependency-name: jakarta.enterprise:jakarta.enterprise.cdi-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 7c6127a)

---------

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
kotwanikunal and dependabot[bot] authored Apr 24, 2024
1 parent 5628cc8 commit 1d78ac6
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Update google dependencies in repository-gcs and discovery-gce ([#13213](https://github.com/opensearch-project/OpenSearch/pull/13213))
- Bump `com.google.apis:google-api-services-compute` from v1-rev235-1.25.0 to v1-rev20240407-2.0.0 ([#13333](https://github.com/opensearch-project/OpenSearch/pull/13333))
- Bump `com.github.spullara.mustache.java:compiler` from 0.9.10 to 0.9.11 ([#13329](https://github.com/opensearch-project/OpenSearch/pull/13329))
- Bump `commons-cli:commons-cli` from 1.6.0 to 1.7.0 ([#13331](https://github.com/opensearch-project/OpenSearch/pull/13331))
- Bump `jakarta.enterprise:jakarta.enterprise.cdi-api` from 4.0.1 to 4.1.0 ([#13328](https://github.com/opensearch-project/OpenSearch/pull/13328))

### Changed
- [BWC and API enforcement] Enforcing the presence of API annotations at build time ([#12872](https://github.com/opensearch-project/OpenSearch/pull/12872))
Expand Down
2 changes: 1 addition & 1 deletion plugins/repository-hdfs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ dependencies {
api 'com.google.code.gson:gson:2.10.1'
runtimeOnly "com.google.guava:guava:${versions.guava}"
api "commons-logging:commons-logging:${versions.commonslogging}"
api 'commons-cli:commons-cli:1.6.0'
api 'commons-cli:commons-cli:1.7.0'
api "commons-codec:commons-codec:${versions.commonscodec}"
api 'commons-collections:commons-collections:3.2.2'
api "org.apache.commons:commons-compress:${versions.commonscompress}"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6504b3f17e8bc5adc6b6c8deecc90144d0154075
2 changes: 1 addition & 1 deletion qa/wildfly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ apply plugin: 'opensearch.internal-distribution-download'
testFixtures.useFixture()

dependencies {
providedCompile('jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1') {
providedCompile('jakarta.enterprise:jakarta.enterprise.cdi-api:4.1.0') {
exclude module: 'jakarta.annotation-api'
}
providedCompile 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
Expand Down

0 comments on commit 1d78ac6

Please sign in to comment.