commit 921508ccacc48b85513fab13f92bf2d2295b2279 Author: MSVSphere Packaging Team Date: Fri Oct 25 19:50:12 2024 +0300 import velocity-2.3-5.el10 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..60095ef --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/velocity-2.3.tar.gz diff --git a/.velocity.metadata b/.velocity.metadata new file mode 100644 index 0000000..a796706 --- /dev/null +++ b/.velocity.metadata @@ -0,0 +1 @@ +c7f19c2d5dac64f5c617465ddca8eb8b24acdaf5 SOURCES/velocity-2.3.tar.gz diff --git a/SOURCES/0001-Template-is-a-reserved-keyword-in-javacc.patch b/SOURCES/0001-Template-is-a-reserved-keyword-in-javacc.patch new file mode 100644 index 0000000..6132246 --- /dev/null +++ b/SOURCES/0001-Template-is-a-reserved-keyword-in-javacc.patch @@ -0,0 +1,50 @@ +From 4275860ed4a69047f783f0c06004ba4f1256a994 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 23 Aug 2023 08:49:53 +0200 +Subject: [PATCH] Template is a reserved keyword in javacc + +Forwarded: no +--- + velocity-engine-core/src/main/parser/Parser.jjt | 8 ++++---- + 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 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 template ) ++ public SimpleNode parse( Reader reader, Template tmplate ) + throws ParseException + { + SimpleNode sn = null; + +- currentTemplate = template; ++ currentTemplate = tmplate; + + try + { +@@ -267,7 +267,7 @@ public class ${parser.basename}Parser implements Parser + * thrown by the Macro class when something is amiss in the + * Macro specification + */ +- log.error("{}: {}", template.getName(), mee.getMessage(), mee); ++ log.error("{}: {}", tmplate.getName(), mee.getMessage(), mee); + throw mee; + } + catch (ParseException pe) +@@ -282,7 +282,7 @@ public class ${parser.basename}Parser implements Parser + } + catch (Exception e) + { +- 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.41.0 + diff --git a/SPECS/velocity.spec b/SPECS/velocity.spec new file mode 100644 index 0000000..cd5f28a --- /dev/null +++ b/SPECS/velocity.spec @@ -0,0 +1,431 @@ +%bcond_with bootstrap + +Name: velocity +Version: 2.3 +Release: 5%{?dist} +Summary: Java-based template engine +License: Apache-2.0 +URL: http://velocity.apache.org/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + +Source0: https://github.com/apache/velocity-engine/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz + +Patch0: 0001-Template-is-a-reserved-keyword-in-javacc.patch + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +BuildRequires: mvn(commons-io:commons-io) +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) +BuildRequires: mvn(junit:junit) +%endif + +%description +Velocity is a Java-based template engine. It permits anyone to use the +simple yet powerful template language to reference objects defined in +Java code. +When Velocity is used for web development, Web designers can work in +parallel with Java programmers to develop web sites according to the +Model-View-Controller (MVC) model, meaning that web page designers can +focus solely on creating a site that looks good, and programmers can +focus solely on writing top-notch code. Velocity separates Java code +from the web pages, making the web site more maintainable over the long +run and providing a viable alternative to Java Server Pages (JSPs) or +PHP. +Velocity's capabilities reach well beyond the realm of web sites; for +example, it can generate SQL and PostScript and XML (see Anakia for more +information on XML transformations) from templates. It can be used +either as a standalone utility for generating source code and reports, +or as an integrated component of other systems. Velocity also provides +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: Javadoc for %{name} + +%description javadoc +Javadoc for %{name}. + +%prep +%setup -q -n velocity-engine-%{version} +%patch0 -p1 + +%mvn_alias : velocity:velocity +%mvn_alias : org.apache.velocity:velocity + +%pom_remove_parent +%pom_xpath_inject pom:project "org.apache.velocity" + +%pom_disable_module spring-velocity-support +%pom_disable_module velocity-custom-parser-example +%pom_disable_module velocity-engine-examples +%pom_disable_module velocity-engine-scripting + +%pom_remove_plugin :maven-javadoc-plugin + +%pom_remove_plugin :templating-maven-plugin velocity-engine-core +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 -f -- -Djavacc.visitor=false + +%install +%mvn_install + +%files -f .mfiles +%doc README.md +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE + +%changelog +* Thu Aug 01 2024 Troy Dawson - 2.3-5 +- Bump release for Aug 2024 java mass rebuild + +* Mon Jun 24 2024 Troy Dawson - 2.3-4 +- Bump release for June 2024 mass rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.3-2 +- Convert License tag to SPDX format + +* Fri Aug 25 2023 Mikolaj Izdebski - 2.3-1 +- Update to upstream version 2.3 + +* Sat Jul 22 2023 Fedora Release Engineering - 1.7-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.7-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.7-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.7-38 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 1.7-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.7-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.7-35 +- Bootstrap build +- Non-bootstrap build + +* Wed Jan 27 2021 Fedora Release Engineering - 0:1.7-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Sep 11 2020 Fabio Valentini - 0:1.7-33 +- Default to JDK logging and drop commons-logging and log4j12 implementations. + +* Thu Jul 30 2020 Fabio Valentini - 0:1.7-32 +- Port to commons-lang3. + +* Wed Jul 29 2020 Fedora Release Engineering - 0:1.7-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Jiri Vanek - 0:1.7-30 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Jul 13 2020 Mat Booth - 0:1.7-29 +- Ignore test case that fails on Java 11 + +* Sat Jul 11 2020 Jiri Vanek - 0:1.7-28 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri May 15 2020 Mikolaj Izdebski - 1.7-27 +- Build with Maven + +* Fri Jan 31 2020 Fedora Release Engineering - 0:1.7-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.7-26 +- Mass rebuild for javapackages-tools 201902 + +* Sat Jul 27 2019 Fedora Release Engineering - 0:1.7-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.7-25 +- Mass rebuild for javapackages-tools 201901 + +* Sun Feb 03 2019 Fedora Release Engineering - 0:1.7-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 31 2018 Michael Simacek - 0:1.7-24 +- Repack the tarball without binaries + +* Sat Jul 14 2018 Fedora Release Engineering - 0:1.7-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0:1.7-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0:1.7-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Feb 07 2017 Michael Simacek - 0:1.7-20 +- Add hsqldb conditional +- Switch to glassfish-servlet-api + +* Fri Feb 05 2016 Fedora Release Engineering - 0:1.7-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jul 22 2015 gil cattaneo 0:1.7-18 +- fix FTBFS rhbz#1240035 +- fix BR list, change log4j with log4j12 +- set javac source/target to 1.6 +- disable Java8doc doclint +- remove werken-xpath Import/Export refences in manifest file +- resolve some rpmlint problems +- remove zero-length file +- introduce license macro + +* Fri Jun 19 2015 Fedora Release Engineering - 0:1.7-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Nov 28 2014 Mikolaj Izdebski - 0:1.7-16 +- Update to current packaging guidelines + +* Thu Sep 4 2014 Mikolaj Izdebski - 0:1.7-15 +- Require hsqldb-lib instead of hsqldb + +* Wed Jun 18 2014 Mikolaj Izdebski - 0:1.7-14 +- Apply patch for log4j 1.2.17 + +* Wed Jun 18 2014 Mikolaj Izdebski - 0:1.7-13 +- Use log4j 1.2 compat package +- Skip Java 8 incompatible test + +* Sun Jun 08 2014 Fedora Release Engineering - 0:1.7-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Mikolaj Izdebski - 0:1.7-11 +- Use .mfiles generated during build + +* Sat Sep 21 2013 Mikolaj Izdebski - 0:1.7-10 +- Port from werken-xpath to jdom +- Resolves: rhbz#875817 + +* Mon Aug 05 2013 Michal Srb - 0:1.7-9 +- Fix FTBFS (Resolves: #992852) + +* Sun Aug 04 2013 Fedora Release Engineering - 0:1.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 0:1.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Nov 21 2012 Mikolaj Izdebski - 0:1.7-6 +- Install NOTICE files +- Resolves: rhbz#879021 + +* Sun Jul 22 2012 Fedora Release Engineering - 0:1.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 05 2012 Stanislav Ochotnicky - 0:1.7-4 +- Use new tomcat-servlet-api +- Update to latest guidelines + +* Fri Feb 17 2012 Deepak Bhole - 0:1.7-3 +- Resolved rhbz#791045 +- Added patch from Omaid Majid to fix build with Java 7 + +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 21 2011 Stanislav Ochotnicky - 0:1.7-1 +- Update to latest version +- Drop old patches + +* Mon Feb 07 2011 Fedora Release Engineering - 0:1.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Dec 17 2010 Stanislav Ochotnicky - 0:1.6.4-2 +- Add compatibility depmap + +* Wed Nov 3 2010 Stanislav Ochotnicky - 0:1.6.4-1 +- Rebase to latest upstream +- Fix problems from bz#226525 + +* Thu Oct 14 2010 Stanislav Ochotnicky - 0:1.6.3-5 +- Use apache-commons-collections instead of jakarta name +- Use tomcat6 for dependency instead of tomcat5 (bz#640660) + +* Mon Jun 7 2010 Alexander Kurtakov 0:1.6.3-4 +- Fix BR/R for jakarta-commons-rename. + +* Sat Feb 13 2010 Mary Ellen Foster 0:1.6.3-3 +- Get (Build)Requires right + +* Sat Feb 13 2010 Mary Ellen Foster 0:1.6.3-2 +- Require all of the packages in the POM +- Add dist to version + +* Fri Jan 15 2010 Mary Ellen Foster 0:1.6.3-1 +- Update to 1.6.3 +- Remove dependency on avalon-logkit +- Add maven metadata and pom + +* Sun Jan 10 2010 Alexander Kurtakov 0:1.4-10.5 +- Drop gcj_support. +- Fix groups and url. +- Use upstream tarball. + +* Mon Aug 10 2009 Ville Skyttä - 0:1.4-10.4 +- Convert specfile to UTF-8. + +* Sun Jul 26 2009 Fedora Release Engineering - 0:1.4-9.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Apr 24 2009 Milos Jakubicek - 0:1.4-8.4 +- Fix FTBFS: added velocity-enum.patch (enum is a reserved keyword in java >= 1.5) + +* Wed Feb 25 2009 Fedora Release Engineering - 0:1.4-8.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.4-7.3 +- drop repotag + +* Thu May 29 2008 Tom "spot" Callaway - 0:1.4-7jpp.2 +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 0:1.4-7jpp.1 +- Autorebuild for GCC 4.3 + +* Tue Aug 08 2006 Vivek Lakshmanan - 0:1.4-6jpp.1 +- Resync with latest from JPP. +- Partially adopt new naming convention. + +* Sat Jul 22 2006 Vivek Lakshmanan - 0:1.4-5jpp_2fc +- Rebuilt + +* Sat Jul 22 2006 Vivek Lakshmanan - 0:1.4-5jpp_1fc +- Merge with latest from JPP. +- Remove fileversion and my_version macros. +- Remove notexentests patch and replace with a patch to disable +- failure on tests. + +* Sat Jul 22 2006 Jakub Jelinek - 0:1.4-3jpp_8fc +- Rebuilt + +* Tue Jul 18 2006 Deepak Bhole - 0:1.4-3jpp_7fc +- Build on all archs. + +* Wed Jul 12 2006 Jesse Keating - 0:1.4-3jpp_6fc +- rebuild + +* Wed Mar 8 2006 Rafael Schloming - 0:1.4-3jpp_5fc +- excluded s390[x] and ppc64 due to eclipse + +* Mon Mar 6 2006 Jeremy Katz - 0:1.4-3jpp_4fc +- stop scriptlet spew + +* Wed Dec 21 2005 Jesse Keating - 0:1.4-3jpp_3fc +- rebuilt again + +* Fri Dec 09 2005 Jesse Keating - 0:1.4-3jpp_2fc +- rebuilt + +* Tue Nov 8 2005 Vadim Nasardinov - 0:1.4-3jpp_1fc +- Converted from ISO-8859-1 to UTF-8 + +* Wed Jun 15 2005 Gary Benson 0:1.4-3jpp_1fc +- Build into Fedora. + +* Thu Jun 9 2005 Gary Benson +- Remove jarfiles from the tarball. + +* Mon Jun 6 2005 Gary Benson +- Build with servletapi5. +- Add NOTICE file as per Apache License version 2.0. +- Skip some failing tests. + +* Mon Oct 18 2004 Fernando Nasser 0:1.4-3jpp_1rh +- First Red Hat build + +* Thu Sep 23 2004 Ralph Apel 0:1.4-3jpp +- Adapt to jdom-1.0-1 replacing org.jdom.input.DefaultJDOMFactory + by org.jdom.DefaultJDOMFactory in AnakiaJDOMFactory.java + as well as using org.jdom.output.Format in AnakiaTask.java +- Therefore require jdom >= 0:1.0-1 + +* Thu Sep 02 2004 Ralph Apel 0:1.4-2jpp +- Build with ant-1.6.2 + +* Mon Jun 07 2004 Kaj J. Niemi 0:1.4-1jpp +- 1.4 final +- Patch #0 is unnecessary (upstream) +- We have to build velocity against servletapi3 + +* Wed Feb 18 2004 Kaj J. Niemi 0:1.4-0.rc1.2jpp +- Fix a few jpackage related .spec typos, oops. + +* Wed Feb 18 2004 Kaj J. Niemi 0:1.4-0.rc1.1jpp +- Added Patch #0 (velocity-1.4-rc1-ServletTest.patch) from CVS which fixes + build problems. + +* Sun May 25 2003 Ville Skyttä - 0:1.3.1-2jpp +- Add Epochs to dependencies. +- Add explicit defattrs. +- Add non-versioned javadoc symlinks. +- Use sed instead of bash 2 extension when symlinking jars during build. +- Use full URL in Source. +- Fix -javadoc Group tag. +- Drop patch in favour of ant options. +- BuildRequire jpackage-utils and antlr (latter needed for Anakia tests). + +* Sat May 24 2003 Richard Bullington-McGuire 1.3.1-1jpp +- 1.3.1 stable release + +* Fri May 23 2003 Richard Bullington-McGuire 1.3-1jpp +- 1.3 stable release +- Updated for JPackage 1.5 +- Run JUnit regression tests as part of the build process +- Added patch file to fix test case classpath for JUnit standard locations + +* Mon May 06 2002 Guillaume Rousse 1.3-0.rc1.1jpp +- 1.3.0rc1 +- dropped patch +- versioned dir for javadoc +- no dependencies for manual and javadoc packages +- stricter dependency for demo package + +* Wed Dec 12 2001 Guillaume Rousse 1.2-1jpp +- 1.2 +- regenerated patch and corrected manifest +- requires and buildrequires jdom >= 1.0-0.b7.1 + +* Wed Dec 5 2001 Guillaume Rousse 1.1-4jpp +- javadoc into javadoc package + +* Wed Nov 21 2001 Christian Zoffoli 1.1-3jpp +- removed packager tag +- new jpp extension + +* Thu Nov 1 2001 Guillaume Rousse 1.1-2jpp +- first unified release +- s/jPackage/JPackage + +* Fri Sep 14 2001 Guillaume Rousse 1.1-1jpp +- first Mandrake release