From cd071a5e07c8202c66db2e077ea43bea76d55511 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Apr 2021 15:45:25 +0200 Subject: Bump jsoup from 1.12.1 to 1.13.1 (#1783) --- core/build.gradle.kts | 2 +- integration-tests/build.gradle.kts | 2 +- plugins/all-modules-page/build.gradle.kts | 2 +- plugins/base/base-test-utils/build.gradle.kts | 2 +- .../src/main/kotlin/utils/assertHtmlEqualsIgnoringWhitespace.kt | 6 ++++-- plugins/base/build.gradle.kts | 2 +- plugins/kotlin-as-java/build.gradle.kts | 2 +- plugins/mathjax/build.gradle.kts | 2 +- plugins/templating/build.gradle.kts | 2 +- plugins/versioning/build.gradle.kts | 2 +- 10 files changed, 13 insertions(+), 11 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 138c77a7..2355d56e 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -9,7 +9,7 @@ plugins { dependencies { api("org.jetbrains:markdown:0.2.1") implementation(kotlin("reflect")) - implementation("org.jsoup:jsoup:1.12.1") + implementation("org.jsoup:jsoup:1.13.1") implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.1") diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts index d32f752c..7bc1976f 100644 --- a/integration-tests/build.gradle.kts +++ b/integration-tests/build.gradle.kts @@ -61,6 +61,6 @@ dependencies { api(project(":test-utils")) val coroutines_version: String by project implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version") - implementation("org.jsoup:jsoup:1.12.1") + implementation("org.jsoup:jsoup:1.13.1") implementation("org.eclipse.jgit:org.eclipse.jgit:5.11.0.202103091610-r") } diff --git a/plugins/all-modules-page/build.gradle.kts b/plugins/all-modules-page/build.gradle.kts index 0fe46579..dd423949 100644 --- a/plugins/all-modules-page/build.gradle.kts +++ b/plugins/all-modules-page/build.gradle.kts @@ -20,5 +20,5 @@ dependencies { val kotlinx_html_version: String by project implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version") - implementation("org.jsoup:jsoup:1.12.1") + implementation("org.jsoup:jsoup:1.13.1") } \ No newline at end of file diff --git a/plugins/base/base-test-utils/build.gradle.kts b/plugins/base/base-test-utils/build.gradle.kts index 8be9a0db..3ae15b3e 100644 --- a/plugins/base/base-test-utils/build.gradle.kts +++ b/plugins/base/base-test-utils/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.registerDokkaArtifactPublication dependencies { compileOnly(project(":plugins:base")) implementation(project(":core:test-api")) - implementation("org.jsoup:jsoup:1.12.1") + implementation("org.jsoup:jsoup:1.13.1") implementation(kotlin("test-junit")) } diff --git a/plugins/base/base-test-utils/src/main/kotlin/utils/assertHtmlEqualsIgnoringWhitespace.kt b/plugins/base/base-test-utils/src/main/kotlin/utils/assertHtmlEqualsIgnoringWhitespace.kt index f8ef8a41..95dcae4e 100644 --- a/plugins/base/base-test-utils/src/main/kotlin/utils/assertHtmlEqualsIgnoringWhitespace.kt +++ b/plugins/base/base-test-utils/src/main/kotlin/utils/assertHtmlEqualsIgnoringWhitespace.kt @@ -2,15 +2,17 @@ package utils import junit.framework.Assert.assertEquals import org.jsoup.Jsoup +import org.jsoup.nodes.Document /** * Parses it using JSOUP, trims whitespace at the end of the line and asserts if they are equal * parsing is required to unify the formatting */ fun assertHtmlEqualsIgnoringWhitespace(expected: String, actual: String) { + val ignoreFormattingSettings = Document.OutputSettings().indentAmount(0).outline(true) assertEquals( - Jsoup.parse(expected).outerHtml().trimSpacesAtTheEndOfLine(), - Jsoup.parse(actual).outerHtml().trimSpacesAtTheEndOfLine() + Jsoup.parse(expected).outputSettings(ignoreFormattingSettings).outerHtml().trimSpacesAtTheEndOfLine(), + Jsoup.parse(actual).outputSettings(ignoreFormattingSettings).outerHtml().trimSpacesAtTheEndOfLine() ) } diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts index 8794925a..1281ac3f 100644 --- a/plugins/base/build.gradle.kts +++ b/plugins/base/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version") api(project(":kotlin-analysis")) - implementation("org.jsoup:jsoup:1.12.1") + implementation("org.jsoup:jsoup:1.13.1") implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1") testImplementation(project(":plugins:base:base-test-utils")) testImplementation(project(":core:content-matcher-test-utils")) diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts index 2c7f1e01..4cbce45a 100644 --- a/plugins/kotlin-as-java/build.gradle.kts +++ b/plugins/kotlin-as-java/build.gradle.kts @@ -5,7 +5,7 @@ dependencies { testImplementation(project(":plugins:base")) testImplementation(project(":plugins:base:base-test-utils")) testImplementation(project(":core:content-matcher-test-utils")) - testImplementation("org.jsoup:jsoup:1.12.1") + testImplementation("org.jsoup:jsoup:1.13.1") } registerDokkaArtifactPublication("kotlinAsJavaPlugin") { diff --git a/plugins/mathjax/build.gradle.kts b/plugins/mathjax/build.gradle.kts index 448d9e6d..1d92c0be 100644 --- a/plugins/mathjax/build.gradle.kts +++ b/plugins/mathjax/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.registerDokkaArtifactPublication dependencies { - testImplementation("org.jsoup:jsoup:1.12.1") + testImplementation("org.jsoup:jsoup:1.13.1") testImplementation(project(":plugins:base")) testImplementation(project(":plugins:base:base-test-utils")) testImplementation(project(":core:content-matcher-test-utils")) diff --git a/plugins/templating/build.gradle.kts b/plugins/templating/build.gradle.kts index 6c160a9f..f62944fd 100644 --- a/plugins/templating/build.gradle.kts +++ b/plugins/templating/build.gradle.kts @@ -13,6 +13,6 @@ dependencies { val kotlinx_html_version: String by project implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version") - implementation("org.jsoup:jsoup:1.12.1") + implementation("org.jsoup:jsoup:1.13.1") testImplementation(project(":plugins:base:base-test-utils")) } \ No newline at end of file diff --git a/plugins/versioning/build.gradle.kts b/plugins/versioning/build.gradle.kts index 39cc0bdf..54249b90 100644 --- a/plugins/versioning/build.gradle.kts +++ b/plugins/versioning/build.gradle.kts @@ -14,6 +14,6 @@ dependencies { val kotlinx_html_version: String by project implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version") - implementation("org.jsoup:jsoup:1.12.1") + implementation("org.jsoup:jsoup:1.13.1") implementation("org.apache.maven:maven-artifact:3.6.3") } \ No newline at end of file -- cgit