Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/gradle/spark/sql-30/com.fasterxml…
Browse files Browse the repository at this point in the history
….jackson.core-jackson-annotations-2.18.2

Signed-off-by: Thomas Farr <[email protected]>
  • Loading branch information
Xtansia authored Dec 3, 2024
2 parents 2175dee + 46f5c69 commit 904b6c1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
### Security

### Dependencies
- Bumps `com.fasterxml.jackson.core:jackson-databind` from 2.17.2 to 2.18.1
- Bumps `com.fasterxml.jackson.core:jackson-databind` from 2.17.2 to 2.18.2
- Bumps `com.fasterxml.jackson.core:jackson-annotations` from 2.17.2 to 2.18.2
- Bumps `io.netty:netty-all` from 4.1.112.Final to 4.1.115.Final
- Bumps `com.google.protobuf:protobuf-java` from 4.28.2 to 4.28.3
Expand Down
4 changes: 2 additions & 2 deletions hive/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies {
testImplementation("org.apache.hive:hive-jdbc:$hiveVersion") {
exclude module: "log4j-slf4j-impl"
}
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.1")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")

itestImplementation(project(":test:shared"))
itestImplementation("org.apache.hive:hive-service:$hiveVersion") {
Expand All @@ -52,7 +52,7 @@ dependencies {
exclude module: "log4j-slf4j-impl"
}
itestImplementation("org.apache.tez:tez-dag:0.9.2")
itestImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.1")
itestImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")

additionalSources(project(":opensearch-hadoop-mr"))
javadocSources(project(":opensearch-hadoop-mr"))
Expand Down
4 changes: 2 additions & 2 deletions mr/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ dependencies {
implementation("javax.xml.bind:jaxb-api:2.3.1")

testImplementation(project(":test:shared"))
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.1")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
testImplementation("io.netty:netty-all:4.1.115.Final")
testImplementation("org.elasticsearch:securemock:1.2")

itestEmbedded(project(":test:shared"))
itestImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.1")
itestImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
itestImplementation("org.apache.hadoop:hadoop-minikdc:${project.ext.minikdcVersion}") {
// For some reason, the dependencies that are pulled in with MiniKDC have multiple resource files
// that cause issues when they are loaded. We exclude the ldap schema data jar to get around this.
Expand Down

0 comments on commit 904b6c1

Please sign in to comment.