SDKS-2751 - woodstox vulnerability fix

ForgeRock · Dec 8, 2023 · 9dc3eae · 9dc3eae
1 parent 9803dbc
commit 9dc3eae
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -75,10 +75,12 @@ You can build the API reference documentation, which uses Dokka to generate eith
 
 HTML
 : `./gradlew clean dokkaHtmlMultiModule` 
+: `./gradlew clean dokkaHtml`
 : View the output at [`build/api-reference/html/`](build/api-reference/html/index.html).
 
 JavaDoc
 : `./gradlew clean dokkaJavadocCollector`
+: `./gradlew clean dokkaJavadoc`
 : View the output at [`build/api-reference/javadoc/`](build/api-reference/javadoc/index.html).
 
 > **TIP**: Use the following command to build both HTML and JavaDoc: 

diff --git a/build.gradle b/build.gradle
@@ -21,13 +21,12 @@ buildscript {
             url "https://plugins.gradle.org/m2/"
         }
     }
+
     dependencies {
         classpath 'com.android.tools.build:gradle:8.1.0'
         classpath "com.adarshr:gradle-test-logger-plugin:2.0.0"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.8.20"
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -36,10 +35,9 @@ buildscript {
 plugins {
     id('io.github.gradle-nexus.publish-plugin') version '1.1.0'
     id('org.sonatype.gradle.plugins.scan') version '2.4.0'
+    id 'org.jetbrains.dokka' version '1.9.10'
 }
 
-apply plugin: "org.jetbrains.dokka"
-
 allprojects {
     repositories {
         google()

diff --git a/forgerock-auth/build.gradle b/forgerock-auth/build.gradle
@@ -11,7 +11,6 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
-apply plugin: 'org.jetbrains.dokka'
 
 android {
     namespace 'org.forgerock.android.auth'
@@ -92,6 +91,9 @@ configurations.all {
         //on version < 3.4.0, this library is depended by okhttp, when okhttp upgrade, this needs
         //to be reviewed
         force 'com.squareup.okio:okio:3.4.0'
+        force 'com.fasterxml.jackson.module:jackson-module-kotlin:2.13.5'
+        force 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.5'
+        force 'com.fasterxml.jackson.core:jackson-databind:2.13.5'
     }
 }
 dependencies {

diff --git a/forgerock-authenticator/build.gradle b/forgerock-authenticator/build.gradle
@@ -92,6 +92,9 @@ configurations.all {
         //on version < 3.4.0, this library is depended by okhttp, when okhttp upgrade, this needs
         //to be reviewed
         force 'com.squareup.okio:okio:3.4.0'
+        force 'com.fasterxml.jackson.module:jackson-module-kotlin:2.13.5'
+        force 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.5'
+        force 'com.fasterxml.jackson.core:jackson-databind:2.13.5'
     }
 }
 dependencies {

diff --git a/forgerock-core/build.gradle b/forgerock-core/build.gradle
@@ -10,7 +10,6 @@ apply plugin: "com.adarshr.test-logger"
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 apply plugin: 'kotlin-android'
-apply plugin: 'org.jetbrains.dokka'
 
 android {
     namespace 'org.forgerock.android.core'
@@ -76,6 +75,10 @@ configurations.all {
         //on version < 3.4.0, this library is depended by okhttp, when okhttp upgrade, this needs
         //to be reviewed
         force 'com.squareup.okio:okio:3.4.0'
+
+        force 'com.fasterxml.jackson.module:jackson-module-kotlin:2.13.5'
+        force 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.5'
+        force 'com.fasterxml.jackson.core:jackson-databind:2.13.5'
     }
 }
 /**