From b4aa245e7299b39221874ba12da766ed2ceb290f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Apr 08 2022 17:37:36 +0000 Subject: Version 4.3.2. --- diff --git a/sources b/sources index 67b788d..b9f4a6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stringtemplate4-4.3.1.tar.gz) = afe62ca1cbc7572d05859c6fdaa1eb3221045da582bce5d88c328acae39128c904396f8ba1e10643a2757123297ba1924e046841cc8a667fbc724bdeca95680c +SHA512 (stringtemplate4-4.3.2.tar.gz) = d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1 diff --git a/stringtemplate4-java11.patch b/stringtemplate4-java11.patch index 56ae52e..13f970f 100644 --- a/stringtemplate4-java11.patch +++ b/stringtemplate4-java11.patch @@ -1,24 +1,3 @@ ---- a/pom.xml -+++ b/pom.xml -@@ -45,8 +45,8 @@ - - - -- 1.6 -- 1.6 -+ 1.8 -+ 1.8 - UTF-8 - UTF-8 - UTF-8 -@@ -60,6 +60,7 @@ - org.apache.maven.plugins - maven-javadoc-plugin - -+ 8 - -Xdoclint:none - -Xdoclint:none - --- a/src/org/stringtemplate/v4/STGroupFile.java +++ b/src/org/stringtemplate/v4/STGroupFile.java @@ -96,7 +96,7 @@ public class STGroupFile extends STGroup diff --git a/stringtemplate4.spec b/stringtemplate4.spec index aa28bca..d2bb70f 100644 --- a/stringtemplate4.spec +++ b/stringtemplate4.spec @@ -1,6 +1,6 @@ Name: stringtemplate4 -Version: 4.3.1 -Release: 9%{?dist} +Version: 4.3.2 +Release: 1%{?dist} Summary: A Java template engine License: BSD URL: http://www.stringtemplate.org/ @@ -36,24 +36,28 @@ This package contains javadoc for %{name}. # sonatype-oss-parent is deprecated in Fedora %pom_remove_parent -# The revapi plugin is an API checker. That is a great thing for upstream to -# use, but not for Fedora builds. Plus Fedora doesn't currently have it. -%pom_remove_plugin :revapi-maven-plugin - %build -xvfb-run -d %mvn_build +# Due to a test jar with system scope, %%mvn_build refuses to install. We +# cannot change the pom entry for the test jar without breaking the tests, +# though, so build the reactor information manually. +xvfb-run -d %mvn_build -i +cp -p target/ST4-%{version}.jar target/ST4.jar +%mvn_artifact pom.xml target/ST4.jar %install %mvn_install %files -f .mfiles -%doc CHANGES.txt contributors.txt README.md +%doc CHANGES.txt README.md %license LICENSE.txt %files javadoc -f .mfiles-javadoc %license LICENSE.txt %changelog +* Fri Apr 8 2022 Jerry James - 4.3.2-1 +- Version 4.3.2 + * Sat Feb 05 2022 Jiri Vanek - 4.3.1-9 - Rebuilt for java-17-openjdk as system jdk