tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1171301 - in /tomcat/maven-plugin/trunk: pom.xml tomcat-maven-plugin-it/pom.xml tomcat6-maven-plugin/pom.xml
Date Thu, 15 Sep 2011 22:30:11 GMT
Author: olamy
Date: Thu Sep 15 22:30:10 2011
New Revision: 1171301

URL: http://svn.apache.org/viewvc?rev=1171301&view=rev
Log:
move tomcat6 dependencies to the tomcat6 plugin and fix it tests run too

Modified:
    tomcat/maven-plugin/trunk/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1171301&r1=1171300&r2=1171301&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Thu Sep 15 22:30:10 2011
@@ -39,7 +39,6 @@
   </description>
   
   <properties>
-    <tomcat.version>6.0.32</tomcat.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.5</maven.compiler.source>
     <maven.compiler.target>1.5</maven.compiler.target>
@@ -159,73 +158,6 @@
         <version>2.2.2</version>
       </dependency>
 
-      <!-- tomcat dependencies -->
-
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>catalina</artifactId>
-        <version>${tomcat.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>catalina-ha</artifactId>
-        <version>${tomcat.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>tribes</artifactId>
-        <version>${tomcat.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>el-api</artifactId>
-        <version>${tomcat.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.jdt.core.compiler</groupId>
-        <artifactId>ecj</artifactId>
-        <version>3.5.1</version>
-      </dependency>      
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>jasper</artifactId>
-        <version>${tomcat.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>jasper-el</artifactId>
-        <version>${tomcat.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>jsp-api</artifactId>
-        <version>${tomcat.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>${tomcat.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>coyote</artifactId>
-        <version>${tomcat.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>dbcp</artifactId>
-        <version>${tomcat.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-
       <!-- Test Dependencies -->
 
       <dependency>

Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml?rev=1171301&r1=1171300&r2=1171301&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml Thu Sep 15 22:30:10 2011
@@ -115,7 +115,7 @@
     <!-- No real dependency - just to ensure the correct build order by dependency resolution
-->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tomcat-maven-plugin</artifactId>
+      <artifactId>tomcat6-maven-plugin</artifactId>
       <version>${project.version}</version>
       <type>maven-plugin</type>
       <scope>test</scope>

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1171301&r1=1171300&r2=1171301&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Thu Sep 15 22:30:10 2011
@@ -33,6 +33,9 @@
   <description>The Tomcat Maven Plugin provides goals to manipulate WAR projects within
the Tomcat 6.x servlet container.
   </description>
 
+  <properties>
+    <tomcat.version>6.0.32</tomcat.version>
+  </properties>
   <prerequisites>
     <maven>${mavenVersion}</maven>
   </prerequisites>
@@ -77,58 +80,68 @@
     </dependency>
 
     <!-- tomcat dependencies -->
-
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>catalina</artifactId>
+      <version>${tomcat.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>catalina-ha</artifactId>
+      <version>${tomcat.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tribes</artifactId>
+      <version>${tomcat.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>el-api</artifactId>
+      <version>${tomcat.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jdt.core.compiler</groupId>
+      <artifactId>ecj</artifactId>
+      <version>3.5.1</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>jasper</artifactId>
+      <version>${tomcat.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jdt.core.compiler</groupId>
-      <artifactId>ecj</artifactId>
-    </dependency>    
-    <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>jasper-el</artifactId>
+      <version>${tomcat.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>jsp-api</artifactId>
+      <version>${tomcat.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>servlet-api</artifactId>
+      <version>${tomcat.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>coyote</artifactId>
+      <version>${tomcat.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>dbcp</artifactId>
+      <version>${tomcat.version}</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message