.gitignore

@@ -3,4 +3,3 @@ velocity-1.6.3.tar.gz
 /velocity-1.7.tar.gz
 /velocity-1.7.pom
 /velocity-2.3.tar.gz
-/velocity-2.4.1.tar.gz

0001-Template-is-a-reserved-keyword-in-javacc.patch

@@ -9,20 +9,20 @@ Forwarded: no
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/velocity-engine-core/src/main/parser/Parser.jjt b/velocity-engine-core/src/main/parser/Parser.jjt
-index 4e790735..50c0ebac 100644
+index 593d044b..f3bed948 100644
 --- a/velocity-engine-core/src/main/parser/Parser.jjt
 +++ b/velocity-engine-core/src/main/parser/Parser.jjt
 @@ -234,12 +234,12 @@ public class ${parser.basename}Parser implements Parser
       * the new stream that we want parsed.
       */
      @Override
--    public SimpleNode parse( Reader reader, Template t )
+-    public SimpleNode parse( Reader reader, Template template )
 +    public SimpleNode parse( Reader reader, Template tmplate )
          throws ParseException
      {
          SimpleNode sn = null;
  
--        currentTemplate = t;
+-        currentTemplate = template;
 +        currentTemplate = tmplate;
  
          try
@@ -31,7 +31,7 @@ index 4e790735..50c0ebac 100644
               *  thrown by the Macro class when something is amiss in the
               *  Macro specification
               */
--            log.error("{}: {}", t.getName(), mee.getMessage(), mee);
+-            log.error("{}: {}", template.getName(), mee.getMessage(), mee);
 +            log.error("{}: {}", tmplate.getName(), mee.getMessage(), mee);
              throw mee;
          }
@@ -40,11 +40,11 @@ index 4e790735..50c0ebac 100644
          }
          catch (Exception e)
          {
--            String msg = t.getName() + ": " + e.getMessage();
+-            String msg = template.getName() + ": " + e.getMessage();
 +            String msg = tmplate.getName() + ": " + e.getMessage();
              log.error(msg, e);
              throw new VelocityException(msg, e, getRuntimeServices().getLogContext().getStackTrace());
          }
 -- 
-2.52.0
+2.41.0
 

plans/javapackages.fmf

@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f43
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: f42
 execute:
   how: tmt

sources

@@ -1 +1 @@
-SHA512 (velocity-2.4.1.tar.gz) = 3e821eaeb705e6ede8a51a8d3bff00d26909c20738bed92f5ef9600f3736709324807f7bbb93f5d431e60380b9a4f757f47cca6ec64e8e774c7ec1e4708d25f1
+SHA512 (velocity-2.3.tar.gz) = 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb

velocity.spec

@@ -1,7 +1,7 @@
 %bcond_with bootstrap
 
 Name:           velocity
-Version:        2.4.1
+Version:        2.3
 Release:        %autorelease
 Summary:        Java-based template engine
 License:        Apache-2.0
@@ -16,17 +16,17 @@ Patch:          0001-Template-is-a-reserved-keyword-in-javacc.patch
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.codehaus.mojo:extra-enforcer-rules)
 BuildRequires:  mvn(org.codehaus.mojo:javacc-maven-plugin)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 %endif
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 2.3-21
 
 %description
 Velocity is a Java-based template engine. It permits anyone to use the
@@ -49,6 +49,12 @@ template services for the Turbine web application framework.
 Velocity+Turbine provides a template service that will allow web
 applications to be developed according to a true MVC model.
 
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
 %prep
 %autosetup -p1 -C
 
@@ -70,11 +76,13 @@ sed 's/${project.version}/%{version}/' \
     velocity-engine-core/src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java \
    >velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocityEngineVersion.java
 
+%pom_remove_plugin com.google.code.maven-replacer-plugin:replacer velocity-engine-core
+%pom_remove_plugin :maven-shade-plugin velocity-engine-core
 
 %pom_xpath_remove "pom:dependency[pom:scope='test']" velocity-engine-core
 
 %build
-%mvn_build -j -f
+%mvn_build -f -- -Djavacc.visitor=false
 
 %install
 %mvn_install
@@ -83,5 +91,8 @@ sed 's/${project.version}/%{version}/' \
 %doc README.md
 %license LICENSE NOTICE
 
+%files javadoc -f .mfiles-javadoc
+%license LICENSE NOTICE
+
 %changelog
 %autochangelog