diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index feabfb3..063eb66 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] java = "17" -checkstyle = "10.18.2" +checkstyle = "10.20.2" jacoco = "0.8.12" -junit = "5.11.2" +junit = "5.11.3" spotbugs = "4.8.6" [plugins] cthingVersioning = { id = "org.cthing.cthing-versioning", version = "3.0.0" } -dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version = "2.2.0" } -spotbugs = { id = "com.github.spotbugs", version = "6.0.25" } +dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version = "2.6.0" } +spotbugs = { id = "com.github.spotbugs", version = "6.0.26" } versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } [libraries] @@ -17,6 +17,6 @@ cthingAnnots = "org.cthing:cthing-annotations:2.0.0" jspecify = "org.jspecify:jspecify:1.0.0" junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } -junitLauncher = "org.junit.platform:junit-platform-launcher:1.11.2" +junitLauncher = "org.junit.platform:junit-platform-launcher:1.11.3" junitParams = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" } -spotbugsContrib = "com.mebigfatguy.sb-contrib:sb-contrib:7.6.5" +spotbugsContrib = "com.mebigfatguy.sb-contrib:sb-contrib:7.6.8" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index 909f473..b5d090d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ rootProject.name = "escapers" plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0") + id("org.gradle.toolchains.foojay-resolver-convention") version ("0.9.0") } diff --git a/src/main/java/org/cthing/escapers/HtmlEscaper.java b/src/main/java/org/cthing/escapers/HtmlEscaper.java index ee87ffc..e5c1797 100644 --- a/src/main/java/org/cthing/escapers/HtmlEscaper.java +++ b/src/main/java/org/cthing/escapers/HtmlEscaper.java @@ -138,6 +138,7 @@ * * * + * *

* Characters not listed in the above table are not included in the output (e.g. the null character 0x00 is dropped). *

@@ -168,6 +169,7 @@ public enum Option { * (£). See * Section 24.2 of the HTML 4 * specification for the complete list of ISO Latin-1 character entities. + * *

* Note that markup-significant HTML escapes are always applied (e.g. <, ") regardless of * the use of this option. @@ -182,6 +184,7 @@ public enum Option { * Section 24.3 and * Section 24.4 of the HTML 4 * specification for the complete list of these character entities. + * *

* Note that markup-significant HTML escapes are always applied (e.g. <, ") regardless of * the use of this option. diff --git a/src/main/java/org/cthing/escapers/XmlEscaper.java b/src/main/java/org/cthing/escapers/XmlEscaper.java index 7480a68..75c1f76 100644 --- a/src/main/java/org/cthing/escapers/XmlEscaper.java +++ b/src/main/java/org/cthing/escapers/XmlEscaper.java @@ -136,6 +136,7 @@ * * * + * *

* The characters in the above table correspond to the valid XML * characters. Invalid characters are not included in the output (e.g. the null character 0x00 is dropped). diff --git a/src/main/java/org/cthing/escapers/YamlEscaper.java b/src/main/java/org/cthing/escapers/YamlEscaper.java index 7ad68ab..795b97d 100644 --- a/src/main/java/org/cthing/escapers/YamlEscaper.java +++ b/src/main/java/org/cthing/escapers/YamlEscaper.java @@ -21,6 +21,7 @@ * Escaped Characters section of the * YAML Ain’t Markup Language specification. The returned string * may be surrounded by single or double quotes depending on the characters found in the string. + * *

* The returned string will be surrounded by double quotes under the following conditions: *

@@ -28,6 +29,7 @@ *
  • The string contains a character that requires escaping
    • *
  • The string contains a double quote, single quote or backslash
    • * + * *

    * The returned string will be surrounded by single quotes under the following conditions *

    @@ -39,9 +41,11 @@ *
  • The string end with the document end character sequence
    • *
  • The string contains any of the following characters: {@literal # , [ ] { } & * ! | > % @ ? : - /}
    • * + * *

    * If none of the above conditions apply, the string is returned without quotes. *

    + * *

    * Characters are escaped according to the following table: *