svn commit: r1212689 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/pom.xml tomcat7-maven-plugin/pom.xml

[olamy]

Author: olamy
Date: Fri Dec  9 23:33:43 2011
New Revision: 1212689

URL: http://svn.apache.org/viewvc?rev=1212689&view=rev
Log:
remove redundant property to declare tomcat7 version use

Modified:
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
    tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml

Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1212689&r1=1212688&r2=1212689&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Fri Dec  9 
23:33:43 2011
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-catalina</artifactId>
-      <version>7.0.22</version>
+      <version>${tomcat7Version}</version>
       <scope>provided</scope>
     </dependency>
 

Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1212689&r1=1212688&r2=1212689&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Fri Dec  9 23:33:43 
2011
@@ -33,7 +33,6 @@
   </description>
 
   <properties>
-    <tomcat.version>7.0.22</tomcat.version>
     <managerWebAppPath>${basedir}/target/</managerWebAppPath>
     
<warTestPath>${basedir}/src/test/simple-war-project-1.0-SNAPSHOT.war</warTestPath>
     <keystoreTestPath>${basedir}/src/test/keystore</keystoreTestPath>
@@ -43,88 +42,88 @@
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-util</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-coyote</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-api</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-jdbc</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-dbcp</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-servlet-api</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-jsp-api</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-jasper</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-jasper-el</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-el-api</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-catalina</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-tribes</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-catalina-ha</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-annotations-api</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <!-- tomcat i18n too ?? -->
@@ -133,18 +132,18 @@
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-juli</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-logging-juli</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-logging-log4j</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat7Version}</version>
     </dependency>
 
     <dependency>



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