[tomcat8] 02/14: Deploy the Tomcat artifacts in the Maven repository with the 8.x version instead of 'debian' to avoid conflicts with other versions of Tomcat.

[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 02636ba337c417cbd17b41c1af54d014ba3070e3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 13 13:40:12 2013 +0200

    Deploy the Tomcat artifacts in the Maven repository with the 8.x version instead of 'debian' to avoid conflicts with other versions of Tomcat.
---
 debian/changelog   |    2 ++
 debian/maven.rules |   29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0ba053e..1181d91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
   * Use XZ compression for the upstream tarball
   * Replaced Sun Microsystems with Oracle
   * Mentioned 'Apache Tomcat' in the packages descriptions
+  * Deploy the Tomcat artifacts in the Maven repository with the 8.x version
+    instead of 'debian' to avoid conflicts with other versions of Tomcat.
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 12 Sep 2013 16:10:10 +0200
 
diff --git a/debian/maven.rules b/debian/maven.rules
index 593184b..54dacf8 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -2,7 +2,36 @@
 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/
+
+# Publish 8.x instead of 'debian' artifacts to avoid conflicts with other versions of Tomcat
+org.apache.tomcat tomcat * s/.*/8.x/
+org.apache.tomcat tomcat-annotations-api * s/.*/8.x/
+org.apache.tomcat tomcat-api * s/.*/8.x/
+org.apache.tomcat tomcat-catalina * s/.*/8.x/
+org.apache.tomcat tomcat-catalina-ant * s/.*/8.x/
+org.apache.tomcat tomcat-catalina-ha * s/.*/8.x/
+org.apache.tomcat tomcat-catalina-jmx-remote * s/.*/8.x/
+org.apache.tomcat tomcat-catalina-ws * s/.*/8.x/
+org.apache.tomcat tomcat-coyote * s/.*/8.x/
+org.apache.tomcat tomcat-dbcp * s/.*/8.x/
+org.apache.tomcat tomcat-el-api * s/.*/8.x/
+org.apache.tomcat tomcat-i18n-es * s/.*/8.x/
+org.apache.tomcat tomcat-i18n-fr * s/.*/8.x/
+org.apache.tomcat tomcat-i18n-ja * s/.*/8.x/
+org.apache.tomcat tomcat-jasper * s/.*/8.x/
+org.apache.tomcat tomcat-jasper-el * s/.*/8.x/
+org.apache.tomcat tomcat-jdbc * s/.*/8.x/
+org.apache.tomcat tomcat-jni * s/.*/8.x/
+org.apache.tomcat tomcat-jsp-api * s/.*/8.x/
+org.apache.tomcat tomcat-juli * s/.*/8.x/
+org.apache.tomcat tomcat-servlet-api * s/.*/8.x/
+org.apache.tomcat tomcat-spdy * s/.*/8.x/
+org.apache.tomcat tomcat-tribes * s/.*/8.x/
+org.apache.tomcat tomcat-util * s/.*/8.x/
+org.apache.tomcat tomcat-websocket * s/.*/8.x/
+org.apache.tomcat tomcat-websocket-api * s/.*/8.x/

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