Bump scribejava to 8.3.3 and jackson to 2.21.1 Update ScribeJava and Jackson Databind to newer versions. With ScribeJava 8.x, Java 8 specific functionality has been moved to a separate 'scribejava-java8' module. Since this is now a transitive dependency of scribejava-apis, we update the dependency lockfile and include it in our third-party runtime JARs allowlist to ensure it is correctly bundled into the plugin artifact. The Jackson bump ensures compatibility with the newer ScribeJava release and addresses potential security vulnerabilities in the older 2.10.x line. Change-Id: I27a4a1946b3f3e0eecf6dfd045d854cdd80dcb76
diff --git a/MODULE.bazel b/MODULE.bazel index 6f47498..83c2e6a 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -48,8 +48,8 @@ maven.install( name = "oauth_plugin_deps", artifacts = [ - "com.fasterxml.jackson.core:jackson-databind:2.10.2", - "com.github.scribejava:scribejava-apis:6.9.0", + "com.fasterxml.jackson.core:jackson-databind:2.21.1", + "com.github.scribejava:scribejava-apis:8.3.3", "com.sap.cloud.security:java-security:3.6.0", ], duplicate_version_warning = "error",
diff --git a/oauth_plugin_deps.lock.json b/oauth_plugin_deps.lock.json index 034495f..696f5ea 100644 --- a/oauth_plugin_deps.lock.json +++ b/oauth_plugin_deps.lock.json
@@ -1,25 +1,27 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", "__INPUT_ARTIFACTS_HASH": { - "com.fasterxml.jackson.core:jackson-databind": 1009785917, + "com.fasterxml.jackson.core:jackson-databind": 1149371740, "com.github.ben-manes.caffeine:caffeine": -1640976164, - "com.github.scribejava:scribejava-apis": 1477368439, + "com.github.scribejava:scribejava-apis": 1954939894, "com.sap.cloud.security:java-security": 794433498, "commons-io:commons-io": 150368282, "org.slf4j:slf4j-api": 2145585153, "repositories": -1949687017 }, "__RESOLVED_ARTIFACTS_HASH": { - "com.fasterxml.jackson.core:jackson-annotations": 1228906799, - "com.fasterxml.jackson.core:jackson-annotations:jar:sources": -277300575, - "com.fasterxml.jackson.core:jackson-core": 1550936961, - "com.fasterxml.jackson.core:jackson-core:jar:sources": -1497775698, - "com.fasterxml.jackson.core:jackson-databind": 580126352, - "com.fasterxml.jackson.core:jackson-databind:jar:sources": -645758670, - "com.github.scribejava:scribejava-apis": -653050744, - "com.github.scribejava:scribejava-apis:jar:sources": -1859576969, - "com.github.scribejava:scribejava-core": 1406089847, - "com.github.scribejava:scribejava-core:jar:sources": -14907717, + "com.fasterxml.jackson.core:jackson-annotations": 1145483352, + "com.fasterxml.jackson.core:jackson-annotations:jar:sources": -1434301790, + "com.fasterxml.jackson.core:jackson-core": -2091189806, + "com.fasterxml.jackson.core:jackson-core:jar:sources": 1745403859, + "com.fasterxml.jackson.core:jackson-databind": 1402680186, + "com.fasterxml.jackson.core:jackson-databind:jar:sources": -63965010, + "com.github.scribejava:scribejava-apis": 122120106, + "com.github.scribejava:scribejava-apis:jar:sources": 1829844008, + "com.github.scribejava:scribejava-core": -1328542772, + "com.github.scribejava:scribejava-core:jar:sources": 242143042, + "com.github.scribejava:scribejava-java8": 427226495, + "com.github.scribejava:scribejava-java8:jar:sources": 1604009525, "com.sap.cloud.environment.servicebinding.api:java-access-api": 2007607395, "com.sap.cloud.environment.servicebinding.api:java-access-api:jar:sources": -1233227292, "com.sap.cloud.environment.servicebinding.api:java-consumption-api": -1817974863, @@ -44,38 +46,45 @@ "artifacts": { "com.fasterxml.jackson.core:jackson-annotations": { "shasums": { - "jar": "8c3cba89bf3e03b35a0e6f892c2eb17ed8fdde2e214c3a4c18703d63796bae46", - "sources": "9ab9d0a64a8d911bc2dd4edcbf76dcf43af0d9c1835f30a3117f972de55bbe90" + "jar": "53ca085f4a150f703f49e1aabd935bd03b43e1ea3d55d135438292af22cef56b", + "sources": "71fe6323d91b16d5d1007fd1e1533fa06bb369abde74f68a42a68c0f8f061a8b" }, - "version": "2.10.2" + "version": "2.21" }, "com.fasterxml.jackson.core:jackson-core": { "shasums": { - "jar": "4c41f22a48f6ebb28752baeb6d25bf09ba4ff0ad8bfb82650dde448928b9da4f", - "sources": "3f356724ca7a5ba77a18e5448e31d544a4e04b9beca585f680fed81ff80767fb" + "jar": "1edd5f2e49dca5f8e4519957c24b7b3050bd1c7ee883920da33cff031ff1f7c0", + "sources": "50d16c835cd81fd829036d551c73c40196a988dd6c55d00590e3e0bb41deda32" }, - "version": "2.10.2" + "version": "2.21.1" }, "com.fasterxml.jackson.core:jackson-databind": { "shasums": { - "jar": "42c25644e35fadfbded1b7f35a8d1e70a86737f190e43aa2c56cea4b96cbda88", - "sources": "6436b499a6d31caf37b2a03af3d1729c9d53b9971fbf40b9239da8551b3e8db6" + "jar": "b011eb5202d9ec889e27f1dcbdf6c63f06a76e7a16c0a1b30c6048d556c9a28e", + "sources": "f9f1f15b07eed9bc0fa2a3ab0ee0f7e9ebe3c17dd4ea519cc7509625a57777ca" }, - "version": "2.10.2" + "version": "2.21.1" }, "com.github.scribejava:scribejava-apis": { "shasums": { - "jar": "c563bcd2bae1f3e671d034ebb18006ddb214174fc0ec8a68ac9fa4cc3fc81000", - "sources": "31939f8da8bec28fea7c82dcba56ea565a8bfb9b92bd351eccf10e6c79e8911b" + "jar": "fd39f6278f42b55d127c9cae1a5f141883f35a89fd17ca38e629afedca3d6f99", + "sources": "6d408e619342bc097dbc2ff794d3044a5c9a2b142351cc40f6241fec0b29c0aa" }, - "version": "6.9.0" + "version": "8.3.3" }, "com.github.scribejava:scribejava-core": { "shasums": { - "jar": "7901774ed1b3d1634a2e50320a0687d499389a6fecf83f788f5297900f6338c0", - "sources": "798206cbb8457fa55c2a15a82a39277fafbc54f6ca1a65ce709214c5262eaf64" + "jar": "b21eacc12983b0de585b05ef307b35f012e48f2898a4acdba529bbb0d379c443", + "sources": "20edab88eea3bb900edf24195e321318dd598c60441eb708f61d2984ad552f3e" }, - "version": "6.9.0" + "version": "8.3.3" + }, + "com.github.scribejava:scribejava-java8": { + "shasums": { + "jar": "d5dd567b7095f21740da30f691d762521d105b07e25bc4d668ffda1c0b5370cc", + "sources": "acb7c5008b85efae739eb1502e8ee8b0e8ba06afc1053e820e0a27fff7618746" + }, + "version": "8.3.3" }, "com.sap.cloud.environment.servicebinding.api:java-access-api": { "shasums": { @@ -158,6 +167,10 @@ "com.github.scribejava:scribejava-core" ], "com.github.scribejava:scribejava-core": [ + "com.fasterxml.jackson.core:jackson-databind", + "com.github.scribejava:scribejava-java8" + ], + "com.github.scribejava:scribejava-java8": [ "com.fasterxml.jackson.core:jackson-databind" ], "com.sap.cloud.environment.servicebinding.api:java-access-api": [ @@ -205,7 +218,11 @@ "com.fasterxml.jackson.core.exc", "com.fasterxml.jackson.core.filter", "com.fasterxml.jackson.core.format", + "com.fasterxml.jackson.core.internal.shaded.fdp.v2_21_1", + "com.fasterxml.jackson.core.internal.shaded.fdp.v2_21_1.bte", + "com.fasterxml.jackson.core.internal.shaded.fdp.v2_21_1.chr", "com.fasterxml.jackson.core.io", + "com.fasterxml.jackson.core.io.schubfach", "com.fasterxml.jackson.core.json", "com.fasterxml.jackson.core.json.async", "com.fasterxml.jackson.core.sym", @@ -222,6 +239,7 @@ "com.fasterxml.jackson.databind.exc", "com.fasterxml.jackson.databind.ext", "com.fasterxml.jackson.databind.introspect", + "com.fasterxml.jackson.databind.jdk14", "com.fasterxml.jackson.databind.json", "com.fasterxml.jackson.databind.jsonFormatVisitors", "com.fasterxml.jackson.databind.jsonschema", @@ -233,23 +251,29 @@ "com.fasterxml.jackson.databind.ser.impl", "com.fasterxml.jackson.databind.ser.std", "com.fasterxml.jackson.databind.type", - "com.fasterxml.jackson.databind.util" + "com.fasterxml.jackson.databind.util", + "com.fasterxml.jackson.databind.util.internal" ], "com.github.scribejava:scribejava-apis": [ "com.github.scribejava.apis", "com.github.scribejava.apis.facebook", "com.github.scribejava.apis.fitbit", + "com.github.scribejava.apis.google", "com.github.scribejava.apis.imgur", + "com.github.scribejava.apis.instagram", "com.github.scribejava.apis.mailru", "com.github.scribejava.apis.microsoftazureactivedirectory", "com.github.scribejava.apis.odnoklassniki", "com.github.scribejava.apis.openid", + "com.github.scribejava.apis.polar", "com.github.scribejava.apis.salesforce", + "com.github.scribejava.apis.slack", "com.github.scribejava.apis.tutby", "com.github.scribejava.apis.vk", "com.github.scribejava.apis.wunderlist" ], "com.github.scribejava:scribejava-core": [ + "com.github.scribejava.core.base64", "com.github.scribejava.core.builder", "com.github.scribejava.core.builder.api", "com.github.scribejava.core.exceptions", @@ -257,7 +281,6 @@ "com.github.scribejava.core.httpclient", "com.github.scribejava.core.httpclient.jdk", "com.github.scribejava.core.httpclient.multipart", - "com.github.scribejava.core.java8", "com.github.scribejava.core.model", "com.github.scribejava.core.oauth", "com.github.scribejava.core.oauth2", @@ -268,6 +291,9 @@ "com.github.scribejava.core.services", "com.github.scribejava.core.utils" ], + "com.github.scribejava:scribejava-java8": [ + "com.github.scribejava.java8.base64" + ], "com.sap.cloud.environment.servicebinding.api:java-access-api": [ "com.sap.cloud.environment.servicebinding.api", "com.sap.cloud.environment.servicebinding.api.exception" @@ -333,6 +359,8 @@ "com.github.scribejava:scribejava-apis:jar:sources", "com.github.scribejava:scribejava-core", "com.github.scribejava:scribejava-core:jar:sources", + "com.github.scribejava:scribejava-java8", + "com.github.scribejava:scribejava-java8:jar:sources", "com.sap.cloud.environment.servicebinding.api:java-access-api", "com.sap.cloud.environment.servicebinding.api:java-access-api:jar:sources", "com.sap.cloud.environment.servicebinding.api:java-consumption-api",
diff --git a/oauth_third_party_runtime_jars.allowlist.txt b/oauth_third_party_runtime_jars.allowlist.txt index 15953aa..899941d 100644 --- a/oauth_third_party_runtime_jars.allowlist.txt +++ b/oauth_third_party_runtime_jars.allowlist.txt
@@ -12,4 +12,5 @@ json scribejava-apis scribejava-core +scribejava-java8 token-client