You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2009/09/16 22:23:46 UTC
svn commit: r815952 - /tomcat/trunk/res/maven/
Author: markt
Date: Wed Sep 16 20:23:44 2009
New Revision: 815952
URL: http://svn.apache.org/viewvc?rev=815952&view=rev
Log:
Update to Maven deploy process. A SNAPHOT deployment of trunk should now work and include extras and embedded.
Added:
tomcat/trunk/res/maven/TODO-currently-empty-src.jar (with props)
tomcat/trunk/res/maven/tomcat-annotations-api.pom
- copied, changed from r815424, tomcat/trunk/res/maven/annotations-api.pom
tomcat/trunk/res/maven/tomcat-catalina-ant.pom
- copied, changed from r815847, tomcat/trunk/res/maven/catalina-ant.pom
tomcat/trunk/res/maven/tomcat-catalina-ha.pom
- copied, changed from r815424, tomcat/trunk/res/maven/catalina-ha.pom
tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom
- copied, changed from r815847, tomcat/trunk/res/maven/catalina-jmx-remote.pom
tomcat/trunk/res/maven/tomcat-catalina-ws.pom
- copied, changed from r815847, tomcat/trunk/res/maven/catalina-ws.pom
tomcat/trunk/res/maven/tomcat-catalina.pom
- copied, changed from r815424, tomcat/trunk/res/maven/catalina.pom
tomcat/trunk/res/maven/tomcat-coyote.pom
- copied, changed from r815424, tomcat/trunk/res/maven/coyote.pom
tomcat/trunk/res/maven/tomcat-dbcp.pom
- copied, changed from r815424, tomcat/trunk/res/maven/dbcp.pom
tomcat/trunk/res/maven/tomcat-el-api.pom
- copied, changed from r815424, tomcat/trunk/res/maven/el-api.pom
tomcat/trunk/res/maven/tomcat-embed-core.pom
- copied, changed from r815847, tomcat/trunk/res/maven/embed-core.pom
tomcat/trunk/res/maven/tomcat-embed-jasper.pom
- copied, changed from r815847, tomcat/trunk/res/maven/embed-jasper.pom
tomcat/trunk/res/maven/tomcat-embed-logging-juli.pom
- copied, changed from r815847, tomcat/trunk/res/maven/embed-logging-juli.pom
tomcat/trunk/res/maven/tomcat-embed-logging-log4j.pom
- copied, changed from r815847, tomcat/trunk/res/maven/embed-logging-log4j.pom
tomcat/trunk/res/maven/tomcat-extras-juli-adapters.pom
- copied, changed from r815424, tomcat/trunk/res/maven/juli-adapters.pom
tomcat/trunk/res/maven/tomcat-extras-juli.pom
- copied, changed from r815424, tomcat/trunk/res/maven/juli-extras.pom
tomcat/trunk/res/maven/tomcat-jasper-el.pom
- copied, changed from r815424, tomcat/trunk/res/maven/jasper-el.pom
tomcat/trunk/res/maven/tomcat-jasper-jdt.pom
- copied, changed from r815424, tomcat/trunk/res/maven/jasper-jdt.pom
tomcat/trunk/res/maven/tomcat-jasper.pom
- copied, changed from r815424, tomcat/trunk/res/maven/jasper.pom
tomcat/trunk/res/maven/tomcat-jsp-api.pom
- copied, changed from r815424, tomcat/trunk/res/maven/jsp-api.pom
tomcat/trunk/res/maven/tomcat-juli.pom
- copied, changed from r815424, tomcat/trunk/res/maven/juli.pom
tomcat/trunk/res/maven/tomcat-servlet-api.pom
- copied, changed from r815424, tomcat/trunk/res/maven/servlet-api.pom
tomcat/trunk/res/maven/tomcat-tribes.pom
- copied, changed from r815424, tomcat/trunk/res/maven/tribes.pom
Removed:
tomcat/trunk/res/maven/annotations-api.pom
tomcat/trunk/res/maven/catalina-ant.pom
tomcat/trunk/res/maven/catalina-ha.pom
tomcat/trunk/res/maven/catalina-jmx-remote.pom
tomcat/trunk/res/maven/catalina-ws.pom
tomcat/trunk/res/maven/catalina.pom
tomcat/trunk/res/maven/coyote.pom
tomcat/trunk/res/maven/dbcp.pom
tomcat/trunk/res/maven/el-api.pom
tomcat/trunk/res/maven/embed-core.pom
tomcat/trunk/res/maven/embed-jasper.pom
tomcat/trunk/res/maven/embed-logging-juli.pom
tomcat/trunk/res/maven/embed-logging-log4j.pom
tomcat/trunk/res/maven/jasper-el.pom
tomcat/trunk/res/maven/jasper-jdt.pom
tomcat/trunk/res/maven/jasper.pom
tomcat/trunk/res/maven/jsp-api.pom
tomcat/trunk/res/maven/juli-adapters.pom
tomcat/trunk/res/maven/juli-extras.pom
tomcat/trunk/res/maven/juli.pom
tomcat/trunk/res/maven/servlet-api.pom
tomcat/trunk/res/maven/tribes.pom
Modified:
tomcat/trunk/res/maven/ (props changed)
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/res/maven/mvn.properties.default
Propchange: tomcat/trunk/res/maven/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 16 20:23:44 2009
@@ -1,4 +1,4 @@
*.tmp
-maven-ant-tasks-attached-patch.jar
-maven-artifact-ant-2.0.4-dep.jar
+maven-ant-tasks-2.0.10.jar
mvn.properties
+*.asc
Added: tomcat/trunk/res/maven/TODO-currently-empty-src.jar
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/TODO-currently-empty-src.jar?rev=815952&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/trunk/res/maven/TODO-currently-empty-src.jar
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision
Propchange: tomcat/trunk/res/maven/TODO-currently-empty-src.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=815952&r1=815951&r2=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Wed Sep 16 20:23:44 2009
@@ -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>
Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=815952&r1=815951&r2=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Wed Sep 16 20:23:44 2009
@@ -26,14 +26,6 @@
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
Copied: tomcat/trunk/res/maven/tomcat-annotations-api.pom (from r815424, tomcat/trunk/res/maven/annotations-api.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-annotations-api.pom?p2=tomcat/trunk/res/maven/tomcat-annotations-api.pom&p1=tomcat/trunk/res/maven/annotations-api.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/annotations-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-annotations-api.pom Wed Sep 16 20:23:44 2009
@@ -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
Copied: tomcat/trunk/res/maven/tomcat-catalina-ant.pom (from r815847, tomcat/trunk/res/maven/catalina-ant.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ant.pom?p2=tomcat/trunk/res/maven/tomcat-catalina-ant.pom&p1=tomcat/trunk/res/maven/catalina-ant.pom&r1=815847&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/catalina-ant.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-ant.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-catalina-ha.pom (from r815424, tomcat/trunk/res/maven/catalina-ha.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ha.pom?p2=tomcat/trunk/res/maven/tomcat-catalina-ha.pom&p1=tomcat/trunk/res/maven/catalina-ha.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/catalina-ha.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-ha.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom (from r815847, tomcat/trunk/res/maven/catalina-jmx-remote.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom?p2=tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom&p1=tomcat/trunk/res/maven/catalina-jmx-remote.pom&r1=815847&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/catalina-jmx-remote.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-catalina-ws.pom (from r815847, tomcat/trunk/res/maven/catalina-ws.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ws.pom?p2=tomcat/trunk/res/maven/tomcat-catalina-ws.pom&p1=tomcat/trunk/res/maven/catalina-ws.pom&r1=815847&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/catalina-ws.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-ws.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-catalina.pom (from r815424, tomcat/trunk/res/maven/catalina.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina.pom?p2=tomcat/trunk/res/maven/tomcat-catalina.pom&p1=tomcat/trunk/res/maven/catalina.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/catalina.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-coyote.pom (from r815424, tomcat/trunk/res/maven/coyote.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-coyote.pom?p2=tomcat/trunk/res/maven/tomcat-coyote.pom&p1=tomcat/trunk/res/maven/coyote.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/coyote.pom (original)
+++ tomcat/trunk/res/maven/tomcat-coyote.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-dbcp.pom (from r815424, tomcat/trunk/res/maven/dbcp.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-dbcp.pom?p2=tomcat/trunk/res/maven/tomcat-dbcp.pom&p1=tomcat/trunk/res/maven/dbcp.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/dbcp.pom (original)
+++ tomcat/trunk/res/maven/tomcat-dbcp.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-el-api.pom (from r815424, tomcat/trunk/res/maven/el-api.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-el-api.pom?p2=tomcat/trunk/res/maven/tomcat-el-api.pom&p1=tomcat/trunk/res/maven/el-api.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/el-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-el-api.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-embed-core.pom (from r815847, tomcat/trunk/res/maven/embed-core.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-core.pom?p2=tomcat/trunk/res/maven/tomcat-embed-core.pom&p1=tomcat/trunk/res/maven/embed-core.pom&r1=815847&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/embed-core.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-core.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-embed-jasper.pom (from r815847, tomcat/trunk/res/maven/embed-jasper.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-jasper.pom?p2=tomcat/trunk/res/maven/tomcat-embed-jasper.pom&p1=tomcat/trunk/res/maven/embed-jasper.pom&r1=815847&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/embed-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-embed-logging-juli.pom (from r815847, tomcat/trunk/res/maven/embed-logging-juli.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-logging-juli.pom?p2=tomcat/trunk/res/maven/tomcat-embed-logging-juli.pom&p1=tomcat/trunk/res/maven/embed-logging-juli.pom&r1=815847&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/embed-logging-juli.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-logging-juli.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-embed-logging-log4j.pom (from r815847, tomcat/trunk/res/maven/embed-logging-log4j.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-logging-log4j.pom?p2=tomcat/trunk/res/maven/tomcat-embed-logging-log4j.pom&p1=tomcat/trunk/res/maven/embed-logging-log4j.pom&r1=815847&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/embed-logging-log4j.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-logging-log4j.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-extras-juli-adapters.pom (from r815424, tomcat/trunk/res/maven/juli-adapters.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-extras-juli-adapters.pom?p2=tomcat/trunk/res/maven/tomcat-extras-juli-adapters.pom&p1=tomcat/trunk/res/maven/juli-adapters.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/juli-adapters.pom (original)
+++ tomcat/trunk/res/maven/tomcat-extras-juli-adapters.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-extras-juli.pom (from r815424, tomcat/trunk/res/maven/juli-extras.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-extras-juli.pom?p2=tomcat/trunk/res/maven/tomcat-extras-juli.pom&p1=tomcat/trunk/res/maven/juli-extras.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/juli-extras.pom (original)
+++ tomcat/trunk/res/maven/tomcat-extras-juli.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-jasper-el.pom (from r815424, tomcat/trunk/res/maven/jasper-el.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper-el.pom?p2=tomcat/trunk/res/maven/tomcat-jasper-el.pom&p1=tomcat/trunk/res/maven/jasper-el.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/jasper-el.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper-el.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-jasper-jdt.pom (from r815424, tomcat/trunk/res/maven/jasper-jdt.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper-jdt.pom?p2=tomcat/trunk/res/maven/tomcat-jasper-jdt.pom&p1=tomcat/trunk/res/maven/jasper-jdt.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/jasper-jdt.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper-jdt.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-jasper.pom (from r815424, tomcat/trunk/res/maven/jasper.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper.pom?p2=tomcat/trunk/res/maven/tomcat-jasper.pom&p1=tomcat/trunk/res/maven/jasper.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-jsp-api.pom (from r815424, tomcat/trunk/res/maven/jsp-api.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jsp-api.pom?p2=tomcat/trunk/res/maven/tomcat-jsp-api.pom&p1=tomcat/trunk/res/maven/jsp-api.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/jsp-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jsp-api.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-juli.pom (from r815424, tomcat/trunk/res/maven/juli.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-juli.pom?p2=tomcat/trunk/res/maven/tomcat-juli.pom&p1=tomcat/trunk/res/maven/juli.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/juli.pom (original)
+++ tomcat/trunk/res/maven/tomcat-juli.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-servlet-api.pom (from r815424, tomcat/trunk/res/maven/servlet-api.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-servlet-api.pom?p2=tomcat/trunk/res/maven/tomcat-servlet-api.pom&p1=tomcat/trunk/res/maven/servlet-api.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/servlet-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-servlet-api.pom Wed Sep 16 20:23:44 2009
@@ -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>
Copied: tomcat/trunk/res/maven/tomcat-tribes.pom (from r815424, tomcat/trunk/res/maven/tribes.pom)
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-tribes.pom?p2=tomcat/trunk/res/maven/tomcat-tribes.pom&p1=tomcat/trunk/res/maven/tribes.pom&r1=815424&r2=815952&rev=815952&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tribes.pom (original)
+++ tomcat/trunk/res/maven/tomcat-tribes.pom Wed Sep 16 20:23:44 2009
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org