You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/09/19 19:19:21 UTC
svn commit: r1172714 - in /openejb/trunk/openejb3: ./
assembly/itest-runner/src/test/groovy/commands/
assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/
assembly/openejb-tomcat/openejb-tomcat-webapp/
assembly/openejb-tomcat/tomee-embedded/ examples/...
Author: rmannibucau
Date: Mon Sep 19 17:19:20 2011
New Revision: 1172714
URL: http://svn.apache.org/viewvc?rev=1172714&view=rev
Log:
using tomcat 7.0.21 for TomEE
Modified:
openejb/trunk/openejb3/assembly/itest-runner/src/test/groovy/commands/SetupCommand.groovy
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/tomee-embedded/pom.xml
openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml
openejb/trunk/openejb3/examples/webapps/moviefun/app/pom.xml
openejb/trunk/openejb3/examples/webapps/rest-example/pom.xml
openejb/trunk/openejb3/pom.xml
openejb/trunk/openejb3/tck/cdi-tomee/pom.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=1172714&r1=1172713&r2=1172714&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 Mon Sep 19 17:19:20 2011
@@ -87,7 +87,7 @@ class SetupCommand {
def execute() {
execute("6.0.32")
- execute("7.0.16")
+ execute("7.0.21")
}
def execute(tomcatVersion) {
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=1172714&r1=1172713&r2=1172714&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 Mon Sep 19 17:19:20 2011
@@ -81,7 +81,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-tomcat</artifactId>
- <version>7.0.16</version>
+ <version>${tomcat.version}</version>
<type>zip</type>
<scope>compile</scope>
</dependency>
@@ -112,7 +112,7 @@
<artifactItem>
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomcat</artifactId>
- <version>7.0.16</version>
+ <version>${tomcat.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
@@ -181,7 +181,6 @@
<properties>
<localRepository>${settings.localRepository}</localRepository>
<examples.version>1.1-SNAPSHOT</examples.version>
- <tomcat.version>7.0.16</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-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1172714&r1=1172713&r2=1172714&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 Sep 19 17:19:20 2011
@@ -115,6 +115,10 @@
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion> <!-- 'provided' -->
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -216,6 +220,10 @@
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion> <!-- 'provided' -->
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -303,12 +311,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>${tomcat.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${myfaces.version}</version>
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/tomee-embedded/pom.xml?rev=1172714&r1=1172713&r2=1172714&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/tomee-embedded/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/tomee-embedded/pom.xml Mon Sep 19 17:19:20 2011
@@ -39,7 +39,6 @@
</plugins>
</build>
<properties>
- <version.org.apache.tomcat>7.0.16</version.org.apache.tomcat>
<version.cdi-api>1.0</version.cdi-api>
<version.arquillian>1.0.0.Alpha5</version.arquillian>
</properties>
@@ -96,19 +95,19 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${version.org.apache.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-coyote</artifactId>
- <version>${version.org.apache.tomcat}</version>
+ <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
- <version>${version.org.apache.tomcat}</version>
+ <version>${tomcat.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jdt.core.compiler</groupId>
Modified: openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml?rev=1172714&r1=1172713&r2=1172714&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml Mon Sep 19 17:19:20 2011
@@ -61,7 +61,7 @@
<configuration>
<tomcatHttpPort>9999</tomcatHttpPort>
<tomcatShutdownPort>9998</tomcatShutdownPort>
- <tomcatVersion>7.0.16</tomcatVersion>
+ <tomcatVersion>7.0.21</tomcatVersion>
<webapps>
<webappArtifact>
<groupId>org.apache.openejb</groupId>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/pom.xml?rev=1172714&r1=1172713&r2=1172714&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/pom.xml Mon Sep 19 17:19:20 2011
@@ -146,7 +146,7 @@
<configuration>
<tomcatHttpPort>9999</tomcatHttpPort>
<tomcatShutdownPort>9998</tomcatShutdownPort>
- <tomcatVersion>7.0.16</tomcatVersion>
+ <tomcatVersion>7.0.21</tomcatVersion>
<webapps>
<webappArtifact>
<groupId>org.apache.openejb</groupId>
Modified: openejb/trunk/openejb3/examples/webapps/rest-example/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/rest-example/pom.xml?rev=1172714&r1=1172713&r2=1172714&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/rest-example/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/rest-example/pom.xml Mon Sep 19 17:19:20 2011
@@ -99,7 +99,7 @@
<configuration>
<tomcatHttpPort>1234</tomcatHttpPort>
<tomcatShutdownPort>13245</tomcatShutdownPort>
- <tomcatVersion>7.0.16</tomcatVersion>
+ <tomcatVersion>7.0.21</tomcatVersion>
<libs>
<jarArtifact>
<groupId>org.apache.openejb</groupId>
Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=1172714&r1=1172713&r2=1172714&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Mon Sep 19 17:19:20 2011
@@ -120,7 +120,7 @@
<javaee-api.version>6.0-SNAPSHOT</javaee-api.version>
<!-- Used mainly in assembly/openejb-tomcat* projects -->
- <tomcat.version>7.0.16</tomcat.version>
+ <tomcat.version>7.0.21</tomcat.version>
<!-- used mainly by jetty modules -->
<cxf.version>2.4.1</cxf.version>
Modified: openejb/trunk/openejb3/tck/cdi-tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee/pom.xml?rev=1172714&r1=1172713&r2=1172714&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb3/tck/cdi-tomee/pom.xml Mon Sep 19 17:19:20 2011
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
- <version>7.0.16</version>
+ <version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>