From 1da0b1c0ce3781d111af3b85fa16be66d9ce5b30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 13:01:54 +0000 Subject: [PATCH 1/2] build(deps): bump the dependencies group with 38 updates Bumps the dependencies group with 38 updates: | Package | From | To | | --- | --- | --- | | org.apache.commons:commons-lang3 | `3.14.0` | `3.17.0` | | org.apache.commons:commons-text | `1.12.0` | `1.13.0` | | [org.springframework:spring-webmvc](https://github.com/spring-projects/spring-framework) | `6.1.10` | `6.2.5` | | [org.springframework:spring-test](https://github.com/spring-projects/spring-framework) | `6.1.10` | `6.2.5` | | org.slf4j:slf4j-api | `2.0.13` | `2.0.17` | | [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) | `2.17.1` | `2.18.3` | | [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) | `1.5.6` | `1.5.18` | | [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) | `5.10.3` | `5.12.1` | | [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) | `5.10.3` | `5.12.1` | | [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) | `5.10.3` | `5.12.1` | | [org.yaml:snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) | `2.2` | `2.4` | | [org.hamcrest:hamcrest](https://github.com/hamcrest/JavaHamcrest) | `2.2` | `3.0` | | [org.mockito:mockito-core](https://github.com/mockito/mockito) | `5.12.0` | `5.17.0` | | [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) | `3.13.0` | `3.14.0` | | [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) | `3.7.0` | `3.11.2` | | [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) | `3.3.0` | `3.5.3` | | [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) | `2.43.0` | `2.44.4` | | [org.codehaus.mojo:exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) | `3.3.0` | `3.5.0` | | [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) | `3.2.4` | `3.2.7` | | [org.antlr:antlr4-runtime](https://github.com/antlr/antlr4) | `4.13.1` | `4.13.2` | | [org.antlr:antlr4-maven-plugin](https://github.com/antlr/antlr4) | `4.13.1` | `4.13.2` | | [org.openjdk.nashorn:nashorn-core](https://github.com/openjdk/nashorn) | `15.4` | `15.6` | | [org.jacoco:org.jacoco.agent](https://github.com/jacoco/jacoco) | `0.8.12` | `0.8.13` | | [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) | `0.8.12` | `0.8.13` | | [org.junit.platform:junit-platform-suite](https://github.com/junit-team/junit5) | `1.10.3` | `1.12.1` | | commons-io:commons-io | `2.16.1` | `2.18.0` | | org.apache.felix:maven-bundle-plugin | `5.1.9` | `6.0.0` | | [joda-time:joda-time](https://github.com/JodaOrg/joda-time) | `2.12.7` | `2.14.0` | | [com.google.guava:guava](https://github.com/google/guava) | `33.2.1-jre` | `33.4.6-jre` | | [com.github.ben-manes.caffeine:caffeine](https://github.com/ben-manes/caffeine) | `3.1.8` | `3.2.0` | | [org.apache.maven:maven-plugin-api](https://github.com/apache/maven) | `3.9.8` | `3.9.9` | | org.apache.maven:maven-core | `3.9.8` | `3.9.9` | | [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) | `3.13.1` | `3.15.1` | | [org.codehaus.plexus:plexus-utils](https://github.com/codehaus-plexus/plexus-utils) | `4.0.1` | `4.0.2` | | [org.codehaus.plexus:plexus-xml](https://github.com/codehaus-plexus/plexus-xml) | `4.0.4` | `4.1.0` | | com.google.javascript:closure-compiler | `v20240317` | `v20250402` | | [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) | `3.13.1` | `3.15.1` | | [org.apache.maven.plugins:maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) | `3.1.2` | `3.1.4` | Updates `org.apache.commons:commons-lang3` from 3.14.0 to 3.17.0 Updates `org.apache.commons:commons-text` from 1.12.0 to 1.13.0 Updates `org.springframework:spring-webmvc` from 6.1.10 to 6.2.5 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.10...v6.2.5) Updates `org.springframework:spring-test` from 6.1.10 to 6.2.5 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.10...v6.2.5) Updates `org.springframework:spring-test` from 6.1.10 to 6.2.5 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.10...v6.2.5) Updates `org.slf4j:slf4j-api` from 2.0.13 to 2.0.17 Updates `com.fasterxml.jackson.core:jackson-databind` from 2.17.1 to 2.18.3 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `ch.qos.logback:logback-classic` from 1.5.6 to 1.5.18 - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](https://github.com/qos-ch/logback/compare/v_1.5.6...v_1.5.18) Updates `org.junit.jupiter:junit-jupiter-api` from 5.10.3 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.12.1) Updates `org.junit.jupiter:junit-jupiter-params` from 5.10.3 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.12.1) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.10.3 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.12.1) Updates `org.junit.jupiter:junit-jupiter-params` from 5.10.3 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.12.1) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.10.3 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.12.1) Updates `org.yaml:snakeyaml` from 2.2 to 2.4 - [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-2.4..snakeyaml-2.2) Updates `org.hamcrest:hamcrest` from 2.2 to 3.0 - [Release notes](https://github.com/hamcrest/JavaHamcrest/releases) - [Changelog](https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md) - [Commits](https://github.com/hamcrest/JavaHamcrest/compare/v2.2...v3.0) Updates `org.mockito:mockito-core` from 5.12.0 to 5.17.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.12.0...v5.17.0) Updates `org.apache.maven.plugins:maven-compiler-plugin` from 3.13.0 to 3.14.0 - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.13.0...maven-compiler-plugin-3.14.0) Updates `org.apache.maven.plugins:maven-javadoc-plugin` from 3.7.0 to 3.11.2 - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.7.0...maven-javadoc-plugin-3.11.2) Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.3.0 to 3.5.3 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.5.3) Updates `com.diffplug.spotless:spotless-maven-plugin` from 2.43.0 to 2.44.4 - [Release notes](https://github.com/diffplug/spotless/releases) - [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md) - [Commits](https://github.com/diffplug/spotless/compare/lib/2.43.0...maven/2.44.4) Updates `org.codehaus.mojo:exec-maven-plugin` from 3.3.0 to 3.5.0 - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases) - [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/3.3.0...3.5.0) Updates `org.apache.maven.plugins:maven-gpg-plugin` from 3.2.4 to 3.2.7 - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.4...maven-gpg-plugin-3.2.7) Updates `org.antlr:antlr4-runtime` from 4.13.1 to 4.13.2 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/dev/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.13.1...4.13.2) Updates `org.antlr:antlr4-maven-plugin` from 4.13.1 to 4.13.2 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/dev/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.13.1...4.13.2) Updates `org.openjdk.nashorn:nashorn-core` from 15.4 to 15.6 - [Changelog](https://github.com/openjdk/nashorn/blob/main/CHANGELOG.md) - [Commits](https://github.com/openjdk/nashorn/compare/release-15.4...release-15.6) Updates `org.jacoco:org.jacoco.agent` from 0.8.12 to 0.8.13 - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.12...v0.8.13) Updates `org.jacoco:jacoco-maven-plugin` from 0.8.12 to 0.8.13 - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.12...v0.8.13) Updates `org.junit.platform:junit-platform-suite` from 1.10.3 to 1.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/commits) Updates `commons-io:commons-io` from 2.16.1 to 2.18.0 Updates `org.antlr:antlr4-maven-plugin` from 4.13.1 to 4.13.2 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/dev/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.13.1...4.13.2) Updates `org.apache.felix:maven-bundle-plugin` from 5.1.9 to 6.0.0 Updates `org.jacoco:jacoco-maven-plugin` from 0.8.12 to 0.8.13 - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.12...v0.8.13) Updates `joda-time:joda-time` from 2.12.7 to 2.14.0 - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.12.7...v2.14.0) Updates `com.google.guava:guava` from 33.2.1-jre to 33.4.6-jre - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) Updates `com.github.ben-manes.caffeine:caffeine` from 3.1.8 to 3.2.0 - [Release notes](https://github.com/ben-manes/caffeine/releases) - [Commits](https://github.com/ben-manes/caffeine/compare/v3.1.8...v3.2.0) Updates `org.apache.maven:maven-plugin-api` from 3.9.8 to 3.9.9 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.9.8...maven-3.9.9) Updates `org.apache.maven:maven-core` from 3.9.8 to 3.9.9 Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.13.1 to 3.15.1 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.13.1...maven-plugin-tools-3.15.1) Updates `org.codehaus.plexus:plexus-utils` from 4.0.1 to 4.0.2 - [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases) - [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-4.0.1...plexus-utils-4.0.2) Updates `org.codehaus.plexus:plexus-xml` from 4.0.4 to 4.1.0 - [Release notes](https://github.com/codehaus-plexus/plexus-xml/releases) - [Commits](https://github.com/codehaus-plexus/plexus-xml/compare/plexus-xml-4.0.4...plexus-xml-4.1.0) Updates `com.google.javascript:closure-compiler` from v20240317 to v20250402 Updates `org.apache.maven.plugins:maven-plugin-plugin` from 3.13.1 to 3.15.1 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.13.1...maven-plugin-tools-3.15.1) Updates `org.apache.maven.plugins:maven-deploy-plugin` from 3.1.2 to 3.1.4 - [Release notes](https://github.com/apache/maven-deploy-plugin/releases) - [Commits](https://github.com/apache/maven-deploy-plugin/compare/maven-deploy-plugin-3.1.2...maven-deploy-plugin-3.1.4) --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-version: 3.17.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.apache.commons:commons-text dependency-version: 1.13.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.springframework:spring-webmvc dependency-version: 6.2.5 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.springframework:spring-test dependency-version: 6.2.5 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.springframework:spring-test dependency-version: 6.2.5 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.slf4j:slf4j-api dependency-version: 2.0.17 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-version: 2.18.3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: ch.qos.logback:logback-classic dependency-version: 1.5.18 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-version: 5.12.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-version: 5.12.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-version: 5.12.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-version: 5.12.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-version: 5.12.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.yaml:snakeyaml dependency-version: '2.4' dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.hamcrest:hamcrest dependency-version: '3.0' dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: org.mockito:mockito-core dependency-version: 5.17.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-version: 3.14.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-version: 3.11.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-version: 3.5.3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: com.diffplug.spotless:spotless-maven-plugin dependency-version: 2.44.4 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-version: 3.2.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.antlr:antlr4-runtime dependency-version: 4.13.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.antlr:antlr4-maven-plugin dependency-version: 4.13.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.openjdk.nashorn:nashorn-core dependency-version: '15.6' dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.jacoco:org.jacoco.agent dependency-version: 0.8.13 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.jacoco:jacoco-maven-plugin dependency-version: 0.8.13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.junit.platform:junit-platform-suite dependency-version: 1.12.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: commons-io:commons-io dependency-version: 2.18.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.antlr:antlr4-maven-plugin dependency-version: 4.13.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.apache.felix:maven-bundle-plugin dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: org.jacoco:jacoco-maven-plugin dependency-version: 0.8.13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: joda-time:joda-time dependency-version: 2.14.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: com.google.guava:guava dependency-version: 33.4.6-jre dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: com.github.ben-manes.caffeine:caffeine dependency-version: 3.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.apache.maven:maven-plugin-api dependency-version: 3.9.9 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.apache.maven:maven-core dependency-version: 3.9.9 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-version: 3.15.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.codehaus.plexus:plexus-utils dependency-version: 4.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: org.codehaus.plexus:plexus-xml dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: com.google.javascript:closure-compiler dependency-version: v20250402 dependency-type: direct:production dependency-group: dependencies - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-version: 3.15.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: org.apache.maven.plugins:maven-deploy-plugin dependency-version: 3.1.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- handlebars-caffeine/pom.xml | 2 +- handlebars-guava-cache/pom.xml | 4 ++-- handlebars-helpers/pom.xml | 2 +- handlebars-maven-plugin/pom.xml | 14 ++++++------ handlebars/pom.xml | 8 +++---- pom.xml | 38 ++++++++++++++++----------------- tests/pom.xml | 6 +++--- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/handlebars-caffeine/pom.xml b/handlebars-caffeine/pom.xml index 1c5694a8..a7af93c4 100644 --- a/handlebars-caffeine/pom.xml +++ b/handlebars-caffeine/pom.xml @@ -23,7 +23,7 @@ com.github.ben-manes.caffeine caffeine - 3.1.8 + 3.2.0 diff --git a/handlebars-guava-cache/pom.xml b/handlebars-guava-cache/pom.xml index 85e52821..285b77bd 100644 --- a/handlebars-guava-cache/pom.xml +++ b/handlebars-guava-cache/pom.xml @@ -24,7 +24,7 @@ com.google.guava guava - 33.2.1-jre + 33.4.6-jre @@ -60,7 +60,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + 3.5.3 -Duser.language=en -Duser.country=US diff --git a/handlebars-helpers/pom.xml b/handlebars-helpers/pom.xml index 8495db30..dfca854e 100644 --- a/handlebars-helpers/pom.xml +++ b/handlebars-helpers/pom.xml @@ -29,7 +29,7 @@ joda-time joda-time - 2.12.7 + 2.14.0 true diff --git a/handlebars-maven-plugin/pom.xml b/handlebars-maven-plugin/pom.xml index 362b18d3..f219979d 100644 --- a/handlebars-maven-plugin/pom.xml +++ b/handlebars-maven-plugin/pom.xml @@ -35,38 +35,38 @@ org.apache.maven maven-plugin-api - 3.9.8 + 3.9.9 org.apache.maven maven-core - 3.9.8 + 3.9.9 org.apache.maven.plugin-tools maven-plugin-annotations - 3.13.1 + 3.15.1 provided org.codehaus.plexus plexus-utils - 4.0.1 + 4.0.2 org.codehaus.plexus plexus-xml - 4.0.4 + 4.1.0 com.google.javascript closure-compiler - v20240317 + v20250402 @@ -96,7 +96,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.13.1 + 3.15.1 true diff --git a/handlebars/pom.xml b/handlebars/pom.xml index 8e090d9c..541aa7f8 100644 --- a/handlebars/pom.xml +++ b/handlebars/pom.xml @@ -120,7 +120,7 @@ org.apache.felix maven-bundle-plugin - 5.1.9 + 6.0.0 bundle-manifest @@ -202,7 +202,7 @@ org.junit.platform junit-platform-suite - 1.10.3 + 1.12.1 test @@ -227,7 +227,7 @@ commons-io commons-io - 2.16.1 + 2.18.0 test @@ -239,7 +239,7 @@ - 15.4 + 15.6 diff --git a/pom.xml b/pom.xml index 67461589..38585532 100644 --- a/pom.xml +++ b/pom.xml @@ -64,13 +64,13 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.17.0 org.apache.commons commons-text - 1.12.0 + 1.13.0 @@ -89,7 +89,7 @@ org.slf4j slf4j-api - 2.0.13 + 2.0.17 @@ -111,7 +111,7 @@ ch.qos.logback logback-classic - 1.5.6 + 1.5.18 @@ -135,13 +135,13 @@ org.yaml snakeyaml - 2.2 + 2.4 org.hamcrest hamcrest - 2.2 + 3.0 @@ -156,7 +156,7 @@ maven-compiler-plugin - 3.13.0 + 3.14.0 @@ -168,7 +168,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.11.2 com.github.jknack.handlebars.internal.* public @@ -189,7 +189,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + 3.5.3 -Duser.language=en -Duser.country=US @@ -214,7 +214,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.43.0 + 2.44.4 true @@ -260,7 +260,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + 3.5.3 false @@ -290,7 +290,7 @@ org.codehaus.mojo exec-maven-plugin - 3.3.0 + 3.5.0 initialize @@ -393,7 +393,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.4 + 3.2.7 sign-artifacts @@ -494,11 +494,11 @@ UTF-8 - 2.17.1 - 6.1.10 - 0.8.12 - 4.13.1 - 5.12.0 + 2.18.3 + 6.2.5 + 0.8.13 + 4.13.2 + 5.17.0 yyyy-MM-dd HH:mm:ssa 3.1.0 ${maven.build.timestamp} @@ -508,6 +508,6 @@ false src${file.separator}etc${file.separator}formatter.sh handlebars${file.separator}src${file.separator}test${file.separator}resources${file.separator}mustache - 5.10.3 + 5.12.1 diff --git a/tests/pom.xml b/tests/pom.xml index 98ba8782..59d1589a 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -33,7 +33,7 @@ joda-time joda-time - 2.12.7 + 2.14.0 @@ -75,7 +75,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + 3.5.3 -Duser.language=en -Duser.country=US @@ -95,7 +95,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.4 true From d042f9833eaf1d60c403dcbfb1b529a77674b66d Mon Sep 17 00:00:00 2001 From: Phil Nguyen Date: Wed, 9 Apr 2025 06:44:30 +0700 Subject: [PATCH 2/2] Add support for Java 21 --- .../jknack/handlebars/AbstractTest.java | 48 +++++++++++++++++++ pom.xml | 6 +-- .../handlebars/helper/ext/JodaHelperTest.java | 5 +- 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/handlebars/src/test/java/com/github/jknack/handlebars/AbstractTest.java b/handlebars/src/test/java/com/github/jknack/handlebars/AbstractTest.java index 256d3177..3454c8d7 100644 --- a/handlebars/src/test/java/com/github/jknack/handlebars/AbstractTest.java +++ b/handlebars/src/test/java/com/github/jknack/handlebars/AbstractTest.java @@ -34,6 +34,19 @@ public void shouldCompileTo(final String template, final String data, final Stri shouldCompileTo(template, data, expected, ""); } + /** + * Normalizes spaces in the result and compares it with the expected value. + * + * @param template The template to compile. + * @param data The context to apply. + * @param expected The expected result. + * @throws IOException If an I/O error occurs. + */ + public void shouldCompileToNormalized(final String template, final Object data, final String expected) + throws IOException { + shouldCompileToNormalized(template, data, new Hash(), new Hash(), expected, ""); + } + public void shouldCompileTo(final String template, final Object data, final String expected) throws IOException { shouldCompileTo(template, data, expected, ""); @@ -120,6 +133,41 @@ public void shouldCompileTo( assertEquals(expected, result, "'" + expected + "' should === '" + result + "': " + message); } + /* + * Normalizes spaces in the result and compares it with the expected value. + * + * @param template The template to compile. + * @param context The context to apply. + * @param helpers The helpers to use. + * @param partials The partials to use. + * @param expected The expected result. + * @param message The message to display on failure. + * @throws IOException If an I/O error occurs. + */ + public void shouldCompileToNormalized( + final String template, + final Object context, + final Hash helpers, + final Hash partials, + final String expected, + final String message) + throws IOException { + Template t = compile(template, helpers, partials); + String result = t.apply(configureContext(context)); + assertEquals(expected, normalizeSpaces(result), "'" + expected + "' should === '" + result + "': " + message); + } + + /** + * Helper to normalize narrow no-break space (U+202F) and regular non-breaking space (U+00A0) + * characters to regular space (U+0020). + */ + public String normalizeSpaces(String input) { + return input.replace('\u202F', ' ') + .replace('\u00A0', ' ') + .replaceAll("\\s+", " ") // optional: also collapses multiple spaces + .trim(); + } + protected Object configureContext(final Object context) { return context; } diff --git a/pom.xml b/pom.xml index 38585532..465a9677 100644 --- a/pom.xml +++ b/pom.xml @@ -502,9 +502,9 @@ yyyy-MM-dd HH:mm:ssa 3.1.0 ${maven.build.timestamp} - 17 - 17 - 17 + 21 + 21 + 21 false src${file.separator}etc${file.separator}formatter.sh handlebars${file.separator}src${file.separator}test${file.separator}resources${file.separator}mustache diff --git a/tests/src/test/java/com/github/jknack/handlebars/helper/ext/JodaHelperTest.java b/tests/src/test/java/com/github/jknack/handlebars/helper/ext/JodaHelperTest.java index 756ced4c..46dda35e 100644 --- a/tests/src/test/java/com/github/jknack/handlebars/helper/ext/JodaHelperTest.java +++ b/tests/src/test/java/com/github/jknack/handlebars/helper/ext/JodaHelperTest.java @@ -60,8 +60,11 @@ public void testStyle() throws IOException { version -> version <= 8, () -> shouldCompileTo("{{jodaStyleHelper this \"SS\"}}", dateTime, "7/4/95 2:32 PM")); withJava( - version -> version >= 9, + version -> version >= 9 && version <= 20, () -> shouldCompileTo("{{jodaStyleHelper this \"SS\"}}", dateTime, "7/4/95, 2:32 PM")); + withJava( + version -> version >= 21, + () -> shouldCompileToNormalized("{{jodaStyleHelper this \"SS\"}}", dateTime, "7/4/95, 2:32 PM")); } @Test