[jspc] reorganize deps to servlet 3.0 then jsp 2.2+
Peter MacKinnon
pmackinn at fedoraproject.org
Thu May 15 16:51:23 UTC 2014
commit 1f0a2c29ecda0ee9856dc57c7ac9fc6fdaafb351
Author: Peter MacKinnon <pmackinn at redhat.com>
Date: Thu May 15 12:51:00 2014 -0400
reorganize deps to servlet 3.0 then jsp 2.2+
jspc.spec | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/jspc.spec b/jspc.spec
index db9e996..c2b0e98 100644
--- a/jspc.spec
+++ b/jspc.spec
@@ -25,8 +25,8 @@ BuildRequires: fusesource-pom
BuildRequires: mvn(commons-lang:commons-lang)
BuildRequires: mvn(org.apache.maven.shared:file-management)
BuildRequires: plexus-containers-container-default
-BuildRequires: glassfish-jsp
-BuildRequires: glassfish-servlet-api
+BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
+BuildRequires: mvn(org.glassfish.web:javax.servlet.jsp)
BuildRequires: maven-antrun-plugin
BuildRequires: maven-enforcer-plugin
@@ -84,8 +84,10 @@ sed -i 's|<artifactId>plexus-maven-plugin</artifactId>|<artifactId>plexus-compon
%pom_remove_dep org.apache.tomcat:annotations-api jspc-compilers/jspc-compiler-tomcat6/pom.xml
%pom_remove_dep org.apache.tomcat:jasper jspc-compilers/jspc-compiler-tomcat6/pom.xml
%pom_remove_dep org.apache.tomcat:jasper-el jspc-compilers/jspc-compiler-tomcat6/pom.xml
-%pom_add_dep javax.servlet:jsp-api jspc-compilers/jspc-compiler-tomcat6/pom.xml
-%pom_add_dep javax.servlet:javax.servlet-api jspc-compilers/jspc-compiler-tomcat6/pom.xml
+
+# we need servlet 3.0 and jsp 2.2+ in this order
+%pom_add_dep org.apache.tomcat:tomcat-servlet-api jspc-compilers/jspc-compiler-tomcat6/pom.xml
+%pom_add_dep org.glassfish.web:javax.servlet.jsp jspc-compilers/jspc-compiler-tomcat6/pom.xml
# drop plexus-maven-plugin and add plexus-component-metadata and appropriate config
%pom_remove_plugin org.codehaus.plexus:plexus-maven-plugin jspc-compilers/pom.xml
More information about the scm-commits
mailing list