Author: jlmonteiro
Date: Wed Jun 29 13:09:32 2011
New Revision: 1141088
URL: http://svn.apache.org/viewvc?rev=1141088&view=rev
Log:
There are a lot of properties to define Tomcat version. Just reduce the scope
as much as possible (assembly for the moment) and reuse that property in TomEE
bundle. It should be enhanced.
Modified:
openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
openejb/branches/openejb-3.2.x/assembly/pom.xml
openejb/branches/openejb-3.2.x/pom.xml
Modified:
openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml?rev=1141088&r1=1141087&r2=1141088&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
(original)
+++
openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
Wed Jun 29 13:09:32 2011
@@ -131,7 +131,7 @@
<properties>
<localRepository>${settings.localRepository}</localRepository>
<examples.version>1.0-SNAPSHOT</examples.version>
- <tomcat.version>6.0.32</tomcat.version>
+ <tomcat.version>${tomcatVersion}</tomcat.version>
<http.proxy.host>${settings.activeProxy.host}</http.proxy.host>
<http.proxy.port>${settings.activeProxy.port}</http.proxy.port>
<http.proxy.username>${settings.activeProxy.username}</http.proxy.username>
Modified: openejb/branches/openejb-3.2.x/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/assembly/pom.xml?rev=1141088&r1=1141087&r2=1141088&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/assembly/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/assembly/pom.xml Wed Jun 29 13:09:32 2011
@@ -29,6 +29,10 @@
<packaging>pom</packaging>
<name>OpenEJB :: Assembly</name>
+ <properties>
+ <tomcatVersion>6.0.32</tomcatVersion>
+ </properties>
+
<modules>
<module>openejb-webapp-common</module>
<module>openejb-itests-standalone-client</module>
Modified: openejb/branches/openejb-3.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/pom.xml?rev=1141088&r1=1141087&r2=1141088&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/pom.xml Wed Jun 29 13:09:32 2011
@@ -107,9 +107,6 @@
<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>6.0.29</tomcatVersion>
-
<!--
-
http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
-->
