Author: jlmonteiro
Date: Mon Jul 11 09:46:05 2011
New Revision: 1145097
URL: http://svn.apache.org/viewvc?rev=1145097&view=rev
Log:
Clean up tomcat versions spread over a lot of xml files
Modified:
openejb/trunk/openejb3/assembly/itest-runner/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/trunk/openejb3/pom.xml
Modified: openejb/trunk/openejb3/assembly/itest-runner/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/itest-runner/pom.xml?rev=1145097&r1=1145096&r2=1145097&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/itest-runner/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/itest-runner/pom.xml Mon Jul 11 09:46:05
2011
@@ -126,9 +126,8 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomcat.version>6.0.29</tomcat.version>
<localRepository>${settings.localRepository}</localRepository>
-
<openejb.home>${project.build.directory}/apache-tomcat-${tomcatVersion}</openejb.home>
+
<openejb.home>${project.build.directory}/apache-tomcat-${tomcat.version}</openejb.home>
<skipTests>${maven.test.skip}</skipTests>
</properties>
</project>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml?rev=1145097&r1=1145096&r2=1145097&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
Mon Jul 11 09:46:05 2011
@@ -28,8 +28,8 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>${basedir}/target/apache-tomcat-7.0.16</directory>
- <outputDirectory>/apache-tomee-${version}</outputDirectory>
+ <directory>${basedir}/target/apache-tomcat-${tomcat.version}</directory>
+ <outputDirectory>/apache-tomee-${project.version}</outputDirectory>
<includes>
<include>**/*</include>
</includes>
@@ -38,8 +38,8 @@
</excludes>
</fileSet>
<fileSet>
- <directory>${basedir}/target/apache-tomcat-7.0.16</directory>
- <outputDirectory>/apache-tomee-${version}</outputDirectory>
+ <directory>${basedir}/target/apache-tomcat-${tomcat.version}</directory>
+ <outputDirectory>/apache-tomee-${project.version}</outputDirectory>
<includes>
<include>**/bin/**/*</include>
</includes>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml?rev=1145097&r1=1145096&r2=1145097&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
Mon Jul 11 09:46:05 2011
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcatVersion}</version>
+ <version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml?rev=1145097&r1=1145096&r2=1145097&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
Mon Jul 11 09:46:05 2011
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcatVersion}</version>
+ <version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml?rev=1145097&r1=1145096&r2=1145097&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
Mon Jul 11 09:46:05 2011
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcatVersion}</version>
+ <version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1145097&r1=1145096&r2=1145097&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
Mon Jul 11 09:46:05 2011
@@ -223,7 +223,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcatVersion}</version>
+ <version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: openejb/trunk/openejb3/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=1145097&r1=1145096&r2=1145097&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Mon Jul 11 09:46:05 2011
@@ -116,10 +116,10 @@
<openejb.osgi.dynamic.import>${openejb.osgi.dynamic.import.pkg}</openejb.osgi.dynamic.import>
<openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name>
- <!-- Used in assembly/openejb-tomcat* projects -->
- <tomcatVersion>7.0.16</tomcatVersion>
+ <!-- Used mainly in assembly/openejb-tomcat* projects -->
+ <tomcat.version>7.0.16</tomcat.version>
- <!-- used by cxf -->
+ <!-- used mainly by jetty modules -->
<jetty.version>7.4.2.v20110526</jetty.version>
<!--
@@ -1035,7 +1035,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcatVersion}</version>
+ <version>${tomcat.version}</version>
<optional>true</optional>
<scope>provided</scope>
</dependency>
