[tomcat8] 03/04: Updated the artifactId of the specification jars to include the new javax prefix

[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 226b3b28d1c24da53b136aaca196bd2975cb0ab7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Sep 14 00:54:09 2013 +0200

    Updated the artifactId of the specification jars to include the new javax prefix
---
 debian/changelog                 |    2 ++
 debian/javaxpoms/jsp-api.pom     |    6 +++---
 debian/javaxpoms/servlet-api.pom |    2 +-
 debian/libservlet3.1-java.poms   |    6 +++---
 debian/maven.rules               |   11 +++--------
 debian/rules                     |    7 ++++---
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee70971..6153af9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
     - Refreshed the patches
     - Updated debian/copyright
     - Installed the new jars (spdy, jni, websocket, websocket-api, storeconfig)
+    - Updated the artifactId of the specification jars to include
+      the new javax prefix
   * Marked libtomcat8-java as conflicting with libtomcat7-java
   * Use XZ compression for the upstream tarball
   * Replaced Sun Microsystems with Oracle
diff --git a/debian/javaxpoms/jsp-api.pom b/debian/javaxpoms/jsp-api.pom
index 4c281fe..fc72699 100644
--- a/debian/javaxpoms/jsp-api.pom
+++ b/debian/javaxpoms/jsp-api.pom
@@ -18,7 +18,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>javax.servlet.jsp</groupId>
-  <artifactId>jsp-api</artifactId>
+  <artifactId>javax.servlet.jsp-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>JSP package</description>
   <url>http://tomcat.apache.org/</url>
@@ -32,13 +32,13 @@
   <dependencies>
     <dependency>
       <groupId>javax.el</groupId>
-      <artifactId>el-api</artifactId>
+      <artifactId>javax.el-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
diff --git a/debian/javaxpoms/servlet-api.pom b/debian/javaxpoms/servlet-api.pom
index e75acdb..33256d3 100644
--- a/debian/javaxpoms/servlet-api.pom
+++ b/debian/javaxpoms/servlet-api.pom
@@ -18,7 +18,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>javax.servlet</groupId>
-  <artifactId>servlet-api</artifactId>
+  <artifactId>javax.servlet-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>javax.servlet package</description>
   <url>http://tomcat.apache.org/</url>
diff --git a/debian/libservlet3.1-java.poms b/debian/libservlet3.1-java.poms
index 1a7401f..9d6a4cd 100644
--- a/debian/libservlet3.1-java.poms
+++ b/debian/libservlet3.1-java.poms
@@ -1,6 +1,6 @@
 debian/poms/tomcat-servlet-api.pom --no-parent
 debian/poms/tomcat-jsp-api.pom --no-parent
 debian/poms/tomcat-el-api.pom --no-parent
-debian/javaxpoms/servlet-api.pom --no-rules
-debian/javaxpoms/jsp-api.pom --no-rules
-debian/javaxpoms/el-api.pom --no-rules
+debian/poms/servlet-api.pom --no-rules
+debian/poms/jsp-api.pom --no-rules
+debian/poms/el-api.pom --no-rules
diff --git a/debian/maven.rules b/debian/maven.rules
index 54dacf8..0cd470e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,12 +1,7 @@
 # Force the version of the javax apis
-javax.servlet servlet-api jar s/.*/3.1/
-javax.servlet.jsp jsp-api jar s/.*/2.3/
-javax.el el-api jar s/.*/3.0/
-
-# Convert tomcat version of the standard apis to the javax apis
-#s/org.apache.tomcat/javax.servlet/ s/tomcat-servlet-api/servlet-api/ jar s/.*/3.1/
-#s/org.apache.tomcat/javax.servlet.jsp/ s/tomcat-jsp-api/jsp-api/ jar s/.*/2.3/
-#s/org.apache.tomcat/javax.el/ s/tomcat-el-api/el-api/ jar s/.*/3.0/
+javax.servlet javax.servlet-api jar s/.*/3.1/
+javax.servlet.jsp javax.servlet.jsp-api jar s/.*/2.3/
+javax.el javax.el-api jar s/.*/3.0/
 
 # Publish 8.x instead of 'debian' artifacts to avoid conflicts with other versions of Tomcat
 org.apache.tomcat tomcat * s/.*/8.x/
diff --git a/debian/rules b/debian/rules
index bf150b9..cf62b52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -153,11 +153,12 @@ binary-indep: build install
 	
 	mh_installpoms -plibservlet3.1-java
 	mh_installjar -plibservlet3.1-java -l -s  debian/poms/tomcat-servlet-api.pom  output/build/lib/servlet-api.jar
-	mh_installjar -plibservlet3.1-java -l -s  debian/poms/servlet-api.pom         output/build/lib/servlet-api.jar
 	mh_installjar -plibservlet3.1-java -l -s  debian/poms/tomcat-jsp-api.pom      output/build/lib/jsp-api.jar
-	mh_installjar -plibservlet3.1-java -l -s  debian/poms/jsp-api.pom             output/build/lib/jsp-api.jar
 	mh_installjar -plibservlet3.1-java -l -s  debian/poms/tomcat-el-api.pom       output/build/lib/el-api.jar
-	mh_installjar -plibservlet3.1-java -l -s  debian/poms/el-api.pom              output/build/lib/el-api.jar
+	
+	mh_installjar -plibservlet3.1-java -l -s --usj-name=servlet-api debian/poms/servlet-api.pom output/build/lib/servlet-api.jar
+	mh_installjar -plibservlet3.1-java -l -s --usj-name=jsp-api     debian/poms/jsp-api.pom     output/build/lib/jsp-api.jar
+	mh_installjar -plibservlet3.1-java -l -s --usj-name=el-api      debian/poms/el-api.pom      output/build/lib/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