[tomcat8] 03/06: Fixed the versions of the Maven dependencies for jsp-api

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 28765977326d37968bcbae02706016ce0a26ccb2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Sep 14 23:46:52 2013 +0200

    Fixed the versions of the Maven dependencies for jsp-api
---
 debian/changelog                 |    1 +
 debian/javaxpoms/el-api.pom      |    2 +-
 debian/javaxpoms/jsp-api.pom     |    6 +++---
 debian/javaxpoms/servlet-api.pom |    2 +-
 debian/libservlet3.1-java.poms   |    6 +++---
 debian/rules                     |   10 +++-------
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f334af6..2f7a2df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
   * Added a patch to ignore the failing tests
   * Moved the tomcat-{servlet|jsp|el}-api artifacts from libservlet3.1-java
     to libtomcat8-java
+  * Fixed the versions of the Maven dependencies for jsp-api
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 12 Sep 2013 16:10:10 +0200
 
diff --git a/debian/javaxpoms/el-api.pom b/debian/javaxpoms/el-api.pom
index 090134a..1bccaf7 100644
--- a/debian/javaxpoms/el-api.pom
+++ b/debian/javaxpoms/el-api.pom
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>javax.el</groupId>
   <artifactId>javax.el-api</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <version>3.0</version>
   <description>Expression language package</description>
   <url>http://tomcat.apache.org/</url>
   <licenses>
diff --git a/debian/javaxpoms/jsp-api.pom b/debian/javaxpoms/jsp-api.pom
index fc72699..cdd3b17 100644
--- a/debian/javaxpoms/jsp-api.pom
+++ b/debian/javaxpoms/jsp-api.pom
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>javax.servlet.jsp</groupId>
   <artifactId>javax.servlet.jsp-api</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <version>2.3</version>
   <description>JSP package</description>
   <url>http://tomcat.apache.org/</url>
   <licenses>
@@ -33,13 +33,13 @@
     <dependency>
       <groupId>javax.el</groupId>
       <artifactId>javax.el-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <version>3.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <version>3.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/debian/javaxpoms/servlet-api.pom b/debian/javaxpoms/servlet-api.pom
index 33256d3..fd5cbd0 100644
--- a/debian/javaxpoms/servlet-api.pom
+++ b/debian/javaxpoms/servlet-api.pom
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>javax.servlet</groupId>
   <artifactId>javax.servlet-api</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <version>3.1</version>
   <description>javax.servlet package</description>
   <url>http://tomcat.apache.org/</url>
   <licenses>
diff --git a/debian/libservlet3.1-java.poms b/debian/libservlet3.1-java.poms
index 7100b07..f73d7f8 100644
--- a/debian/libservlet3.1-java.poms
+++ b/debian/libservlet3.1-java.poms
@@ -1,3 +1,3 @@
-debian/poms/servlet-api.pom --no-rules
-debian/poms/jsp-api.pom --no-rules
-debian/poms/el-api.pom --no-rules
+debian/javaxpoms/servlet-api.pom --no-rules
+debian/javaxpoms/jsp-api.pom --no-rules
+debian/javaxpoms/el-api.pom --no-rules
diff --git a/debian/rules b/debian/rules
index c04d93d..5d18b0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,10 +101,6 @@ binary-indep: build install
 	
 	mkdir -p debian/poms
 	cp res/maven/*.pom debian/poms
-	cp debian/javaxpoms/*.pom debian/poms
-	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.1/'      debian/poms/servlet-api.pom
-	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.0/'      debian/poms/el-api.pom
-	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.3/'      debian/poms/jsp-api.pom
 	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(T_VER)/' debian/poms/*.pom
 	
 	mh_installpoms -plibtomcat8-java
@@ -155,9 +151,9 @@ binary-indep: build install
 	dh_link
 	
 	mh_installpoms -plibservlet3.1-java
-	mh_installjar -plibservlet3.1-java -l -s --usj-name=servlet-api debian/poms/servlet-api.pom $(BLDLIB)/servlet-api.jar
-	mh_installjar -plibservlet3.1-java -l -s --usj-name=jsp-api     debian/poms/jsp-api.pom     $(BLDLIB)/jsp-api.jar
-	mh_installjar -plibservlet3.1-java -l -s --usj-name=el-api      debian/poms/el-api.pom      $(BLDLIB)/el-api.jar
+	mh_installjar -plibservlet3.1-java -l -s --usj-name=servlet-api debian/javaxpoms/servlet-api.pom $(BLDLIB)/servlet-api.jar
+	mh_installjar -plibservlet3.1-java -l -s --usj-name=jsp-api     debian/javaxpoms/jsp-api.pom     $(BLDLIB)/jsp-api.jar
+	mh_installjar -plibservlet3.1-java -l -s --usj-name=el-api      debian/javaxpoms/el-api.pom      $(BLDLIB)/el-api.jar
 	
 	rm -r debian/poms
 	rm -rf \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git