This is an automated email from the ASF dual-hosted git repository. gk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/turbine-core.git
commit 53188199a1a3e589f9fff4ec7a7d496cd9f863a1 Author: gemkall <[email protected]> AuthorDate: Fri Aug 2 11:22:44 2024 +0200 Fixed javadoc erros in DateTime* classes, activated jacoco, use properties for fulcrum components, update external deps commons-email2-jakarta to release, jackson to 2.17.2 --- README.md | 2 +- pom.xml | 19 +++++++++++-------- .../localization/DateTimeFormatterInterface.java | 2 +- .../services/pull/util/DateTimeFormatterTool.java | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 5a294b55..97028a16 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ By default this folder is user.home/turbine-sites/turbine, configured in Turbine Find more about release related command hints in * https://github.com/apache/turbine-fulcrum-build/ -* IMPORTANT: BEFORE running release, i.e. if the major.minor versino numbers changed, you have to update turbine.site.path in pom.xml to the new production path +* IMPORTANT: BEFORE running release, i.e. if the major.minor version numbers changed, you have to update turbine.site.path in pom.xml to the new production path (e.g. turbine/turbine-4.0 for version 4.0) removing the "development/"-part of the path. * if updating the site for the new SNAPSHOT version add the new development path (e.g. turbine/development/turbine-5.1 for version 5.1-SNAPSHOT) AFTER the release. * Find more about the site structure here: https://gitbox.apache.org/repos/asf#turbine. diff --git a/pom.xml b/pom.xml index c46660a3..9443c5bc 100644 --- a/pom.xml +++ b/pom.xml @@ -905,7 +905,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email2-jakarta</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M1</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -953,7 +953,7 @@ <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-localization</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>${fulcrum.localization}</version> </dependency> <dependency> <groupId>org.apache.fulcrum</groupId> @@ -975,7 +975,6 @@ <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-yaafi</artifactId> <version>${fulcrum.yaafi}</version> - <optional>true</optional> </dependency> <dependency> <groupId>org.apache.fulcrum</groupId> @@ -1034,7 +1033,7 @@ <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-quartz</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>${fulcrum.quartz}</version> </dependency> <!-- suppress owasp CVE-2018-11771, CVE-2018-1324 .. as jython-standalone is optional. https://github.com/jython/jython/issues/137, https://github.com/jython/jython/issues/138 --> @@ -1116,7 +1115,7 @@ <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-testcontainer</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>${fulcrum.testcontainer}</version> <scope>test</scope> </dependency> <dependency> @@ -1371,12 +1370,16 @@ <fulcrum.intake>3.0.1-SNAPSHOT</fulcrum.intake> <fulcrum.parser>3.0.1-SNAPSHOT</fulcrum.parser> <fulcrum.security>3.0.1-SNAPSHOT</fulcrum.security> - <fulcrum.yaafi>2.0.0</fulcrum.yaafi> + <fulcrum.localization>2.0.0-SNAPSHOT</fulcrum.localization> + <fulcrum.quartz>2.0.0-SNAPSHOT</fulcrum.quartz> + <fulcrum.testcontainer>2.0.1-SNAPSHOT</fulcrum.testcontainer> + <!-- inherited in fulcrum components, testcontainer --> + <fulcrum.yaafi>2.0.1-SNAPSHOT</fulcrum.yaafi> <torque.version>6.0</torque.version> - <jackson2.version>2.17.1</jackson2.version> + <jackson2.version>2.17.2</jackson2.version> <doclint>none</doclint> <docker.testcontainers.version>1.18.3</docker.testcontainers.version> - <jacoco.skip>true</jacoco.skip> + <!--jacoco.skip>true</jacoco.skip--> <argLine /> </properties> diff --git a/src/java/org/apache/turbine/services/localization/DateTimeFormatterInterface.java b/src/java/org/apache/turbine/services/localization/DateTimeFormatterInterface.java index 73747e1f..20c1be52 100644 --- a/src/java/org/apache/turbine/services/localization/DateTimeFormatterInterface.java +++ b/src/java/org/apache/turbine/services/localization/DateTimeFormatterInterface.java @@ -49,7 +49,7 @@ public interface DateTimeFormatterInterface { * Formats the given datetime as a String with the #{@link DateTimeFormatterService#getDefaultFormat()}. * using the default date format. * - * @param temporalAccessor {@link TemporalAccessor to format + * @param temporalAccessor {@link TemporalAccessor to format} * @return String value of the date */ <T extends TemporalAccessor> String format(T temporalAccessor); diff --git a/src/java/org/apache/turbine/services/pull/util/DateTimeFormatterTool.java b/src/java/org/apache/turbine/services/pull/util/DateTimeFormatterTool.java index 7e9af051..59c5f7c7 100644 --- a/src/java/org/apache/turbine/services/pull/util/DateTimeFormatterTool.java +++ b/src/java/org/apache/turbine/services/pull/util/DateTimeFormatterTool.java @@ -144,7 +144,7 @@ public class DateTimeFormatterTool extends DateFormatter * Formats the given datetime as a String with the #{@link DateTimeFormatterTool#getDefaultFormat()}. * using the default date format. * - * @param temporalAccessor {@link TemporalAccessor to format + * @param temporalAccessor {@link TemporalAccessor to format} * @return String value of the date */ @Override
