Skip to content

Commit

Permalink
Merge branch '1.3' into version-bump-cve
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Widdis <[email protected]>
  • Loading branch information
dbwiddis authored Dec 5, 2024
2 parents e820f08 + 6c40db0 commit eb8e5c1
Show file tree
Hide file tree
Showing 16 changed files with 13 additions and 11 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Bump `org.bouncycastle:bc-fips` from 1.0.2.4 to 1.0.2.5 ([#13446](https://github.com/opensearch-project/OpenSearch/pull/13446))
- Bump `Netty` from 4.1.114.Final to 4.1.115.Final ([#16661](https://github.com/opensearch-project/OpenSearch/pull/16661))
- Bump `avro` from 1.11.3 to 1.11.4 ([#16773](https://github.com/opensearch-project/OpenSearch/pull/16773))
- Bump `protobuf-java` to 3.22.5 ([#16779](https://github.com/opensearch-project/OpenSearch/pull/16779))
- Bump `commonsio` to 2.16.0 ([#16780](https://github.com/opensearch-project/OpenSearch/pull/16780))

### Changed
### Deprecated
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ dependencies {
}
api 'org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r'
api 'org.apache.rat:apache-rat:0.13'
api 'commons-io:commons-io:2.7'
api 'commons-io:commons-io:2.16.0'
api "net.java.dev.jna:jna:5.5.0"
api 'com.github.jengelman.gradle.plugins:shadow:6.0.0'
api 'de.thetaphi:forbiddenapis:3.2'
Expand Down
2 changes: 1 addition & 1 deletion plugins/discovery-azure-classic/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies {
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api "commons-lang:commons-lang:2.6"
api "commons-io:commons-io:2.7"
api "commons-io:commons-io:2.16.0"
api 'javax.mail:mail:1.4.7'
api 'javax.inject:javax.inject:1'
api "com.sun.jersey:jersey-client:${versions.jersey}"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
27875a7935f1ddcc13267eb6fae1f719e0409572

This file was deleted.

2 changes: 1 addition & 1 deletion plugins/ingest-attachment/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ dependencies {
runtimeOnly "com.google.guava:guava:${versions.guava}"
// Other dependencies
api 'org.tukaani:xz:1.9'
api 'commons-io:commons-io:2.11.0'
api 'commons-io:commons-io:2.16.0'
api "org.slf4j:slf4j-api:${versions.slf4j}"

// character set detection
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
27875a7935f1ddcc13267eb6fae1f719e0409572
2 changes: 1 addition & 1 deletion plugins/repository-gcs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies {
api 'com.google.api:gax:1.54.0'
api 'org.threeten:threetenbp:1.4.4'
api 'com.google.protobuf:protobuf-java-util:3.25.5'
api 'com.google.protobuf:protobuf-java:3.25.5'
api "com.google.protobuf:protobuf-java:${versions.protobuf}"
api 'com.google.code.gson:gson:2.8.9'
api 'com.google.api.grpc:proto-google-common-protos:1.16.0'
api 'com.google.api.grpc:proto-google-iam-v1:0.12.0'
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fdee98b8f6abab73f146a4edb4c09e56f8278d03
4 changes: 2 additions & 2 deletions plugins/repository-hdfs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ dependencies {
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
api 'com.google.code.gson:gson:2.9.0'
runtimeOnly "com.google.guava:guava:${versions.guava}"
api 'com.google.protobuf:protobuf-java:3.25.5'
api "com.google.protobuf:protobuf-java:${versions.protobuf}"
api 'commons-logging:commons-logging:1.1.3'
api 'commons-cli:commons-cli:1.2'
api "commons-codec:commons-codec:${versions.commonscodec}"
api 'commons-collections:commons-collections:3.2.2'
api 'org.apache.commons:commons-compress:1.26.1'
api 'org.apache.commons:commons-configuration2:2.8.0'
api 'commons-io:commons-io:2.11.0'
api 'commons-io:commons-io:2.16.0'
api 'org.apache.commons:commons-lang3:3.7'
implementation 'com.google.re2j:re2j:1.1'
api 'javax.servlet:servlet-api:2.5'
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
27875a7935f1ddcc13267eb6fae1f719e0409572

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fdee98b8f6abab73f146a4edb4c09e56f8278d03

0 comments on commit eb8e5c1

Please sign in to comment.