commit 9ba037c3910310cb20e5efd9b43c0372fd9019e5
Author: gil <puntogil(a)libero.it>
Date: Wed Mar 4 17:42:09 2015 +0100
use servlet api 3.1
tiles.spec | 49 ++++++++++++++++++++++++-------------------------
1 file changed, 24 insertions(+), 25 deletions(-)
---
diff --git a/tiles.spec b/tiles.spec
index 12dab2e..c2ed561 100644
--- a/tiles.spec
+++ b/tiles.spec
@@ -1,15 +1,12 @@
%global master_version 3
Name: tiles
Version: 2.2.2
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Java templating framework for web application user interfaces
License: ASL 2.0
Url:
http://tiles.apache.org/
Source0:
http://www.apache.org/dist/%{name}/v%{version}/%{name}-%{version}-src.tar.gz
-# wget -O tiles-master-3-pom.xml
http://svn.apache.org/repos/asf/tiles/maven/tags/tiles-master-3/pom.xml
-Source1: %{name}-master-%{master_version}-pom.xml
-# force tomcat 7.x apis use
-Source2: %{name}-%{version}-2-depmap
+
# remove shale-test and maven-taglib-plugin
# change
# org.codehaus.mojo rat-maven-plugin in org.apache.rat apache-rat-plugin
@@ -20,33 +17,32 @@ Patch0: %{name}-%{version}-fix-build.patch
Patch1: %{name}-%{version}-commons-ognl.patch
# add tiles-master relativePath
Patch2: %{name}-%{version}-parent-pom.patch
-# build fix fot tomcat 7.x apis
-Patch3: %{name}-%{version}-servlet-servlet30.patch
-Patch4: %{name}-%{version}-jsp-servlet30.patch
-
-BuildRequires: apache-commons-digester
-BuildRequires: apache-commons-ognl
-BuildRequires: freemarker
-BuildRequires: mvel
-BuildRequires: portlet-2.0-api
-BuildRequires: slf4j
-BuildRequires: tomcat-lib
-BuildRequires: tomcat-el-2.2-api
-BuildRequires: tomcat-jsp-2.2-api
-BuildRequires: tomcat-servlet-3.0-api
-BuildRequires: velocity-tools
+# build fix fot tomcat 8.x apis
+Patch3: %{name}-%{version}-servlet3.1.patch
+
+BuildRequires: mvn(commons-digester:commons-digester)
+BuildRequires: mvn(javax.portlet:portlet-api)
+BuildRequires: mvn(org.apache.commons:commons-ognl)
+BuildRequires: mvn(org.apache.tomcat:tomcat-el-api)
+BuildRequires: mvn(org.apache.tomcat:tomcat-jasper-el)
+BuildRequires: mvn(org.apache.tomcat:tomcat-jsp-api)
+BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
+BuildRequires: mvn(org.apache.velocity:velocity-tools)
+BuildRequires: mvn(org.freemarker:freemarker)
+BuildRequires: mvn(org.mvel:mvel2)
BuildRequires: mvn(org.slf4j:jcl-over-slf4j)
BuildRequires: mvn(org.slf4j:slf4j-jdk14)
+BuildRequires: slf4j
+BuildRequires: tomcat-lib
# test deps
%if 0
BuildRequires: mvn(org.easymock:easymockclassextension) >= 2.4
BuildRequires: mvn(org.apache.shale:shale-test) >= 1.0.5
%endif
-BuildRequires: junit
+BuildRequires: mvn(junit:junit)
BuildRequires: maven-local
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-resources-plugin
@@ -81,9 +77,8 @@ This package contains javadoc for %{name}.
%patch0 -p1
%patch1 -p1
%patch2 -p0
+%patch3 -p1
-%patch3 -p0
-%patch4 -p0
# require org.springframework spring-webmvc-portlet 2.5.6
%pom_disable_module tiles-portlet-wildcard src/pom.xml
@@ -119,6 +114,7 @@ sed -i
"s|<artifactId>servlet-api</artifactId>|<artifactId>tomcat-servlet-api</a
src/tiles-el/pom.xml \
src/tiles-servlet-wildcard/pom.xml
+
%pom_remove_parent src
#cp -p %%{SOURCE1} pom.xml
@@ -143,7 +139,7 @@ cd src
%mvn_file :%{name}-velocity %{name}/velocity
# test skip for unavailable deps
-%mvn_build -f -- -Dmaven.local.depmap.file="%{SOURCE2}"
+%mvn_build -f
%install
@@ -160,6 +156,9 @@ cd src
%license LICENSE.txt NOTICE.txt
%changelog
+* Wed Mar 04 2015 gil cattaneo <puntogil(a)libero.it> 2.2.2-13
+- use servlet 3.1, el 3.0, jsp 2.3
+
* Fri Feb 13 2015 gil cattaneo <puntogil(a)libero.it> 2.2.2-12
- introduce license macro