Author: jlmonteiro
Date: Wed Jun 29 09:22:30 2011
New Revision: 1141020
URL: http://svn.apache.org/viewvc?rev=1141020&view=rev
Log:
Update Tomcat to the latest stable release and update and script to use the
maven properties instead of an hard coded one
Modified:
openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.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=1141020&r1=1141019&r2=1141020&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 09:22:30 2011
@@ -131,7 +131,7 @@
<properties>
<localRepository>${settings.localRepository}</localRepository>
<examples.version>1.0-SNAPSHOT</examples.version>
- <tomcat.version>6.0.29</tomcat.version>
+ <tomcat.version>6.0.32</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/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml?rev=1141020&r1=1141019&r2=1141020&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml
(original)
+++
openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml
Wed Jun 29 09:22:30 2011
@@ -28,7 +28,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>${basedir}/target/apache-tomcat-6.0.29</directory>
+
<directory>${basedir}/target/apache-tomcat-${tomcat.version}</directory>
<outputDirectory>/apache-tomee-${version}</outputDirectory>
<includes>
<include>**/*</include>
@@ -38,7 +38,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>${basedir}/target/apache-tomcat-6.0.29</directory>
+
<directory>${basedir}/target/apache-tomcat-${tomcat.version}</directory>
<outputDirectory>/apache-tomee-${version}</outputDirectory>
<includes>
<include>**/bin/**/*</include>
