Author: jgallimore
Date: Tue Feb 15 21:47:48 2011
New Revision: 1071082
URL: http://svn.apache.org/viewvc?rev=1071082&view=rev
Log:
Upgrade bundles to Tomcat 6.0.32 and 7.0.8
Modified:
openejb/trunk/openejb3/assembly/itest-runner/src/test/groovy/commands/SetupCommand.groovy
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
Modified:
openejb/trunk/openejb3/assembly/itest-runner/src/test/groovy/commands/SetupCommand.groovy
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/itest-runner/src/test/groovy/commands/SetupCommand.groovy?rev=1071082&r1=1071081&r2=1071082&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/itest-runner/src/test/groovy/commands/SetupCommand.groovy
(original)
+++
openejb/trunk/openejb3/assembly/itest-runner/src/test/groovy/commands/SetupCommand.groovy
Tue Feb 15 21:47:48 2011
@@ -86,8 +86,8 @@ class SetupCommand {
}
def execute() {
- execute("6.0.29")
- execute("7.0.6")
+ execute("6.0.32")
+ execute("7.0.8")
}
def execute(tomcatVersion) {
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml?rev=1071082&r1=1071081&r2=1071082&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
Tue Feb 15 21:47:48 2011
@@ -125,7 +125,7 @@
<properties>
<localRepository>${settings.localRepository}</localRepository>
<examples.version>1.1-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/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml?rev=1071082&r1=1071081&r2=1071082&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml
Tue Feb 15 21:47:48 2011
@@ -28,8 +28,8 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>${basedir}/target/apache-tomcat-6.0.29</directory>
- <outputDirectory>/apache-tomee-tomcat-6.0.29</outputDirectory>
+ <directory>${basedir}/target/apache-tomcat-6.0.32</directory>
+ <outputDirectory>/apache-tomee-tomcat-6.0.32</outputDirectory>
<includes>
<include>**/*</include>
</includes>
@@ -38,8 +38,8 @@
</excludes>
</fileSet>
<fileSet>
- <directory>${basedir}/target/apache-tomcat-6.0.29</directory>
- <outputDirectory>/apache-tomee-tomcat-6.0.29</outputDirectory>
+ <directory>${basedir}/target/apache-tomcat-6.0.32</directory>
+ <outputDirectory>/apache-tomee-tomcat-6.0.32</outputDirectory>
<includes>
<include>**/bin/**/*</include>
</includes>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml?rev=1071082&r1=1071081&r2=1071082&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
Tue Feb 15 21:47:48 2011
@@ -125,7 +125,7 @@
<properties>
<localRepository>${settings.localRepository}</localRepository>
<examples.version>1.1-SNAPSHOT</examples.version>
- <tomcat.version>7.0.6</tomcat.version>
+ <tomcat.version>7.0.8</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/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=1071082&r1=1071081&r2=1071082&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
Tue Feb 15 21:47:48 2011
@@ -28,8 +28,8 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>${basedir}/target/apache-tomcat-7.0.6</directory>
- <outputDirectory>/apache-tomee-tomcat-7.0.6</outputDirectory>
+ <directory>${basedir}/target/apache-tomcat-7.0.8</directory>
+ <outputDirectory>/apache-tomee-tomcat-7.0.8</outputDirectory>
<includes>
<include>**/*</include>
</includes>
@@ -38,8 +38,8 @@
</excludes>
</fileSet>
<fileSet>
- <directory>${basedir}/target/apache-tomcat-7.0.6</directory>
- <outputDirectory>/apache-tomee-tomcat-7.0.6</outputDirectory>
+ <directory>${basedir}/target/apache-tomcat-7.0.8</directory>
+ <outputDirectory>/apache-tomee-tomcat-7.0.8</outputDirectory>
<includes>
<include>**/bin/**/*</include>
</includes>
