[jspc] completely remove tomcat-jasper in lieu of glassfish-jsp

[Peter MacKinnon]

commit fc2740cb54d2ade9ca614c2903d4788da8da24be
Author: Peter MacKinnon <pmackinn at redhat.com>
Date:   Wed May 14 08:57:43 2014 -0400

    completely remove tomcat-jasper in lieu of glassfish-jsp

 jspc.spec |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/jspc.spec b/jspc.spec
index 0750f0f..db9e996 100644
--- a/jspc.spec
+++ b/jspc.spec
@@ -4,7 +4,7 @@
 
 Name:          jspc
 Version:       2.0
-Release:       0.10%{dotreltag}%{?dist}
+Release:       0.11%{dotreltag}%{?dist}
 Summary:       Compile JSPs under Maven
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -25,7 +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: tomcat
+BuildRequires: glassfish-jsp
+BuildRequires: glassfish-servlet-api
 
 BuildRequires: maven-antrun-plugin
 BuildRequires: maven-enforcer-plugin
@@ -74,17 +75,17 @@ sed -i 's|<artifactId>plexus-maven-plugin</artifactId>|<artifactId>plexus-compon
 # no tomcat5
 %pom_disable_module jspc-compiler-tomcat5 jspc-compilers/pom.xml
 
-# switch jasper-jdt dep to ecj dep
-%pom_remove_dep org.apache.tomcat:jasper-jdt jspc-compilers/jspc-compiler-tomcat6/pom.xml
-%pom_add_dep org.eclipse.jdt.core.compiler:ecj:3.1.1 jspc-compilers/jspc-compiler-tomcat6/pom.xml
-sed -i 's|<artifactId>jasper</artifactId>|<artifactId>tomcat-jasper</artifactId>|' jspc-compilers/jspc-compiler-tomcat6/pom.xml
-sed -i 's|<artifactId>jasper-el</artifactId>|<artifactId>tomcat-jasper-el</artifactId>|' jspc-compilers/jspc-compiler-tomcat6/pom.xml
-sed -i 's|<artifactId>jasper-jdt</artifactId>|<artifactId>tomcat-jasper-jdt</artifactId>|' jspc-compilers/jspc-compiler-tomcat6/pom.xml
+# switch tomcat-jasper for glassfish-jsp
 %pom_remove_dep org.apache.tomcat:juli jspc-compilers/jspc-compiler-tomcat6/pom.xml
 %pom_remove_dep org.apache.tomcat:servlet-api jspc-compilers/jspc-compiler-tomcat6/pom.xml
 %pom_remove_dep org.apache.tomcat:jsp-api jspc-compilers/jspc-compiler-tomcat6/pom.xml
 %pom_remove_dep org.apache.tomcat:el-api jspc-compilers/jspc-compiler-tomcat6/pom.xml
+%pom_remove_dep org.apache.tomcat:jasper-jdt jspc-compilers/jspc-compiler-tomcat6/pom.xml
 %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
 
 # 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
@@ -137,12 +138,6 @@ sed -i 's|<artifactId>jasper-jdt</artifactId>|<artifactId>tomcat-jasper-jdt</art
 # ant property now needs AntBuilder()
 sed -i '/Make directories if needed/a def ant = new AntBuilder()' jspc-maven-plugin/src/main/groovy/org/codehaus/mojo/jspc/CompilationMojoSupport.groovy
 
-# tomcat 7.0.52 has a broken api
-TC_VER=$(rpm -q --qf '%{VERSION}' tomcat)
-if [ $TC_VER == "7.0.52" ] ; then
-    sed -i 's/jspc.setValidateXml/jspc.setValidateTld/' jspc-compilers/jspc-compiler-tomcat6/src/main/java/org/codehaus/mojo/jspc/compiler/tomcat6/JspCompilerImpl.java
-fi
-
 %build
 %mvn_build
 
@@ -199,6 +194,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %doc LICENSE.txt
 
 %changelog
+* Tue May 13 2014 Peter MacKinnon <pmackinn at redhat.com> 2.0-0.11.alpha.3
+- completely remove tomcat-jasper in lieu of glassfish-jsp
+
 * Wed Apr 16 2014 Peter MacKinnon <pmackinn at redhat.com> 2.0-0.10.alpha.3
 - add AntBuilder to groovy file
 - make adjustment for broken tomcat API in 7.0.52