From 18e2f60606e5b9c6b74820bb6651cfdb31add849 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 16 Sep 2009 20:23:44 +0000
Subject: [PATCH] Update to Maven deploy process. A SNAPHOT deployment of trunk
 should now work and include extras and embedded.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@815952 13f79535-47bb-0310-9956-ffa450edef68
---
 res/maven/TODO-currently-empty-src.jar             | Bin 0 -> 345 bytes
 res/maven/mvn-pub.xml                              | 142 ++++++++++-----------
 res/maven/mvn.properties.default                   |   8 --
 ...otations-api.pom => tomcat-annotations-api.pom} |   2 +-
 .../{catalina-ant.pom => tomcat-catalina-ant.pom}  |  10 +-
 .../{catalina-ha.pom => tomcat-catalina-ha.pom}    |  12 +-
 ...x-remote.pom => tomcat-catalina-jmx-remote.pom} |   4 +-
 .../{catalina-ws.pom => tomcat-catalina-ws.pom}    |   4 +-
 res/maven/{catalina.pom => tomcat-catalina.pom}    |  16 +--
 res/maven/{coyote.pom => tomcat-coyote.pom}        |   8 +-
 res/maven/{dbcp.pom => tomcat-dbcp.pom}            |   2 +-
 res/maven/{el-api.pom => tomcat-el-api.pom}        |   2 +-
 .../{embed-core.pom => tomcat-embed-core.pom}      |   6 +-
 .../{embed-jasper.pom => tomcat-embed-jasper.pom}  |   4 +-
 ...ging-juli.pom => tomcat-embed-logging-juli.pom} |   2 +-
 ...ng-log4j.pom => tomcat-embed-logging-log4j.pom} |   2 +-
 ...dapters.pom => tomcat-extras-juli-adapters.pom} |   6 +-
 .../{juli-extras.pom => tomcat-extras-juli.pom}    |   2 +-
 res/maven/{jasper-el.pom => tomcat-jasper-el.pom}  |   4 +-
 .../{jasper-jdt.pom => tomcat-jasper-jdt.pom}      |   2 +-
 res/maven/{jasper.pom => tomcat-jasper.pom}        |  16 +--
 res/maven/{jsp-api.pom => tomcat-jsp-api.pom}      |   6 +-
 res/maven/{juli.pom => tomcat-juli.pom}            |   2 +-
 .../{servlet-api.pom => tomcat-servlet-api.pom}    |   2 +-
 res/maven/{tribes.pom => tomcat-tribes.pom}        |   4 +-
 25 files changed, 125 insertions(+), 143 deletions(-)
 create mode 100644 res/maven/TODO-currently-empty-src.jar
 rename res/maven/{annotations-api.pom => tomcat-annotations-api.pom} (94%)
 rename res/maven/{catalina-ant.pom => tomcat-catalina-ant.pom} (87%)
 rename res/maven/{catalina-ha.pom => tomcat-catalina-ha.pom} (86%)
 rename res/maven/{catalina-jmx-remote.pom => tomcat-catalina-jmx-remote.pom} (92%)
 rename res/maven/{catalina-ws.pom => tomcat-catalina-ws.pom} (92%)
 rename res/maven/{catalina.pom => tomcat-catalina.pom} (82%)
 rename res/maven/{coyote.pom => tomcat-coyote.pom} (89%)
 rename res/maven/{dbcp.pom => tomcat-dbcp.pom} (96%)
 rename res/maven/{el-api.pom => tomcat-el-api.pom} (96%)
 rename res/maven/{embed-core.pom => tomcat-embed-core.pom} (90%)
 rename res/maven/{embed-jasper.pom => tomcat-embed-jasper.pom} (92%)
 rename res/maven/{embed-logging-juli.pom => tomcat-embed-logging-juli.pom} (95%)
 rename res/maven/{embed-logging-log4j.pom => tomcat-embed-logging-log4j.pom} (95%)
 rename res/maven/{juli-adapters.pom => tomcat-extras-juli-adapters.pom} (90%)
 rename res/maven/{juli-extras.pom => tomcat-extras-juli.pom} (95%)
 rename res/maven/{jasper-el.pom => tomcat-jasper-el.pom} (93%)
 rename res/maven/{jasper-jdt.pom => tomcat-jasper-jdt.pom} (95%)
 rename res/maven/{jasper.pom => tomcat-jasper.pom} (86%)
 rename res/maven/{jsp-api.pom => tomcat-jsp-api.pom} (90%)
 rename res/maven/{juli.pom => tomcat-juli.pom} (96%)
 rename res/maven/{servlet-api.pom => tomcat-servlet-api.pom} (95%)
 rename res/maven/{tribes.pom => tomcat-tribes.pom} (93%)

diff --git a/res/maven/TODO-currently-empty-src.jar b/res/maven/TODO-currently-empty-src.jar
new file mode 100644
index 0000000000000000000000000000000000000000..c79c0a2206068208151417c63289751a0fc31c56
GIT binary patch
literal 345
zcmWIWW@Zs#-~hs<6AY{wkN_tG3xls~h@-BjpPT-_Qw$8u3<2Kk93T};P-Ou)HH!dM
zz%~0i`gyv!28ZbRx_$ONbK1vSSMMUPx31Q?Gv_x48C)@b@U%$J%U8$K_hRWP7S0(j
zC67qY(#T+${!H^nnwt1i@o=%}OP+~oS3FaFo%yNgV-X|RA>}g0j_yEfKsdmgkx7IB
v)gLfNg8YFB;0^=%3SBF*u^?X{fGv;-*NWt)0B=?{kSZo1tOe4?KpX}DDmX*s

literal 0
HcmV?d00001

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index f83adf8a9..16144e7c8 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -16,34 +16,27 @@
   limitations under the License.
 -->
 <project name="Tomcat 7.0 Maven Deployment" default="" basedir="." xmlns:artifact="urn:maven-artifact-ant">
-
   <!--
-    Built for using Maven 2.0.4
-    Two additional jar files required, please download from
-    http://people.apache.org/~fhanik/tomcat/maven/
-    
+    Built for using Maven Ant Tasks 2.0.10 - download to this directory
+    You'll also need to install jsch 0.1.42 and manually configure
+    wagon-ssh 1.0-beta-2 to use the updated jsch. This will also add a
+    requirement for jzlib 1.0.7
   -->
   <!--
   Properties required to be set:
-  maven.home - full path to Maven2 installation, mvn or mvn.bat is assumed to be in ${maven.home}/bin/
-  maven.bin  - the script to execute for maven, would be mvn or mvn.bat
   maven.repo.url - the URL of the repository, for example scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
   maven.repo.repositoryId - the id of the repository, for example apache.snapshots
   maven.deploy.version - the version that the components will be deployed as, for example @MAVEN.DEPLOY.VERSION@
   tomcat.lib.path - the path to tomcat JAR files
   tomcat.bin.path - the path to tomcat's bin directory (for other JAR files)
   tomcat.pom.path - the path to the POM files
+  
+  For passwordless upload you'll also need to set
+  maven.scp.username    - Your ASF ID
+  maven.scp.privateKey  - Path to your exported ssh key
+  
   All these can be defined by mvn.properties (and defaults are in mvn.properties.default)
   
-  To do password less upload, you can modify either
-  $MAVE_HOME/conf/settings.xml or ~/.m2/settings.xml and add this snippet
-    <server>
-      <id>apache.snapshots</id>
-      <username>yourusername</username>
-      <privateKey>/home/yourusername/.ssh/id_rsa</privateKey>
-      <passphrase></passphrase>
-    </server>
-    
   To get a private key to work on Windows, I followed these steps
   1. on a linux box execute 'ssh-keygen -t rsa'
   2. same linux box execute 'cat id_rsa.pub >> authorized_keys' and 'cat id_rsa.pub >> authorized_keys2'
@@ -61,8 +54,7 @@
   <target name="init-maven">
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
       <classpath>
-        <pathelement location="${basedir}/maven-ant-tasks-attached-patch.jar" />
-        <pathelement location="${basedir}/maven-artifact-ant-2.0.4-dep.jar" />
+        <pathelement location="${basedir}/maven-ant-tasks-2.0.10.jar" />
       </classpath>
     </typedef>
     <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
@@ -72,6 +64,7 @@
     <!--cleanup-->
     <delete file="${pom}.tmp"/>
     <delete file="${file}.asc"/>
+    <delete file="${src}.asc"/>
 
     <!--replace the version in the pom-->
     <copy file="${pom}" tofile="${pom}.tmp">
@@ -88,6 +81,13 @@
       <arg value="-b"/>
       <arg value="${file}"/>
     </exec>
+    <exec executable="${maven.gpg.exec}" failonerror="true" inputstring="${maven.gpg.passphrase}">
+      <arg value="--passphrase-fd"/>
+      <arg value="0"/>
+      <arg value="-a"/>
+      <arg value="-b"/>
+      <arg value="${src}"/>
+    </exec>
     
     <!--deploy it-->
     <artifact:deploy file="${file}">
@@ -96,41 +96,29 @@
           <authentication username="${maven.scp.username}" privateKey="${maven.scp.privateKey}" passphrase="${maven.scp.passphrase}"/>
         </remoteRepository>
         <attach file="${file}.asc" type="jar.asc"/>
+        <attach file="${src}" classifier="sources" type="jar"/>
+        <attach file="${src}.asc" type="jar.asc"/>
     </artifact:deploy>
 
-    <!--
-    <exec executable="${maven.home}/bin/${maven.bin}" failonerror="true">
-      <env key="MAVEN_HOME" value="${maven.home}"/>
-      <arg value="deploy:deploy-file"/>
-      <arg value="-Dfile=${file}"/>
-      <arg value="-DgroupId=${groupId}"/>
-      <arg value="-DartifactId=${artifactId}"/>
-      <arg value="-Dversion=${maven.deploy.version}"/>
-      <arg value="-Dpackaging=jar"/>
-      <arg value="-DgeneratePom=false"/>
-      <arg value="-DrepositoryId=${maven.repo.repositoryId}"/>
-      <arg value="-Durl=${maven.repo.url}"/>
-      <arg value="-DpomFile=${pom}.tmp"/>
-    </exec>
-    -->
     <delete file="${pom}.tmp"/>
     <delete file="${file}.asc"/>
+    <delete file="${src}.asc"/>
   </target>
-  
+
   <macrodef name="doMavenDeploy">
     <attribute name="artifactId"/>
     <attribute name="jarFileName" default="@{artifactId}.jar" />
     <attribute name="groupId" default="org.apache.tomcat" />
     <attribute name="file" default="${tomcat.lib.path}/@{jarFileName}" />
     <attribute name="pom" default="@{artifactId}.pom" />
-  	<!-- How to handle sources ? -->
-    <attribute name="src" default="NONE" />
+    <attribute name="src" default="${basedir}/TODO-currently-empty-src.jar" />
     <sequential>
       <antcall target="maven-deploy">
         <param name="file" value="@{file}"/>
         <param name="groupId" value="@{groupId}"/>
         <param name="artifactId" value="@{artifactId}"/>
         <param name="pom" value="${tomcat.pom.path}/@{pom}"/>
+        <param name="src" value="@{src}"/>
       </antcall>
     </sequential>
   </macrodef>
@@ -138,56 +126,66 @@
   <target name="generic-deploy" depends="init-maven">
   	<!-- Standard jars in bin directory -->
   	<!-- Skip bootstrap.jar - it is just a subset of catalina.jar -->
-  	<doMavenDeploy artifactId="juli" file="${tomcat.bin.path}/tomcat-juli.jar"/>
-  	    
+  	<doMavenDeploy artifactId="tomcat-juli" file="${tomcat.bin.path}/tomcat-juli.jar"/>
+    <!-- TODO source JAR -->
+  	
   	<!-- Standard jars in lib directory -->
-  	<doMavenDeploy artifactId="annotations-api"/>
-  	<doMavenDeploy artifactId="catalina"/>
-    <doMavenDeploy artifactId="catalina-ant"/>
-    <doMavenDeploy artifactId="catalina-ha"/>
-    <doMavenDeploy artifactId="tribes" jarFileName="catalina-tribes.jar"/>
-    <doMavenDeploy artifactId="el-api"/>
-    <doMavenDeploy artifactId="jasper"/>
-    <doMavenDeploy artifactId="jasper-el"/>
-    <doMavenDeploy artifactId="jasper-jdt"/>
-    <doMavenDeploy artifactId="jsp-api"/>
-    <doMavenDeploy artifactId="servlet-api"/>
-    <doMavenDeploy artifactId="tomcat-api" />
-    <doMavenDeploy artifactId="coyote" jarFileName="tomcat-coyote.jar"/>
-    <doMavenDeploy artifactId="dbcp" jarFileName="tomcat-dbcp.jar"/>
-    <doMavenDeploy artifactId="tomcat-i18n-es" />
-    <doMavenDeploy artifactId="tomcat-i18n-fr" />
-    <doMavenDeploy artifactId="tomcat-i18n-ja" />
+  	<doMavenDeploy artifactId="tomcat-annotations-api" jarFileName="annotations-api.jar"/>
+  	<doMavenDeploy artifactId="tomcat-catalina" jarFileName="catalina.jar"/>
+    <doMavenDeploy artifactId="tomcat-catalina-ant" jarFileName="catalina-ant.jar"/>
+    <doMavenDeploy artifactId="tomcat-catalina-ha" jarFileName="catalina-ha.jar"/>
+    <doMavenDeploy artifactId="tomcat-tribes" jarFileName="catalina-tribes.jar"/>
+    <doMavenDeploy artifactId="tomcat-el-api" jarFileName="el-api.jar"/>
+    <doMavenDeploy artifactId="tomcat-jasper" jarFileName="jasper.jar"/>
+    <doMavenDeploy artifactId="tomcat-jasper-el" jarFileName="jasper-el.jar"/>
+    <doMavenDeploy artifactId="tomcat-jasper-jdt" jarFileName="jasper-jdt.jar"/>
+    <doMavenDeploy artifactId="tomcat-jsp-api" jarFileName="jsp-api.jar"/>
+    <doMavenDeploy artifactId="tomcat-servlet-api" jarFileName="servlet-api.jar"/>
+    <doMavenDeploy artifactId="tomcat-api"/>
+    <doMavenDeploy artifactId="tomcat-coyote"/>
+    <doMavenDeploy artifactId="tomcat-dbcp"/>
+    <doMavenDeploy artifactId="tomcat-i18n-es"/>
+    <doMavenDeploy artifactId="tomcat-i18n-fr"/>
+    <doMavenDeploy artifactId="tomcat-i18n-ja"/>
+    <!-- TODO source JARs -->
 
     <!-- Extras jars -->
-    <doMavenDeploy artifactId="juli" groupId="org.apache.tomcat.extras"
-    	file="${tomcat.extras.path}/tomcat-juli.jar" pom="juli-extras.pom"/>
-    <doMavenDeploy artifactId="juli-adapters" groupId="org.apache.tomcat.extras"
+    <doMavenDeploy artifactId="tomcat-extras-juli"
+        groupId="org.apache.tomcat.extras"
+    	file="${tomcat.extras.path}/tomcat-juli.jar" />
+    <doMavenDeploy artifactId="tomcat-extras-juli-adapters"
+    	groupId="org.apache.tomcat.extras"
         file="${tomcat.extras.path}/tomcat-juli-adapters.jar" />
-    <doMavenDeploy artifactId="catalina-jmx-remote"
+    <doMavenDeploy artifactId="tomcat-catalina-jmx-remote"
     	groupId="org.apache.tomcat.extras"
         file="${tomcat.extras.path}/catalina-jmx-remote.jar" />
-    <doMavenDeploy artifactId="catalina-ws" groupId="org.apache.tomcat.extras"
+    <doMavenDeploy artifactId="tomcat-catalina-ws"
+    	groupId="org.apache.tomcat.extras"
         file="${tomcat.extras.path}/catalina-ws.jar" />
-  	
+    <!-- TODO source JARs -->
+
   	<!-- Emedded jars -->
   	<!-- Skip DBCP & Jasper-JDT - optional and can use standard ones above -->
-    <doMavenDeploy artifactId="core" groupId="org.apache.tomcat.embed"
+    <doMavenDeploy artifactId="tomcat-embed-core"
+        groupId="org.apache.tomcat.embed"
         file="${tomcat.embed.path}/tomcat-embed-core.jar"
-    	pom="embed-core.pom"
+    	pom="tomcat-embed-core.pom"
         src="${tomcat.embed.path}/tomcat-embed-core-src.jar"/>
-    <doMavenDeploy artifactId="jasper" groupId="org.apache.tomcat.embed"
-        file="${tomcat.embed.path}/tomcat-embed-japser.jar"
-    	pom="embed-jasper.pom"
+    <doMavenDeploy artifactId="tomcat-embed-jasper"
+        groupId="org.apache.tomcat.embed"
+        file="${tomcat.embed.path}/tomcat-embed-jasper.jar"
+    	pom="tomcat-embed-jasper.pom"
         src="${tomcat.embed.path}/tomcat-embed-jasper-src.jar"/>
-    <doMavenDeploy artifactId="logging-juli" groupId="org.apache.tomcat.embed"
+    <doMavenDeploy artifactId="tomcat-embed-logging-juli"
+        groupId="org.apache.tomcat.embed"
         file="${tomcat.embed.path}/tomcat-embed-logging-juli.jar"
-        pom="embed-logging-juli.pom"
+        pom="tomcat-embed-logging-juli.pom"
         src="${tomcat.embed.path}/tomcat-embed-logging-juli-src.jar"/>
-    <doMavenDeploy artifactId="logging-log4j" groupId="org.apache.tomcat.embed"
-        file="${tomcat.embed.path}/tomcat-embed-logging-juli.jar"
-        pom="embed-logging-log4j.pom"
-        src="${tomcat.embed.path}/tomcat-embed-logging-log4j-src.jar"/>
+    <doMavenDeploy artifactId="tomcat-embed-logging-log4j"
+        groupId="org.apache.tomcat.embed"
+        file="${tomcat.embed.path}/tomcat-embed-logging-log4j.jar"
+        pom="tomcat-embed-logging-log4j.pom" />
+    <!-- TODO source JAR -->
   	
   </target>
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 612a1904d..b61887a4d 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -26,14 +26,6 @@ maven.scp.passphrase=
 maven.gpg.exec=C:/software/GNU/GnuPG/gpg.exe
 maven.gpg.passphrase=*****
 
-
-# You'll also need to install jsch 0.1.42 and manually configure
-# wagon-ssh 1.0-beta-2 to use the updated jsch
-# You'll also need jzlib 1.0.7
-maven.home=/development/maven-2.0.4
-#Define mvn for Unix systems and mvn.bat for Windows as ANT exec requires the full name
-maven.bin=mvn.bat
-
 #Maven snapshot properties
 maven.snapshot.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
 maven.snapshot.repo.repositoryId=apache.snapshots
diff --git a/res/maven/annotations-api.pom b/res/maven/tomcat-annotations-api.pom
similarity index 94%
rename from res/maven/annotations-api.pom
rename to res/maven/tomcat-annotations-api.pom
index 74b33ac15..219b21cad 100644
--- a/res/maven/annotations-api.pom
+++ b/res/maven/tomcat-annotations-api.pom
@@ -18,7 +18,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>annotations-api</artifactId>
+  <artifactId>tomcat-annotations-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Annotations Package</description>
 </project>
\ No newline at end of file
diff --git a/res/maven/catalina-ant.pom b/res/maven/tomcat-catalina-ant.pom
similarity index 87%
rename from res/maven/catalina-ant.pom
rename to res/maven/tomcat-catalina-ant.pom
index 4b2c661bf..5b7ff7c51 100644
--- a/res/maven/catalina-ant.pom
+++ b/res/maven/tomcat-catalina-ant.pom
@@ -18,31 +18,31 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>catalina-ant</artifactId>
+  <artifactId>tomcat-catalina-ant</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Ant tasks for remote management</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>coyote</artifactId>
+      <artifactId>tomcat-coyote</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>tomcat-servlet-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>juli</artifactId>
+      <artifactId>tomcat-juli</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>catalina</artifactId>
+      <artifactId>tomcat-catalina</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
diff --git a/res/maven/catalina-ha.pom b/res/maven/tomcat-catalina-ha.pom
similarity index 86%
rename from res/maven/catalina-ha.pom
rename to res/maven/tomcat-catalina-ha.pom
index d580f9de1..a6b6dca66 100644
--- a/res/maven/catalina-ha.pom
+++ b/res/maven/tomcat-catalina-ha.pom
@@ -18,37 +18,37 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>catalina-ha</artifactId>
+  <artifactId>tomcat-catalina-ha</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat High Availability Implementation</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>coyote</artifactId>
+      <artifactId>tomcat-coyote</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>tomcat-servlet-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>juli</artifactId>
+      <artifactId>tomcat-juli</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>tribes</artifactId>
+      <artifactId>tomcat-tribes</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>catalina</artifactId>
+      <artifactId>tomcat-catalina</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
diff --git a/res/maven/catalina-jmx-remote.pom b/res/maven/tomcat-catalina-jmx-remote.pom
similarity index 92%
rename from res/maven/catalina-jmx-remote.pom
rename to res/maven/tomcat-catalina-jmx-remote.pom
index 7f9ac44e6..3d8570405 100644
--- a/res/maven/catalina-jmx-remote.pom
+++ b/res/maven/tomcat-catalina-jmx-remote.pom
@@ -18,13 +18,13 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>catalina-jmx-remote</artifactId>
+  <artifactId>tomcat-catalina-jmx-remote</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Remote JMX listener</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>catalina</artifactId>
+      <artifactId>tomcat-catalina</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
diff --git a/res/maven/catalina-ws.pom b/res/maven/tomcat-catalina-ws.pom
similarity index 92%
rename from res/maven/catalina-ws.pom
rename to res/maven/tomcat-catalina-ws.pom
index 954d8eab7..0a5f458e4 100644
--- a/res/maven/catalina-ws.pom
+++ b/res/maven/tomcat-catalina-ws.pom
@@ -18,13 +18,13 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>catalina-ws</artifactId>
+  <artifactId>tomcat-catalina-ws</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Remote JMX listener</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>catalina</artifactId>
+      <artifactId>tomcat-catalina</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
diff --git a/res/maven/catalina.pom b/res/maven/tomcat-catalina.pom
similarity index 82%
rename from res/maven/catalina.pom
rename to res/maven/tomcat-catalina.pom
index 0bb7361dd..aec744755 100644
--- a/res/maven/catalina.pom
+++ b/res/maven/tomcat-catalina.pom
@@ -18,33 +18,25 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>catalina</artifactId>
+  <artifactId>tomcat-catalina</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Servlet Engine Core Classes and Standard implementations</description>
   <dependencies>
-    <!--
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>coyote</artifactId>
+      <artifactId>tomcat-servlet-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
-    -->
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>tomcat-juli</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>juli</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>annotations-api</artifactId>
+      <artifactId>tomcat-annotations-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
diff --git a/res/maven/coyote.pom b/res/maven/tomcat-coyote.pom
similarity index 89%
rename from res/maven/coyote.pom
rename to res/maven/tomcat-coyote.pom
index f92498a32..479b2fd56 100644
--- a/res/maven/coyote.pom
+++ b/res/maven/tomcat-coyote.pom
@@ -18,25 +18,25 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>coyote</artifactId>
+  <artifactId>tomcat-coyote</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Connectors and HTTP parser</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>catalina</artifactId>
+      <artifactId>tomcat-catalina</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>tomcat-servlet-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>juli</artifactId>
+      <artifactId>tomcat-juli</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
diff --git a/res/maven/dbcp.pom b/res/maven/tomcat-dbcp.pom
similarity index 96%
rename from res/maven/dbcp.pom
rename to res/maven/tomcat-dbcp.pom
index 287c8ec38..70c9f7f41 100644
--- a/res/maven/dbcp.pom
+++ b/res/maven/tomcat-dbcp.pom
@@ -18,7 +18,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>dbcp</artifactId>
+  <artifactId>tomcat-dbcp</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Database Connection Pooling package</description>
 </project>
diff --git a/res/maven/el-api.pom b/res/maven/tomcat-el-api.pom
similarity index 96%
rename from res/maven/el-api.pom
rename to res/maven/tomcat-el-api.pom
index d8ab540e0..884ce0779 100644
--- a/res/maven/el-api.pom
+++ b/res/maven/tomcat-el-api.pom
@@ -18,7 +18,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>el-api</artifactId>
+  <artifactId>tomcat-el-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Expression language package</description>
 </project>
diff --git a/res/maven/embed-core.pom b/res/maven/tomcat-embed-core.pom
similarity index 90%
rename from res/maven/embed-core.pom
rename to res/maven/tomcat-embed-core.pom
index 8e996b777..f66abc4a6 100644
--- a/res/maven/embed-core.pom
+++ b/res/maven/tomcat-embed-core.pom
@@ -18,20 +18,20 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat.embed</groupId>
-  <artifactId>core</artifactId>
+  <artifactId>tomcat-embed-core</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Core Tomcat implementation</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>logging-juli</artifactId>
+      <artifactId>tomcat-emmed-logging-juli</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>logging-log4j</artifactId>
+      <artifactId>tomcat-embed-logging-log4j</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
       <optional>true</optional>
diff --git a/res/maven/embed-jasper.pom b/res/maven/tomcat-embed-jasper.pom
similarity index 92%
rename from res/maven/embed-jasper.pom
rename to res/maven/tomcat-embed-jasper.pom
index d130ced5e..e8b0107f3 100644
--- a/res/maven/embed-jasper.pom
+++ b/res/maven/tomcat-embed-jasper.pom
@@ -18,13 +18,13 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat.embed</groupId>
-  <artifactId>jasper</artifactId>
+  <artifactId>tomcat-embed-jasper</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Core Tomcat implementation</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>core</artifactId>
+      <artifactId>tomcat-embed-core</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
diff --git a/res/maven/embed-logging-juli.pom b/res/maven/tomcat-embed-logging-juli.pom
similarity index 95%
rename from res/maven/embed-logging-juli.pom
rename to res/maven/tomcat-embed-logging-juli.pom
index 8942565b5..9855b4811 100644
--- a/res/maven/embed-logging-juli.pom
+++ b/res/maven/tomcat-embed-logging-juli.pom
@@ -18,7 +18,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat.embed</groupId>
-  <artifactId>logging-juli</artifactId>
+  <artifactId>tomcta-embed-logging-juli</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>JULI logging implementation for embedded Tomcat</description>
 </project>
diff --git a/res/maven/embed-logging-log4j.pom b/res/maven/tomcat-embed-logging-log4j.pom
similarity index 95%
rename from res/maven/embed-logging-log4j.pom
rename to res/maven/tomcat-embed-logging-log4j.pom
index 341b7f268..c77633573 100644
--- a/res/maven/embed-logging-log4j.pom
+++ b/res/maven/tomcat-embed-logging-log4j.pom
@@ -18,7 +18,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat.embed</groupId>
-  <artifactId>logging-log4j</artifactId>
+  <artifactId>tomcta-embed-logging-log4j</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>log4j logging implementation for embedded Tomcat</description>
 </project>
diff --git a/res/maven/juli-adapters.pom b/res/maven/tomcat-extras-juli-adapters.pom
similarity index 90%
rename from res/maven/juli-adapters.pom
rename to res/maven/tomcat-extras-juli-adapters.pom
index 97ce9b999..3f910b521 100644
--- a/res/maven/juli-adapters.pom
+++ b/res/maven/tomcat-extras-juli-adapters.pom
@@ -18,19 +18,19 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat.extras</groupId>
-  <artifactId>juli-adapters</artifactId>
+  <artifactId>tomcat-extras-juli-adapters</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Adapters to plug in other logging frameworks in Tomcat</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat.extras</groupId>
-      <artifactId>juli</artifactId>
+      <artifactId>tomcat-extras-juli</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>tomcat-servlet-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
       <optional>true</optional>
diff --git a/res/maven/juli-extras.pom b/res/maven/tomcat-extras-juli.pom
similarity index 95%
rename from res/maven/juli-extras.pom
rename to res/maven/tomcat-extras-juli.pom
index 7753bc567..2857ae24e 100644
--- a/res/maven/juli-extras.pom
+++ b/res/maven/tomcat-extras-juli.pom
@@ -18,7 +18,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat.extras</groupId>
-  <artifactId>juli</artifactId>
+  <artifactId>tomcat-extras-juli</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Replacement for Tomcat Core Logging Package</description>
 </project>
diff --git a/res/maven/jasper-el.pom b/res/maven/tomcat-jasper-el.pom
similarity index 93%
rename from res/maven/jasper-el.pom
rename to res/maven/tomcat-jasper-el.pom
index 6301df9df..717e9314c 100644
--- a/res/maven/jasper-el.pom
+++ b/res/maven/tomcat-jasper-el.pom
@@ -18,13 +18,13 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>jasper-el</artifactId>
+  <artifactId>tomcat-jasper-el</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Jasper Expression Language Impl</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>el-api</artifactId>
+      <artifactId>tomcat-el-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
diff --git a/res/maven/jasper-jdt.pom b/res/maven/tomcat-jasper-jdt.pom
similarity index 95%
rename from res/maven/jasper-jdt.pom
rename to res/maven/tomcat-jasper-jdt.pom
index b867112da..652724b04 100644
--- a/res/maven/jasper-jdt.pom
+++ b/res/maven/tomcat-jasper-jdt.pom
@@ -18,7 +18,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>jasper-jdt</artifactId>
+  <artifactId>tomcat-jasper-jdt</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Jasper javac compiler extension for Eclipse JDT</description>
 </project> 
diff --git a/res/maven/jasper.pom b/res/maven/tomcat-jasper.pom
similarity index 86%
rename from res/maven/jasper.pom
rename to res/maven/tomcat-jasper.pom
index a25081d79..09e4e42ca 100644
--- a/res/maven/jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -18,49 +18,49 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>jasper</artifactId>
+  <artifactId>tomcat-jasper</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcats JSP Parser</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>tomcat-servlet-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>juli</artifactId>
+      <artifactId>tomcat-juli</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>jsp-api</artifactId>
+      <artifactId>tomcat-jsp-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>catalina</artifactId>
+      <artifactId>tomcat-catalina</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>el-api</artifactId>
+      <artifactId>tomcat-el-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>jasper-jdt</artifactId>
+      <artifactId>tomcat-jasper-jdt</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>jasper-el</artifactId>
+      <artifactId>tomcat-jasper-el</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
diff --git a/res/maven/jsp-api.pom b/res/maven/tomcat-jsp-api.pom
similarity index 90%
rename from res/maven/jsp-api.pom
rename to res/maven/tomcat-jsp-api.pom
index c8cfdd762..0165d6430 100644
--- a/res/maven/jsp-api.pom
+++ b/res/maven/tomcat-jsp-api.pom
@@ -18,19 +18,19 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>jsp-api</artifactId>
+  <artifactId>tomcat-jsp-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>JSP package</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>el-api</artifactId>
+      <artifactId>tomcat-el-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>tomcat-servlet-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
diff --git a/res/maven/juli.pom b/res/maven/tomcat-juli.pom
similarity index 96%
rename from res/maven/juli.pom
rename to res/maven/tomcat-juli.pom
index ef197fbe1..6abc914e0 100644
--- a/res/maven/juli.pom
+++ b/res/maven/tomcat-juli.pom
@@ -18,7 +18,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>juli</artifactId>
+  <artifactId>tomcat-juli</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Core Logging Package</description>
 </project>
diff --git a/res/maven/servlet-api.pom b/res/maven/tomcat-servlet-api.pom
similarity index 95%
rename from res/maven/servlet-api.pom
rename to res/maven/tomcat-servlet-api.pom
index 5ac319339..efc6183a4 100644
--- a/res/maven/servlet-api.pom
+++ b/res/maven/tomcat-servlet-api.pom
@@ -18,7 +18,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>servlet-api</artifactId>
+  <artifactId>tomcat-servlet-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>javax.servlet package</description>
 </project>
diff --git a/res/maven/tribes.pom b/res/maven/tomcat-tribes.pom
similarity index 93%
rename from res/maven/tribes.pom
rename to res/maven/tomcat-tribes.pom
index b23c2d87e..61ece3404 100644
--- a/res/maven/tribes.pom
+++ b/res/maven/tomcat-tribes.pom
@@ -18,13 +18,13 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
-  <artifactId>tribes</artifactId>
+  <artifactId>tomcat-tribes</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Group Communication Package</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>juli</artifactId>
+      <artifactId>tomcat-juli</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
-- 
2.11.0