Skip to content

Commit 7094de1

Browse files
authored
Add json-smart to version catalog (#17569)
Signed-off-by: Daniel Widdis <[email protected]>
1 parent 2ee8660 commit 7094de1

File tree

8 files changed

+8
-7
lines changed

8 files changed

+8
-7
lines changed

gradle/libs.versions.toml

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ google_auth = "1.29.0"
2828
tdigest = "3.3"
2929
hdrhistogram = "2.2.2"
3030
grpc = "1.68.2"
31+
json_smart = "2.5.2"
3132

3233
# when updating the JNA version, also update the version in buildSrc/build.gradle
3334
jna = "5.13.0"

plugins/repository-azure/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ dependencies {
6767
api 'com.nimbusds:content-type:2.3'
6868
api 'com.nimbusds:lang-tag:1.7'
6969
// Both msal4j:1.14.3 and oauth2-oidc-sdk:11.9.1 has compile dependency on different versions of json-smart,
70-
// selected the higher version which is 2.5.0
71-
api 'net.minidev:json-smart:2.5.1'
72-
api 'net.minidev:accessors-smart:2.5.1'
70+
// selected the higher version
71+
api "net.minidev:json-smart:${versions.json_smart}"
72+
api "net.minidev:accessors-smart:${versions.json_smart}"
7373
api "org.ow2.asm:asm:${versions.asm}"
7474
// End of transitive dependencies for azure-identity
7575
api "io.projectreactor.netty:reactor-netty-core:${versions.reactor_netty}"

plugins/repository-azure/licenses/accessors-smart-2.5.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ce16fd235cfee48e67eda33e684423bba09f7d07

plugins/repository-azure/licenses/json-smart-2.5.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
95d166b18f95907be0f46cdb9e1c0695eed03387

plugins/repository-hdfs/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ dependencies {
8181
api 'javax.servlet:servlet-api:2.5'
8282
api "org.slf4j:slf4j-api:${versions.slf4j}"
8383
api "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
84-
api 'net.minidev:json-smart:2.5.2'
84+
api "net.minidev:json-smart:${versions.json_smart}"
8585
api "io.netty:netty-all:${versions.netty}"
8686
implementation "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
8787
implementation 'org.codehaus.woodstox:stax2-api:4.2.2'

test/fixtures/hdfs-fixture/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dependencies {
6565
api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${versions.jackson}"
6666
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
6767
api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
68-
api 'net.minidev:json-smart:2.5.2'
68+
api "net.minidev:json-smart:${versions.json_smart}"
6969
api "org.mockito:mockito-core:${versions.mockito}"
7070
api "com.google.protobuf:protobuf-java:${versions.protobuf}"
7171
api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"

0 commit comments

Comments
 (0)