Author: rmannibucau
Date: Thu Jan 17 12:58:04 2013
New Revision: 1434651
URL: http://svn.apache.org/viewvc?rev=1434651&view=rev
Log:
TOMEE-740 tomcat 7.0.35
Removed:
tomee/trunk/openejb/tomee/apache-tomcat/
Modified:
tomee/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
tomee/trunk/openejb/pom.xml
tomee/trunk/openejb/tomee/apache-tomee/pom.xml
tomee/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
tomee/trunk/openejb/tomee/pom.xml
Modified: tomee/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml?rev=1434651&r1=1434650&r2=1434651&view=diff
==============================================================================
--- tomee/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml (original)
+++ tomee/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml Thu Jan 17
12:58:04 2013
@@ -111,9 +111,9 @@
<type>zip</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-tomcat</artifactId>
- <version>${tomcat.bundle.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
<type>zip</type>
</dependency>
</dependencies>
@@ -310,7 +310,7 @@
<skip>${skip.webapp.webprofile}</skip>
<systemPropertyVariables>
<tomee.version>${tomee.version}</tomee.version>
-
<tomee.tomcatVersion>${tomcat.bundle.version}</tomee.tomcatVersion>
+
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
<openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
@@ -327,7 +327,7 @@
<skip>${skip.webapp.jaxrs}</skip>
<systemPropertyVariables>
<tomee.version>${tomee.version}</tomee.version>
-
<tomee.tomcatVersion>${tomcat.bundle.version}</tomee.tomcatVersion>
+
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-jaxrs-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
<openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
@@ -344,7 +344,7 @@
<skip>${skip.webapp.plus}</skip>
<systemPropertyVariables>
<tomee.version>${tomee.version}</tomee.version>
-
<tomee.tomcatVersion>${tomcat.bundle.version}</tomee.tomcatVersion>
+
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
<openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
@@ -425,9 +425,9 @@
<type>war</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-tomcat</artifactId>
- <version>${tomcat.bundle.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
<type>zip</type>
</dependency>
@@ -521,7 +521,7 @@
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<tomee.version>${tomee.version}</tomee.version>
-
<tomee.tomcatVersion>${tomcat.bundle.version}</tomee.tomcatVersion>
+
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
<openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
@@ -538,7 +538,7 @@
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<tomee.version>${tomee.version}</tomee.version>
-
<tomee.tomcatVersion>${tomcat.bundle.version}</tomee.tomcatVersion>
+
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-jaxrs-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
<openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
@@ -555,7 +555,7 @@
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<tomee.version>${tomee.version}</tomee.version>
-
<tomee.tomcatVersion>${tomcat.bundle.version}</tomee.tomcatVersion>
+
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
<openejb.arquillian.adapter>tomee-webapp</openejb.arquillian.adapter>
Modified: tomee/trunk/openejb/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/trunk/openejb/pom.xml?rev=1434651&r1=1434650&r2=1434651&view=diff
==============================================================================
--- tomee/trunk/openejb/pom.xml (original)
+++ tomee/trunk/openejb/pom.xml Thu Jan 17 12:58:04 2013
@@ -118,9 +118,7 @@
<jaxb.version>2.2.6</jaxb.version>
- <!-- Used mainly in assembly/openejb-tomcat* projects -->
- <tomcat.bundle.version>7.0.34</tomcat.bundle.version> <!-- don't merge
with tomcat.version since we can release it ourself -->
- <tomcat.version>7.0.34</tomcat.version>
+ <tomcat.version>7.0.35</tomcat.version>
<!-- used mainly by jetty modules -->
<cxf.version>2.6.4</cxf.version> <!--2.6.4 requires wss4j 1.6.8-->
Modified: tomee/trunk/openejb/tomee/apache-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/trunk/openejb/tomee/apache-tomee/pom.xml?rev=1434651&r1=1434650&r2=1434651&view=diff
==============================================================================
--- tomee/trunk/openejb/tomee/apache-tomee/pom.xml (original)
+++ tomee/trunk/openejb/tomee/apache-tomee/pom.xml Thu Jan 17 12:58:04 2013
@@ -52,9 +52,9 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>apache-tomcat</artifactId>
- <version>${tomcat.bundle.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
<type>zip</type>
<scope>compile</scope>
</dependency>
@@ -135,12 +135,12 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>apache-tomcat</artifactId>
- <version>${tomcat.bundle.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
<type>zip</type>
<outputDirectory>${webprofile.work-dir}</outputDirectory>
-
<destFileName>apache-tomcat-${tomcat.bundle.version}.zip</destFileName>
+
<destFileName>apache-tomcat-${tomcat.version}.zip</destFileName>
</artifactItem>
</artifactItems>
</configuration>
@@ -154,12 +154,12 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>apache-tomcat</artifactId>
- <version>${tomcat.bundle.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
<type>zip</type>
<outputDirectory>${jaxrs.work-dir}</outputDirectory>
-
<destFileName>apache-tomcat-${tomcat.bundle.version}.zip</destFileName>
+
<destFileName>apache-tomcat-${tomcat.version}.zip</destFileName>
</artifactItem>
</artifactItems>
</configuration>
@@ -173,12 +173,12 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>apache-tomcat</artifactId>
- <version>${tomcat.bundle.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
<type>zip</type>
<outputDirectory>${plus.work-dir}</outputDirectory>
-
<destFileName>apache-tomcat-${tomcat.bundle.version}.zip</destFileName>
+
<destFileName>apache-tomcat-${tomcat.version}.zip</destFileName>
</artifactItem>
</artifactItems>
</configuration>
Modified:
tomee/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
URL:
http://svn.apache.org/viewvc/tomee/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy?rev=1434651&r1=1434650&r2=1434651&view=diff
==============================================================================
---
tomee/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
(original)
+++
tomee/trunk/openejb/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
Thu Jan 17 12:58:04 2013
@@ -81,7 +81,6 @@ class SetupCommand {
def workDir = require('tomee.workdir')
def webapp = require('tomee.webapp')
def tomcatVersion = require('tomcat.version')
- def tomcatBundleVersion = require('tomcat.bundle.version')
System.setProperty('tomcat.version', tomcatVersion)
def tomeeVersion = require('tomee.version')
@@ -109,7 +108,7 @@ class SetupCommand {
setProxy.execute()
}
- def dest = "${workDir}/apache-tomcat-${tomcatBundleVersion}.zip"
+ def dest = "${workDir}/apache-tomcat-${tomcatVersion}.zip"
def catalinaHome = "${workDir}/apache-tomcat-${tomcatVersion}"
log.info("extracting ${catalinaHome}")
Modified: tomee/trunk/openejb/tomee/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/trunk/openejb/tomee/pom.xml?rev=1434651&r1=1434650&r2=1434651&view=diff
==============================================================================
--- tomee/trunk/openejb/tomee/pom.xml (original)
+++ tomee/trunk/openejb/tomee/pom.xml Thu Jan 17 12:58:04 2013
@@ -43,7 +43,6 @@
<module>tomee-embedded</module>
<module>tomee-jaxrs</module>
<module>tomee-jaxrs-webapp</module>
- <module>apache-tomcat</module>
<module>apache-tomee</module>
<module>tomee-util</module>
</modules>
