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 2012/12/06 12:48:08 UTC
svn commit: r1417807 - in /openejb/branches/openejb-4.5.1-b: pom.xml
tomee/apache-tomcat/pom.xml
Author: rmannibucau
Date: Thu Dec 6 11:48:07 2012
New Revision: 1417807
URL: http://svn.apache.org/viewvc?rev=1417807&view=rev
Log:
TOMEE-453 trying to use tomcat 7.0.34
Modified:
openejb/branches/openejb-4.5.1-b/pom.xml
openejb/branches/openejb-4.5.1-b/tomee/apache-tomcat/pom.xml
Modified: openejb/branches/openejb-4.5.1-b/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.1-b/pom.xml?rev=1417807&r1=1417806&r2=1417807&view=diff
==============================================================================
--- openejb/branches/openejb-4.5.1-b/pom.xml (original)
+++ openejb/branches/openejb-4.5.1-b/pom.xml Thu Dec 6 11:48:07 2012
@@ -117,8 +117,8 @@
<jaxb.version>2.2.6</jaxb.version>
<!-- Used mainly in assembly/openejb-tomcat* projects -->
- <tomcat.bundle.version>7.0.33</tomcat.bundle.version> <!-- don't merge with tomcat.version since we can release it ourself -->
- <tomcat.version>7.0.33</tomcat.version>
+ <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>
<!-- used mainly by jetty modules -->
<cxf.version>2.6.3</cxf.version>
@@ -481,6 +481,10 @@
<url>https://repository.apache.org/content/repositories/orgapacheopenwebbeans-117/</url>
</repository>
<repository>
+ <id>tomcat-7.0.34</id>
+ <url>https://repository.apache.org/content/repositories/orgapachetomcat-113/</url>
+ </repository>
+ <repository>
<id>apache-snapshots</id>
<name>Apache Snapshots Repository</name>
<url>http://repository.apache.org/content/groups/snapshots-group</url>
Modified: openejb/branches/openejb-4.5.1-b/tomee/apache-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.1-b/tomee/apache-tomcat/pom.xml?rev=1417807&r1=1417806&r2=1417807&view=diff
==============================================================================
--- openejb/branches/openejb-4.5.1-b/tomee/apache-tomcat/pom.xml (original)
+++ openejb/branches/openejb-4.5.1-b/tomee/apache-tomcat/pom.xml Thu Dec 6 11:48:07 2012
@@ -30,7 +30,7 @@ http://maven.apache.org/xsd/maven-4.0.0.
<artifactId>apache-tomcat</artifactId>
<name>OpenEJB :: TomEE :: Apache Tomcat</name>
- <version>7.0.33</version>
+ <version>7.0.34</version>
<packaging>pom</packaging>
<build>
@@ -106,7 +106,9 @@ http://maven.apache.org/xsd/maven-4.0.0.
<properties>
<!-- using a proxy is generally better -->
- <tomcat.url>http://www.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</tomcat.url>
+ <tomcat.url>https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.34/bin/apache-tomcat-7.0.34.zip</tomcat.url>
+<!--
+<tomcat.url>http://www.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</tomcat.url>-->
<tomcat.tmp>${project.build.directory}/apache-tomcat-${tomcat.bundle.version}.zip</tomcat.tmp>
<artifact.path>${settings.localRepository}/org/apache/openejb/${project.artifactId}/${project.version}/${project.artifactId}-${project.version}.zip</artifact.path>
</properties>