Match version of zstd-jni from core (#2832)

cwperks · web-flow · commit abcb3a2124b3 · 2023-06-05T09:34:27.000-04:00
* Match version of zstd-jni from core

Signed-off-by: Craig Perkins &lt;cwperx@amazon.com&gt;

* Add zstd version from core to force resolutions section

Signed-off-by: Craig Perkins &lt;cwperx@amazon.com&gt;

---------

Signed-off-by: Craig Perkins &lt;cwperx@amazon.com&gt;
diff --git a/build.gradle b/build.gradle
@@ -338,6 +338,7 @@ configurations {
             force "io.netty:netty-transport:${versions.netty}"
             force "io.netty:netty-transport-native-unix-common:${versions.netty}"
             force "org.apache.bcel:bcel:6.6.0" // This line should be removed once Spotbugs is upgraded to 4.7.4
+            force "com.github.luben:zstd-jni:${versions.zstd}"
         }
     }
 
@@ -460,7 +461,7 @@ dependencies {
     runtimeOnly 'com.fasterxml.woodstox:woodstox-core:6.4.0'
     runtimeOnly 'org.apache.ws.xmlschema:xmlschema-core:2.2.5'
     runtimeOnly 'org.apache.santuario:xmlsec:2.2.3'
-    runtimeOnly 'com.github.luben:zstd-jni:1.5.2-1'
+    runtimeOnly "com.github.luben:zstd-jni:${versions.zstd}"
     runtimeOnly 'org.checkerframework:checker-qual:3.5.0'
     runtimeOnly "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"
 

Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,7 @@ configurations {`
`338`	`338`	`force "io.netty:netty-transport:${versions.netty}"`
`339`	`339`	`force "io.netty:netty-transport-native-unix-common:${versions.netty}"`
`340`	`340`	`force "org.apache.bcel:bcel:6.6.0" // This line should be removed once Spotbugs is upgraded to 4.7.4`
	`341`	`+ force "com.github.luben:zstd-jni:${versions.zstd}"`
`341`	`342`	`}`
`342`	`343`	`}`
`343`	`344`
`@@ -460,7 +461,7 @@ dependencies {`
`460`	`461`	`runtimeOnly 'com.fasterxml.woodstox:woodstox-core:6.4.0'`
`461`	`462`	`runtimeOnly 'org.apache.ws.xmlschema:xmlschema-core:2.2.5'`
`462`	`463`	`runtimeOnly 'org.apache.santuario:xmlsec:2.2.3'`
`463`		`- runtimeOnly 'com.github.luben:zstd-jni:1.5.2-1'`
	`464`	`+ runtimeOnly "com.github.luben:zstd-jni:${versions.zstd}"`
`464`	`465`	`runtimeOnly 'org.checkerframework:checker-qual:3.5.0'`
`465`	`466`	`runtimeOnly "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"`
`466`	`467`