From cc24330fc5589c21777d1b0b9da3d52b0e4a0071 Mon Sep 17 00:00:00 2001 From: gil Date: Thu, 4 Jul 2013 08:12:18 +0200 Subject: [PATCH 01/18] switch to XMvn --- velocity-tools.spec | 136 +++++++++++++++++++------------------------- 1 file changed, 58 insertions(+), 78 deletions(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index aaff017..db5a825 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,78 +1,53 @@ Name: velocity-tools Version: 2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Collection of useful tools for Velocity template engine -Group: Development/Libraries License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ Source0: http://www.apache.org/dist/velocity/tools/%{version}/%{name}-%{version}-src.tar.gz -# force tomcat 7.x apis -Source1: velocity-tools-2.0-depmap Patch0: %{name}-%{version}-junit4.patch -# add org.apache.tomcat tomcat-jsp-api 7.0.27 -Patch1: %{name}-%{version}-pom.patch -Patch2: %{name}-%{version}-dont_copy_test_lib.patch +Patch1: %{name}-%{version}-dont_copy_test_lib.patch # servlet 3.0 support thanks to mizdebsk -Patch3: %{name}-%{version}-servlet.patch +Patch2: %{name}-%{version}-servlet.patch BuildRequires: java-devel -BuildRequires: jpackage-utils - -BuildRequires: apache-commons-beanutils -BuildRequires: apache-commons-chain -BuildRequires: apache-commons-collections -BuildRequires: apache-commons-digester -BuildRequires: apache-commons-lang -BuildRequires: apache-commons-logging -BuildRequires: apache-commons-validator -BuildRequires: jakarta-oro -BuildRequires: dom4j -BuildRequires: sslext -# core taglib tiles -BuildRequires: struts -BuildRequires: tomcat-jsp-2.2-api -BuildRequires: tomcat-servlet-3.0-api -BuildRequires: velocity +BuildRequires: mvn(commons-beanutils:commons-beanutils) +BuildRequires: mvn(commons-chain:commons-chain) +BuildRequires: mvn(commons-collections:commons-collections) +BuildRequires: mvn(commons-digester:commons-digester) +BuildRequires: mvn(commons-lang:commons-lang) +BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(commons-validator:commons-validator) +BuildRequires: mvn(dom4j:dom4j) +BuildRequires: mvn(org.apache.struts:struts-core) +BuildRequires: mvn(org.apache.struts:struts-taglib) +BuildRequires: mvn(org.apache.struts:struts-tiles) +BuildRequires: mvn(org.apache.tomcat:tomcat-jsp-api) +BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) +BuildRequires: mvn(org.apache.velocity:velocity) +BuildRequires: mvn(oro:oro) +BuildRequires: mvn(sslext:sslext) +# required by tomcat-jsp-api +BuildRequires: mvn(org.apache.tomcat:tomcat-el-api) # test deps -# httpunit httpunit 1.6.1 -# org.mortbay.jetty jetty-embedded 6.0.1 -# nekohtml nekohtml 0.9.5 -# rhino js 1.6R5 -# xerces xercesImpl 2.8.1 -# xerces xmlParserAPIs 2.6.2 -BuildRequires: junit +%if 0 +BuildRequires: mvn(httpunit:httpunit) = 1.6.1 +BuildRequires: mvn(nekohtml:nekohtml) = 0.9.5 +BuildRequires: mvn(org.mortbay.jetty:jetty-embedded) = 6.0.1 +BuildRequires: mvn(rhino:js) = 1.6R5 +BuildRequires: mvn(xerces:xercesImpl) = 2.8.1 +BuildRequires: mvn(xerces:xmlParserAPIs) = 2.6.2 +%endif +BuildRequires: mvn(junit:junit) BuildRequires: maven-local -BuildRequires: maven-compiler-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin - # required by resources-plugin -BuildRequires: maven-filtering +BuildRequires: mvn(org.apache.maven.shared:maven-filtering) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) -Requires: apache-commons-beanutils -Requires: apache-commons-chain -Requires: apache-commons-collections -Requires: apache-commons-digester -Requires: apache-commons-lang -Requires: apache-commons-logging -Requires: apache-commons-validator -Requires: jakarta-oro -Requires: dom4j -Requires: sslext -Requires: struts -Requires: tomcat-jsp-2.2-api -Requires: tomcat-servlet-3.0-api -Requires: velocity - -Requires: java -Requires: jpackage-utils BuildArch: noarch %description @@ -85,9 +60,7 @@ web applications (via the VelocityViewTag and VelocityViewServlet) and integration with Struts 1.x applications. %package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils %description javadoc This package contains javadoc for %{name}. @@ -97,38 +70,45 @@ This package contains javadoc for %{name}. find . -name "*.jar" -delete find . -name "*.class" -delete %patch0 -p1 -%patch1 -p0 -%patch2 -p1 -%patch3 -p0 +%patch1 -p1 +%patch2 -p0 + sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt +# force tomcat 7.x apis +%pom_remove_dep javax.servlet:servlet-api +%pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided +%pom_add_dep org.apache.tomcat:tomcat-jsp-api::provided +# remove non standard build structure +%pom_xpath_remove "pom:project/pom:build/pom:outputDirectory" +%pom_xpath_remove "pom:project/pom:build/pom:directory" + +%mvn_file :%{name} %{name} +%mvn_alias :%{name} %{name}:%{name} +%mvn_alias :%{name} org.apache.velocity:%{name}-generic +%mvn_alias :%{name} %{name}:%{name}-generic +%mvn_alias :%{name} %{name}:%{name}-view +%mvn_alias :%{name} org.apache.velocity:%{name}-view + %build + # tests skipped. cause: missing dependencies -mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.local.depmap.file="%{SOURCE1}" -Dmaven.test.skip=true install javadoc:aggregate +%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 %install +%mvn_install -mkdir -p %{buildroot}%{_javadir} -install -pm 644 dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{name}:%{name},org.apache.velocity:%{name}-generic,%{name}:%{name}-generic,%{name}:%{name}-view,org.apache.velocity:%{name}-view" - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr dist/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - -%files -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles %doc CONTRIBUTORS LICENSE NOTICE README.txt STATUS WHY_THREE_JARS.txt -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE %changelog +* Thu Jul 04 2013 gil cattaneo 2.0-6 +- switch to XMvn +- minor changes to adapt to current guideline + * Tue Feb 19 2013 gil cattaneo 2.0-5 - added maven-filtering as BR From ad1e2432b08f1cc8f0d013ad82838f7a8643cef2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:06:51 -0500 Subject: [PATCH 02/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- velocity-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index db5a825..2a0b46b 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -105,6 +105,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %doc LICENSE NOTICE %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Jul 04 2013 gil cattaneo 2.0-6 - switch to XMvn - minor changes to adapt to current guideline From 8f648730192599c91910c0350c8328833f7e01bc Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 28 Mar 2014 14:45:55 +0100 Subject: [PATCH 03/18] Use Requires: java-headless rebuild (#1067528) Signed-off-by: Michael Simacek Signed-off-by: Mikolaj Izdebski --- velocity-tools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index 2a0b46b..184cb86 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -105,6 +105,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %doc LICENSE NOTICE %changelog +* Fri Mar 28 2014 Michael Simacek - 2.0-8 +- Use Requires: java-headless rebuild (#1067528) + * Sun Aug 04 2013 Fedora Release Engineering - 2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -126,4 +129,4 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild * Sun May 27 2012 gil cattaneo 2.0-1 -- initial rpm \ No newline at end of file +- initial rpm From 21718c74d3a3eb57fb186be705f37d915f7ce129 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:33:11 -0500 Subject: [PATCH 04/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- velocity-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index 184cb86..983333f 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -105,6 +105,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %doc LICENSE NOTICE %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Mar 28 2014 Michael Simacek - 2.0-8 - Use Requires: java-headless rebuild (#1067528) From 7df52b61f14ac30efa40bac7ce6b809dc77675ff Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 13 Feb 2015 18:49:56 +0100 Subject: [PATCH 05/18] introduce license macro --- velocity-tools.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index 983333f..25ff6d4 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -10,8 +10,6 @@ Patch1: %{name}-%{version}-dont_copy_test_lib.patch # servlet 3.0 support thanks to mizdebsk Patch2: %{name}-%{version}-servlet.patch -BuildRequires: java-devel - BuildRequires: mvn(commons-beanutils:commons-beanutils) BuildRequires: mvn(commons-chain:commons-chain) BuildRequires: mvn(commons-collections:commons-collections) @@ -46,7 +44,7 @@ BuildRequires: maven-local BuildRequires: maven-resources-plugin # required by resources-plugin BuildRequires: mvn(org.apache.maven.shared:maven-filtering) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildArch: noarch @@ -99,12 +97,16 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %mvn_install %files -f .mfiles -%doc CONTRIBUTORS LICENSE NOTICE README.txt STATUS WHY_THREE_JARS.txt +%doc CONTRIBUTORS README.txt STATUS WHY_THREE_JARS.txt +%license LICENSE NOTICE %files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE +%license LICENSE NOTICE %changelog +* Fri Feb 13 2015 gil cattaneo 2.0-10 +- introduce license macro + * Sun Jun 08 2014 Fedora Release Engineering - 2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 75ce3ea3d1cfa6f6611616eca6c0d97c4f530693 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:56:57 +0000 Subject: [PATCH 06/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- velocity-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index 25ff6d4..0e591cf 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -104,6 +104,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Feb 13 2015 gil cattaneo 2.0-10 - introduce license macro From 89cbe624228968b9f61a270621954fcf6318ec8e Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 19 Jun 2015 16:01:26 +0200 Subject: [PATCH 07/18] add servlet 3.1 support --- velocity-tools-2.0-depmap | 26 -------------------------- velocity-tools-2.0-pom.patch | 17 ----------------- velocity-tools-2.0-servlet.patch | 31 +++++++++++++++++++++++++++++-- velocity-tools.spec | 8 ++++++-- 4 files changed, 35 insertions(+), 47 deletions(-) delete mode 100644 velocity-tools-2.0-depmap delete mode 100644 velocity-tools-2.0-pom.patch diff --git a/velocity-tools-2.0-depmap b/velocity-tools-2.0-depmap deleted file mode 100644 index 945ed7a..0000000 --- a/velocity-tools-2.0-depmap +++ /dev/null @@ -1,26 +0,0 @@ - - - - javax.servlet - servlet-api - 7.0.27 - - - JPP - tomcat-servlet-3.0-api - 7.0.27 - - - - - org.apache.tomcat - tomcat-jsp-api - 7.0.27 - - - JPP - tomcat-jsp-2.2-api - 7.0.27 - - - \ No newline at end of file diff --git a/velocity-tools-2.0-pom.patch b/velocity-tools-2.0-pom.patch deleted file mode 100644 index 5d223da..0000000 --- a/velocity-tools-2.0-pom.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- pom.xml 2010-04-12 19:07:00.000000000 +0200 -+++ pom.xml-gil 2012-05-27 05:46:03.422196231 +0200 -@@ -418,7 +418,13 @@ - - javax.servlet - servlet-api -- 2.3 -+ 7.0.27 -+ provided -+ -+ -+ org.apache.tomcat -+ tomcat-jsp-api -+ 7.0.27 - provided - - diff --git a/velocity-tools-2.0-servlet.patch b/velocity-tools-2.0-servlet.patch index a1f14c2..5bc83dc 100644 --- a/velocity-tools-2.0-servlet.patch +++ b/velocity-tools-2.0-servlet.patch @@ -1,5 +1,32 @@ ---- src/main/java/org/apache/velocity/tools/view/ParameterTool.java 2009-05-12 00:24:53.000000000 +0200 -+++ src/main/java/org/apache/velocity/tools/view/ParameterTool.java-gil 2012-05-30 17:19:25.741937122 +0200 +diff -Nru velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ImportSupport.java velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ImportSupport.java +--- velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ImportSupport.java 2007-12-12 18:04:38.000000000 +0100 ++++ velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ImportSupport.java 2015-06-19 15:50:41.054584752 +0200 +@@ -36,6 +36,7 @@ + import javax.servlet.RequestDispatcher; + import javax.servlet.ServletContext; + import javax.servlet.ServletOutputStream; ++import javax.servlet.WriteListener; + import javax.servlet.http.HttpServletRequest; + import javax.servlet.http.HttpServletResponse; + import javax.servlet.http.HttpServletResponseWrapper; +@@ -510,6 +511,14 @@ + { + bos.write(b); + } ++ ++ public void setWriteListener(WriteListener listener) { ++ throw new UnsupportedOperationException("Not implemented yet."); ++ } ++ ++ public boolean isReady() { ++ return false; ++ } + }; + return sos; + } +diff -Nru velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ParameterTool.java velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ParameterTool.java +--- velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ParameterTool.java 2009-05-12 00:24:53.000000000 +0200 ++++ velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ParameterTool.java 2015-06-19 15:45:11.950303234 +0200 @@ -174,7 +174,7 @@ Map source = super.getSource(); if (source == null) diff --git a/velocity-tools.spec b/velocity-tools.spec index 0e591cf..d833c07 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -8,6 +8,7 @@ Source0: http://www.apache.org/dist/velocity/tools/%{version}/%{name}-%{ve Patch0: %{name}-%{version}-junit4.patch Patch1: %{name}-%{version}-dont_copy_test_lib.patch # servlet 3.0 support thanks to mizdebsk +# servlet 3.1 support Patch2: %{name}-%{version}-servlet.patch BuildRequires: mvn(commons-beanutils:commons-beanutils) @@ -69,7 +70,7 @@ find . -name "*.jar" -delete find . -name "*.class" -delete %patch0 -p1 %patch1 -p1 -%patch2 -p0 +%patch2 -p1 sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt @@ -104,6 +105,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Fri Jun 19 2015 gil cattaneo 2.0-12 +- add servlet 3.1 support + * Fri Jun 19 2015 Fedora Release Engineering - 2.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 098768af509b04d80c4eb9e7a1d6f85451faf710 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:39:20 +0000 Subject: [PATCH 08/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- velocity-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index d833c07..06cf511 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -105,6 +105,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 2.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 gil cattaneo 2.0-12 - add servlet 3.1 support From 60cb82c2663637a0a4189e66f24c0f567126e4d2 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 9 Aug 2016 14:22:22 +0200 Subject: [PATCH 09/18] add missing build requires --- velocity-tools.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index 06cf511..1a11fd6 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -11,6 +11,7 @@ Patch1: %{name}-%{version}-dont_copy_test_lib.patch # servlet 3.1 support Patch2: %{name}-%{version}-servlet.patch +BuildRequires: maven-local BuildRequires: mvn(commons-beanutils:commons-beanutils) BuildRequires: mvn(commons-chain:commons-chain) BuildRequires: mvn(commons-collections:commons-collections) @@ -19,6 +20,10 @@ BuildRequires: mvn(commons-lang:commons-lang) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(commons-validator:commons-validator) BuildRequires: mvn(dom4j:dom4j) +BuildRequires: mvn(org.apache.maven.plugins:maven-resources-plugin) +# required by resources-plugin +BuildRequires: mvn(org.apache.maven.shared:maven-filtering) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildRequires: mvn(org.apache.struts:struts-core) BuildRequires: mvn(org.apache.struts:struts-taglib) BuildRequires: mvn(org.apache.struts:struts-tiles) @@ -40,12 +45,7 @@ BuildRequires: mvn(xerces:xercesImpl) = 2.8.1 BuildRequires: mvn(xerces:xmlParserAPIs) = 2.6.2 %endif BuildRequires: mvn(junit:junit) - -BuildRequires: maven-local -BuildRequires: maven-resources-plugin -# required by resources-plugin -BuildRequires: mvn(org.apache.maven.shared:maven-filtering) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) +BuildRequires: xmvn BuildArch: noarch @@ -82,6 +82,8 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %pom_xpath_remove "pom:project/pom:build/pom:outputDirectory" %pom_xpath_remove "pom:project/pom:build/pom:directory" +%pom_remove_dep org.mortbay.jetty:jetty-embedded + %mvn_file :%{name} %{name} %mvn_alias :%{name} %{name}:%{name} %mvn_alias :%{name} org.apache.velocity:%{name}-generic @@ -105,6 +107,10 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Tue Aug 09 2016 gil cattaneo 2.0-14 +- add missing build requires: xmvn +- prevent duplicate pom BR entries + * Fri Feb 05 2016 Fedora Release Engineering - 2.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From e1493de5a571e2bffd624e26d74712e5fef371b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:01:58 +0000 Subject: [PATCH 10/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- velocity-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index 1a11fd6..e062222 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -107,6 +107,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Aug 09 2016 gil cattaneo 2.0-14 - add missing build requires: xmvn - prevent duplicate pom BR entries From 427d76ece8030d994996a3a9678c74c775baadba Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 31 Mar 2017 13:04:43 +0200 Subject: [PATCH 11/18] Port to dom4j 2.0 --- velocity-tools-2.0-port-to-dom4j-2.0.patch | 25 ++++++++++++++++++++++ velocity-tools.spec | 7 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 velocity-tools-2.0-port-to-dom4j-2.0.patch diff --git a/velocity-tools-2.0-port-to-dom4j-2.0.patch b/velocity-tools-2.0-port-to-dom4j-2.0.patch new file mode 100644 index 0000000..9723ab9 --- /dev/null +++ b/velocity-tools-2.0-port-to-dom4j-2.0.patch @@ -0,0 +1,25 @@ +From 453940a997ef72f389a55de3e9a3c8f8428ae3d6 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Fri, 31 Mar 2017 13:00:10 +0200 +Subject: [PATCH] Port to dom4j 2.0 + +--- + src/main/java/org/apache/velocity/tools/generic/XmlTool.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/org/apache/velocity/tools/generic/XmlTool.java b/src/main/java/org/apache/velocity/tools/generic/XmlTool.java +index 4ab748c..3d5feab 100644 +--- a/src/main/java/org/apache/velocity/tools/generic/XmlTool.java ++++ b/src/main/java/org/apache/velocity/tools/generic/XmlTool.java +@@ -572,7 +572,7 @@ public class XmlTool extends SafeConfig + { + if (n instanceof Element) + { +- kids.addAll((List)((Element)n).elements()); ++ kids.addAll(((Element)n).elements()); + } + } + return new XmlTool(kids); +-- +2.9.3 + diff --git a/velocity-tools.spec b/velocity-tools.spec index e062222..1d0d63c 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -10,6 +10,7 @@ Patch1: %{name}-%{version}-dont_copy_test_lib.patch # servlet 3.0 support thanks to mizdebsk # servlet 3.1 support Patch2: %{name}-%{version}-servlet.patch +Patch3: %{name}-%{version}-port-to-dom4j-2.0.patch BuildRequires: maven-local BuildRequires: mvn(commons-beanutils:commons-beanutils) @@ -71,6 +72,7 @@ find . -name "*.class" -delete %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt @@ -107,6 +109,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Fri Mar 31 2017 Michael Simacek - 2.0-16 +- Port to dom4j 2.0 + * Sat Feb 11 2017 Fedora Release Engineering - 2.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From f354a9d51be47cf4a3487d43bc8c6d0fbbc043ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:16:10 +0000 Subject: [PATCH 12/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- velocity-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index 1d0d63c..332826f 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -109,6 +109,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Mar 31 2017 Michael Simacek - 2.0-16 - Port to dom4j 2.0 From 6fef542e6ae5df64c449876bbb609ba3710531ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:26:28 +0000 Subject: [PATCH 13/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- velocity-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index 332826f..3320722 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -109,6 +109,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 2.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 1c1df271fcc7752f5d3cbe622ddfd1abfad5b6fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:29:53 +0000 Subject: [PATCH 14/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- velocity-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index 3320722..08026c6 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -109,6 +109,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 2.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 0c29a0a8273b80d801dc0b2ff3c15b86937f5e70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:13:08 +0000 Subject: [PATCH 15/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- velocity-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index 08026c6..103b29f 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -109,6 +109,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 08119554b7beb10e3172981182b987f2c7cfc78e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:55:02 +0000 Subject: [PATCH 16/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- velocity-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index 103b29f..d6f332c 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -109,6 +109,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 2.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 6072af6fd1b88f78b785352159daacead6d0c129 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:04:14 +0000 Subject: [PATCH 17/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- velocity-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/velocity-tools.spec b/velocity-tools.spec index d6f332c..0d52def 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,6 +1,6 @@ Name: velocity-tools Version: 2.0 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Collection of useful tools for Velocity template engine License: ASL 2.0 Url: http://velocity.apache.org/tools/releases/2.0/ @@ -109,6 +109,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 2.0-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 46b6ed428e3c8cd4b5d1f4cc6cd36537c24e473a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 May 2020 12:44:45 +0200 Subject: [PATCH 18/18] Orphaned for 6+ weeks --- .gitignore | 1 - dead.package | 1 + sources | 1 - velocity-tools-2.0-dont_copy_test_lib.patch | 38 --- velocity-tools-2.0-junit4.patch | 241 -------------------- velocity-tools-2.0-port-to-dom4j-2.0.patch | 25 -- velocity-tools-2.0-servlet.patch | 38 --- velocity-tools.spec | 179 --------------- 8 files changed, 1 insertion(+), 523 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 velocity-tools-2.0-dont_copy_test_lib.patch delete mode 100644 velocity-tools-2.0-junit4.patch delete mode 100644 velocity-tools-2.0-port-to-dom4j-2.0.patch delete mode 100644 velocity-tools-2.0-servlet.patch delete mode 100644 velocity-tools.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b7a043b..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/velocity-tools-2.0-src.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index bcc705a..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -883ff873be49f55b53cae8eb0d115608 velocity-tools-2.0-src.tar.gz diff --git a/velocity-tools-2.0-dont_copy_test_lib.patch b/velocity-tools-2.0-dont_copy_test_lib.patch deleted file mode 100644 index 4580c5b..0000000 --- a/velocity-tools-2.0-dont_copy_test_lib.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Nru velocity-tools-2.0-src/download.xml velocity-tools-2.0-src-gil/download.xml ---- velocity-tools-2.0-src/download.xml 2008-11-30 17:51:06.000000000 +0100 -+++ velocity-tools-2.0-src-gil/download.xml 2011-09-10 15:26:35.088480329 +0200 -@@ -352,8 +352,6 @@ - - - -- -- - - - -diff -Nru velocity-tools-2.0-src/examples.xml velocity-tools-2.0-src-gil/examples.xml ---- velocity-tools-2.0-src/examples.xml 2008-11-17 21:11:23.000000000 +0100 -+++ velocity-tools-2.0-src-gil/examples.xml 2011-09-10 15:26:35.089480329 +0200 -@@ -53,13 +53,6 @@ - - - -- -- -- -- -- -- -- - - - -@@ -69,8 +62,6 @@ - - - -- -- - - - diff --git a/velocity-tools-2.0-junit4.patch b/velocity-tools-2.0-junit4.patch deleted file mode 100644 index f7d1fb0..0000000 --- a/velocity-tools-2.0-junit4.patch +++ /dev/null @@ -1,241 +0,0 @@ -diff -Nru velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/generic/DisplayToolTests.java velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/generic/DisplayToolTests.java ---- velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/generic/DisplayToolTests.java 2009-05-12 00:24:52.000000000 +0200 -+++ velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/generic/DisplayToolTests.java 2011-09-10 15:29:12.534469474 +0200 -@@ -119,11 +119,11 @@ - display.configure(conf); - assertEquals(";", display.getListDelimiter()); - assertEquals(" und ", display.getListFinalDelimiter()); -- assertEquals(5, display.getTruncateLength()); -+ assertEquals((double)5, display.getTruncateLength()); - assertEquals(">", display.getTruncateSuffix()); - assertEquals(true, display.getTruncateAtWord()); - assertEquals("~", display.getCellSuffix()); -- assertEquals(4, display.getCellLength()); -+ assertEquals((double)4, display.getCellLength()); - assertEquals("n/a", display.getDefaultAlternate()); - String[] tags = display.getAllowedTags(); - assertNotNull(tags); -@@ -142,14 +142,14 @@ - assertNull(display.measure(null)); - DisplayTool.Measurements dims = display.measure(""); - assertNotNull(dims); -- assertEquals(1, dims.getHeight()); -- assertEquals(0, dims.getWidth()); -+ assertEquals((double)1, dims.getHeight()); -+ assertEquals((double)0, dims.getWidth()); - dims = display.measure("twelve chars"); -- assertEquals(12, dims.getWidth()); -- assertEquals(1, dims.getHeight()); -+ assertEquals((double)12, dims.getWidth()); -+ assertEquals((double)1, dims.getHeight()); - dims = display.measure("one\ntwo\nthree"); -- assertEquals(5, dims.getWidth()); -- assertEquals(3, dims.getHeight()); -+ assertEquals((double)5, dims.getWidth()); -+ assertEquals((double)3, dims.getHeight()); - } - - public @Test void methodMessage_StringObjectVarArgs() throws Exception -@@ -242,7 +242,7 @@ - { - DisplayTool display = new DisplayTool(); - display.setCellLength(10); -- assertEquals(10, display.getCellLength()); -+ assertEquals((double)10, display.getCellLength()); - } - - public @Test void methodSetCellSuffix_String() throws Exception -@@ -277,7 +277,7 @@ - { - DisplayTool display = new DisplayTool(); - display.setTruncateLength(5); -- assertEquals(5, display.getTruncateLength()); -+ assertEquals((double)5, display.getTruncateLength()); - } - - public @Test void methodSetTruncateSuffix_String() throws Exception -@@ -457,4 +457,4 @@ - } - } - --} -\ Manca newline alla fine del file -+} -diff -Nru velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java ---- velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java 2009-05-12 00:24:52.000000000 +0200 -+++ velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java 2011-09-10 15:29:12.535469474 +0200 -@@ -248,7 +248,7 @@ - LinkTool link = newInstance(); - assertNull(link.getPort()); - link = newInstance(LinkTool.PORT_KEY, 42); -- assertEquals(42, link.getPort()); -+ assertEquals(new Integer(42), link.getPort()); - } - - public @Test void methodPort_Object() throws Exception -@@ -256,15 +256,15 @@ - LinkTool link = newInstance(); - assertNull(link.port(null).getPort()); - assertNull(link.port(":asd").getPort()); -- assertEquals(1, link.port(1).getPort()); -- assertEquals(42, link.port("42").getPort()); -+ assertEquals(new Integer(1), link.port(1).getPort()); -+ assertEquals(new Integer(42), link.port("42").getPort()); - } - - public @Test void methodSetPort_Object() throws Exception - { - LinkTool link = newInstance(); - link.setPort(42); -- assertEquals(42, link.getPort()); -+ assertEquals(new Integer(42), link.getPort()); - } - - public @Test void methodGetPath() throws Exception -@@ -845,4 +845,4 @@ - } - - } -- -\ Manca newline alla fine del file -+ -diff -Nru velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java ---- velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java 2009-05-12 00:24:52.000000000 +0200 -+++ velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java 2011-09-10 15:29:12.536469474 +0200 -@@ -323,45 +323,45 @@ - { - LoopTool loop = new LoopTool(); - Iterator i = loop.watch(ARRAY); -- assertEquals(0, loop.getCount()); -+ assertEquals(new Integer(0), loop.getCount()); - assertNull(loop.getIndex()); - i.next(); -- assertEquals(1, loop.getCount()); -- assertEquals(0, loop.getIndex()); -+ assertEquals(new Integer(1), loop.getCount()); -+ assertEquals(new Integer(0), loop.getIndex()); - i.next(); -- assertEquals(2, loop.getCount()); -- assertEquals(1, loop.getIndex()); -+ assertEquals(new Integer(2), loop.getCount()); -+ assertEquals(new Integer(1), loop.getIndex()); - i.next(); -- assertEquals(3, loop.getCount()); -- assertEquals(2, loop.getIndex()); -+ assertEquals(new Integer(3), loop.getCount()); -+ assertEquals(new Integer(2), loop.getIndex()); - loop.pop(); - // test that skipped iterations are still included - i = loop.watch(ARRAY); - loop.skip(2); -- assertEquals(2, loop.getCount()); -- assertEquals(1, loop.getIndex()); -+ assertEquals(new Integer(2), loop.getCount()); -+ assertEquals(new Integer(1), loop.getIndex()); - } - - public @Test void methodGetCountOrGetIndex_String() throws Exception - { - LoopTool loop = new LoopTool(); - Iterator i = loop.watch(ARRAY, "i"); -- assertEquals(0, loop.getCount("i")); -+ assertEquals(new Integer(0), loop.getCount("i")); - assertNull(loop.getIndex("i")); - i.next(); -- assertEquals(1, loop.getCount("i")); -- assertEquals(0, loop.getIndex("i")); -+ assertEquals(new Integer(1), loop.getCount("i")); -+ assertEquals(new Integer(0), loop.getIndex("i")); - Iterator j = loop.watch(ARRAY, "j"); - loop.skip(2); -- assertEquals(2, loop.getCount("j")); -- assertEquals(1, loop.getIndex("j")); -- assertEquals(1, loop.getCount("i")); -- assertEquals(0, loop.getIndex("i")); -+ assertEquals(new Integer(2), loop.getCount("j")); -+ assertEquals(new Integer(1), loop.getIndex("j")); -+ assertEquals(new Integer(1), loop.getCount("i")); -+ assertEquals(new Integer(0), loop.getIndex("i")); - // check short syntax too -- assertEquals(2, loop.get("count_j")); -- assertEquals(1, loop.get("index_j")); -- assertEquals(1, loop.get("count_i")); -- assertEquals(0, loop.get("index_i")); -+ assertEquals(new Integer(2), loop.get("count_j")); -+ assertEquals(new Integer(1), loop.get("index_j")); -+ assertEquals(new Integer(1), loop.get("count_i")); -+ assertEquals(new Integer(0), loop.get("index_i")); - } - - public @Test void aliasMethods() throws Exception -@@ -403,15 +403,15 @@ - public @Test void method_getDepth() throws Exception - { - LoopTool loop = new LoopTool(); -- assertEquals(0, loop.getDepth()); -+ assertEquals((double)0, loop.getDepth()); - loop.watch(ARRAY); -- assertEquals(1, loop.getDepth()); -+ assertEquals((double)1, loop.getDepth()); - loop.watch(ARRAY); -- assertEquals(2, loop.getDepth()); -+ assertEquals((double)2, loop.getDepth()); - loop.pop(); -- assertEquals(1, loop.getDepth()); -+ assertEquals((double)1, loop.getDepth()); - loop.pop(); -- assertEquals(0, loop.getDepth()); -+ assertEquals((double)0, loop.getDepth()); - } - - } -diff -Nru velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java ---- velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java 2008-12-02 17:45:13.000000000 +0100 -+++ velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java 2011-09-10 15:29:12.533469474 +0200 -@@ -78,9 +78,9 @@ - assertEquals(disp,dateTool.format(date)); - assertEquals(disp2,dateTool.format("yyyy/MM/dd",date)); - /* test parsing */ -- assertEquals(2007,dateTool.getYear(disp)); -- assertEquals(0,dateTool.getMonth(disp)); -- assertEquals(2,dateTool.getDay(disp)); -+ assertEquals(new Integer(2007), dateTool.getYear(disp)); -+ assertEquals(new Integer(0), dateTool.getMonth(disp)); -+ assertEquals(new Integer(2), dateTool.getDay(disp)); - } - - public @Test void testEscapeTool() { -@@ -147,24 +147,24 @@ - assertNotNull(mathTool); - assertEquals(1,mathTool.abs(-1)); - assertEquals(2,mathTool.add(1,1)); -- assertEquals(3,mathTool.ceil(2.5)); -+ assertEquals(new Integer(3),mathTool.ceil(2.5)); - assertEquals(4,mathTool.div(8,2)); -- assertEquals(5,mathTool.floor(5.1)); -+ assertEquals(new Integer(5),mathTool.floor(5.1)); - assertEquals(6,mathTool.getAverage(new long[] {5,6,7})); - /* getTotal() watches the type of its first argument, so assertEquals needs a long */ - assertEquals((long)7,mathTool.getTotal(new long[] {2,2,3})); -- assertEquals(8,mathTool.idiv(130,16)); -+ assertEquals(new Integer(8),mathTool.idiv(130,16)); - assertEquals(9,mathTool.max(9,-10)); - assertEquals(10,mathTool.min(10,20)); -- assertEquals(11,mathTool.mod(37,13)); -+ assertEquals(new Integer(11),mathTool.mod(37,13)); - assertEquals(12,mathTool.mul(3,4)); -- assertEquals(13,mathTool.round(12.8)); -- assertEquals(14.2,mathTool.roundTo(1,14.18)); -- assertEquals(-5.0,mathTool.roundTo(2,-4.999)); -+ assertEquals(new Integer(13),mathTool.round(12.8)); -+ assertEquals(new Double(14.2),mathTool.roundTo(1,14.18)); -+ assertEquals(new Double(-5.0),mathTool.roundTo(2,-4.999)); - assertEquals(15,mathTool.sub(30,15)); - assertEquals(16,mathTool.pow(4,2)); -- assertEquals(17,mathTool.toInteger("17")); -- assertEquals(18.1,mathTool.toDouble("18.1")); -+ assertEquals(new Integer(17),mathTool.toInteger("17")); -+ assertEquals(new Double(18.1),mathTool.toDouble("18.1")); - } - - public @Test void testNumberTool() { diff --git a/velocity-tools-2.0-port-to-dom4j-2.0.patch b/velocity-tools-2.0-port-to-dom4j-2.0.patch deleted file mode 100644 index 9723ab9..0000000 --- a/velocity-tools-2.0-port-to-dom4j-2.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 453940a997ef72f389a55de3e9a3c8f8428ae3d6 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Fri, 31 Mar 2017 13:00:10 +0200 -Subject: [PATCH] Port to dom4j 2.0 - ---- - src/main/java/org/apache/velocity/tools/generic/XmlTool.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/org/apache/velocity/tools/generic/XmlTool.java b/src/main/java/org/apache/velocity/tools/generic/XmlTool.java -index 4ab748c..3d5feab 100644 ---- a/src/main/java/org/apache/velocity/tools/generic/XmlTool.java -+++ b/src/main/java/org/apache/velocity/tools/generic/XmlTool.java -@@ -572,7 +572,7 @@ public class XmlTool extends SafeConfig - { - if (n instanceof Element) - { -- kids.addAll((List)((Element)n).elements()); -+ kids.addAll(((Element)n).elements()); - } - } - return new XmlTool(kids); --- -2.9.3 - diff --git a/velocity-tools-2.0-servlet.patch b/velocity-tools-2.0-servlet.patch deleted file mode 100644 index 5bc83dc..0000000 --- a/velocity-tools-2.0-servlet.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Nru velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ImportSupport.java velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ImportSupport.java ---- velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ImportSupport.java 2007-12-12 18:04:38.000000000 +0100 -+++ velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ImportSupport.java 2015-06-19 15:50:41.054584752 +0200 -@@ -36,6 +36,7 @@ - import javax.servlet.RequestDispatcher; - import javax.servlet.ServletContext; - import javax.servlet.ServletOutputStream; -+import javax.servlet.WriteListener; - import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpServletResponse; - import javax.servlet.http.HttpServletResponseWrapper; -@@ -510,6 +511,14 @@ - { - bos.write(b); - } -+ -+ public void setWriteListener(WriteListener listener) { -+ throw new UnsupportedOperationException("Not implemented yet."); -+ } -+ -+ public boolean isReady() { -+ return false; -+ } - }; - return sos; - } -diff -Nru velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ParameterTool.java velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ParameterTool.java ---- velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ParameterTool.java 2009-05-12 00:24:53.000000000 +0200 -+++ velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ParameterTool.java 2015-06-19 15:45:11.950303234 +0200 -@@ -174,7 +174,7 @@ - Map source = super.getSource(); - if (source == null) - { -- source = expandSingletonArrays(getRequest().getParameterMap()); -+ source = expandSingletonArrays((Map)(Object)getRequest().getParameterMap()); - super.setSource(source); - } - return source; diff --git a/velocity-tools.spec b/velocity-tools.spec deleted file mode 100644 index 0d52def..0000000 --- a/velocity-tools.spec +++ /dev/null @@ -1,179 +0,0 @@ -Name: velocity-tools -Version: 2.0 -Release: 22%{?dist} -Summary: Collection of useful tools for Velocity template engine -License: ASL 2.0 -Url: http://velocity.apache.org/tools/releases/2.0/ -Source0: http://www.apache.org/dist/velocity/tools/%{version}/%{name}-%{version}-src.tar.gz -Patch0: %{name}-%{version}-junit4.patch -Patch1: %{name}-%{version}-dont_copy_test_lib.patch -# servlet 3.0 support thanks to mizdebsk -# servlet 3.1 support -Patch2: %{name}-%{version}-servlet.patch -Patch3: %{name}-%{version}-port-to-dom4j-2.0.patch - -BuildRequires: maven-local -BuildRequires: mvn(commons-beanutils:commons-beanutils) -BuildRequires: mvn(commons-chain:commons-chain) -BuildRequires: mvn(commons-collections:commons-collections) -BuildRequires: mvn(commons-digester:commons-digester) -BuildRequires: mvn(commons-lang:commons-lang) -BuildRequires: mvn(commons-logging:commons-logging) -BuildRequires: mvn(commons-validator:commons-validator) -BuildRequires: mvn(dom4j:dom4j) -BuildRequires: mvn(org.apache.maven.plugins:maven-resources-plugin) -# required by resources-plugin -BuildRequires: mvn(org.apache.maven.shared:maven-filtering) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) -BuildRequires: mvn(org.apache.struts:struts-core) -BuildRequires: mvn(org.apache.struts:struts-taglib) -BuildRequires: mvn(org.apache.struts:struts-tiles) -BuildRequires: mvn(org.apache.tomcat:tomcat-jsp-api) -BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) -BuildRequires: mvn(org.apache.velocity:velocity) -BuildRequires: mvn(oro:oro) -BuildRequires: mvn(sslext:sslext) -# required by tomcat-jsp-api -BuildRequires: mvn(org.apache.tomcat:tomcat-el-api) - -# test deps -%if 0 -BuildRequires: mvn(httpunit:httpunit) = 1.6.1 -BuildRequires: mvn(nekohtml:nekohtml) = 0.9.5 -BuildRequires: mvn(org.mortbay.jetty:jetty-embedded) = 6.0.1 -BuildRequires: mvn(rhino:js) = 1.6R5 -BuildRequires: mvn(xerces:xercesImpl) = 2.8.1 -BuildRequires: mvn(xerces:xmlParserAPIs) = 2.6.2 -%endif -BuildRequires: mvn(junit:junit) -BuildRequires: xmvn - -BuildArch: noarch - -%description -The VelocityTools project is a collection of useful Java classes (aka tools), -as well as infrastructure to easily, automatically and transparently -make these tools available to Velocity templates. - -Project include easy integration of Velocity into the view-layer of -web applications (via the VelocityViewTag and -VelocityViewServlet) and integration with Struts 1.x applications. - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -This package contains javadoc for %{name}. - -%prep -%setup -q -n %{name}-%{version}-src -find . -name "*.jar" -delete -find . -name "*.class" -delete -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - -sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt - -# force tomcat 7.x apis -%pom_remove_dep javax.servlet:servlet-api -%pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided -%pom_add_dep org.apache.tomcat:tomcat-jsp-api::provided -# remove non standard build structure -%pom_xpath_remove "pom:project/pom:build/pom:outputDirectory" -%pom_xpath_remove "pom:project/pom:build/pom:directory" - -%pom_remove_dep org.mortbay.jetty:jetty-embedded - -%mvn_file :%{name} %{name} -%mvn_alias :%{name} %{name}:%{name} -%mvn_alias :%{name} org.apache.velocity:%{name}-generic -%mvn_alias :%{name} %{name}:%{name}-generic -%mvn_alias :%{name} %{name}:%{name}-view -%mvn_alias :%{name} org.apache.velocity:%{name}-view - -%build - -# tests skipped. cause: missing dependencies -%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 - -%install -%mvn_install - -%files -f .mfiles -%doc CONTRIBUTORS README.txt STATUS WHY_THREE_JARS.txt -%license LICENSE NOTICE - -%files javadoc -f .mfiles-javadoc -%license LICENSE NOTICE - -%changelog -* Fri Jan 31 2020 Fedora Release Engineering - 2.0-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.0-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.0-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.0-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.0-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Mar 31 2017 Michael Simacek - 2.0-16 -- Port to dom4j 2.0 - -* Sat Feb 11 2017 Fedora Release Engineering - 2.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Aug 09 2016 gil cattaneo 2.0-14 -- add missing build requires: xmvn -- prevent duplicate pom BR entries - -* Fri Feb 05 2016 Fedora Release Engineering - 2.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 gil cattaneo 2.0-12 -- add servlet 3.1 support - -* Fri Jun 19 2015 Fedora Release Engineering - 2.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Feb 13 2015 gil cattaneo 2.0-10 -- introduce license macro - -* Sun Jun 08 2014 Fedora Release Engineering - 2.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 2.0-8 -- Use Requires: java-headless rebuild (#1067528) - -* Sun Aug 04 2013 Fedora Release Engineering - 2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jul 04 2013 gil cattaneo 2.0-6 -- switch to XMvn -- minor changes to adapt to current guideline - -* Tue Feb 19 2013 gil cattaneo 2.0-5 -- added maven-filtering as BR - -* Fri Feb 15 2013 Fedora Release Engineering - 2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 2.0-3 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Sun Jul 22 2012 Fedora Release Engineering - 2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun May 27 2012 gil cattaneo 2.0-1 -- initial rpm