You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/07/19 15:49:53 UTC
svn commit: r1148319 - in /geronimo/external/trunk/tomcat-parent-7.0.19:
NOTICE README.txt catalina-ha/pom.xml catalina/pom.xml jasper-el/pom.xml
jasper/pom.xml juli/pom.xml pom.xml shared/pom.xml tribes/pom.xml
util/pom.xml
Author: xuhaihong
Date: Tue Jul 19 13:49:52 2011
New Revision: 1148319
URL: http://svn.apache.org/viewvc?rev=1148319&view=rev
Log:
Update version to 7.0.19.1-SNAPSHOT
Modified:
geronimo/external/trunk/tomcat-parent-7.0.19/NOTICE
geronimo/external/trunk/tomcat-parent-7.0.19/README.txt
geronimo/external/trunk/tomcat-parent-7.0.19/catalina-ha/pom.xml
geronimo/external/trunk/tomcat-parent-7.0.19/catalina/pom.xml
geronimo/external/trunk/tomcat-parent-7.0.19/jasper-el/pom.xml
geronimo/external/trunk/tomcat-parent-7.0.19/jasper/pom.xml
geronimo/external/trunk/tomcat-parent-7.0.19/juli/pom.xml
geronimo/external/trunk/tomcat-parent-7.0.19/pom.xml
geronimo/external/trunk/tomcat-parent-7.0.19/shared/pom.xml
geronimo/external/trunk/tomcat-parent-7.0.19/tribes/pom.xml
geronimo/external/trunk/tomcat-parent-7.0.19/util/pom.xml
Modified: geronimo/external/trunk/tomcat-parent-7.0.19/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/NOTICE?rev=1148319&r1=1148318&r2=1148319&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.19/NOTICE (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.19/NOTICE Tue Jul 19 13:49:52 2011
@@ -1,5 +1,5 @@
Apache Tomcat
-Copyright 1999-2009 The Apache Software Foundation
+Copyright 1999-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/external/trunk/tomcat-parent-7.0.19/README.txt
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/README.txt?rev=1148319&r1=1148318&r2=1148319&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.19/README.txt (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.19/README.txt Tue Jul 19 13:49:52 2011
@@ -19,8 +19,8 @@ Use tomcat-archetype to build a new leve
1. Update run.sh with the new Tomcat version number:
# Update TVER and TTAGVER with the Tomcat version number in appropriate format
- TVER=6.0.20
- TTAGVER=6_0_20
+ TVER=7.0.19
+ TTAGVER=7.0.19
2. From parent directory of tomcat-archetype, execute run.sh (assumes that subversion 1.5 or greater)
@@ -30,4 +30,4 @@ Use tomcat-archetype to build a new leve
3. Run ./rm-archetype-goo.sh after you've run all the other scripts and are happy with the results.
This removes the archetype scripts that aren't needed in the maven project.
-4. Apply patches to tomcat-parent-7.0.19-6.0.20/
+4. Apply patches to tomcat-parent-7.0.19/
Modified: geronimo/external/trunk/tomcat-parent-7.0.19/catalina-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/catalina-ha/pom.xml?rev=1148319&r1=1148318&r2=1148319&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.19/catalina-ha/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.19/catalina-ha/pom.xml Tue Jul 19 13:49:52 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-7.0.19</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</parent>
<artifactId>catalina-ha</artifactId>
<packaging>bundle</packaging>
Modified: geronimo/external/trunk/tomcat-parent-7.0.19/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/catalina/pom.xml?rev=1148319&r1=1148318&r2=1148319&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.19/catalina/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.19/catalina/pom.xml Tue Jul 19 13:49:52 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-7.0.19</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</parent>
<artifactId>catalina</artifactId>
<packaging>bundle</packaging>
@@ -96,8 +96,8 @@
<format property="TSTAMP" pattern="hh:mm:ss" />
</tstamp>
<replace file="target/classes/org/apache/catalina/util/ServerInfo.properties">
- <replacefilter token="@VERSION@" value="7.0.19.0-SNAPSHOT" />
- <replacefilter token="@VERSION_NUMBER@" value="7.0.19.0-SNAPSHOT" />
+ <replacefilter token="@VERSION@" value="7.0.19.1-SNAPSHOT" />
+ <replacefilter token="@VERSION_NUMBER@" value="7.0.19.1-SNAPSHOT" />
<replacefilter token="@VERSION_BUILT@" value="${TODAY} ${TSTAMP}" />
</replace>
</tasks>
Modified: geronimo/external/trunk/tomcat-parent-7.0.19/jasper-el/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/jasper-el/pom.xml?rev=1148319&r1=1148318&r2=1148319&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.19/jasper-el/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.19/jasper-el/pom.xml Tue Jul 19 13:49:52 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-7.0.19</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</parent>
<artifactId>jasper-el</artifactId>
<packaging>bundle</packaging>
Modified: geronimo/external/trunk/tomcat-parent-7.0.19/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/jasper/pom.xml?rev=1148319&r1=1148318&r2=1148319&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.19/jasper/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.19/jasper/pom.xml Tue Jul 19 13:49:52 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-7.0.19</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</parent>
<artifactId>jasper</artifactId>
<packaging>bundle</packaging>
Modified: geronimo/external/trunk/tomcat-parent-7.0.19/juli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/juli/pom.xml?rev=1148319&r1=1148318&r2=1148319&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.19/juli/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.19/juli/pom.xml Tue Jul 19 13:49:52 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-7.0.19</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</parent>
<artifactId>juli</artifactId>
<packaging>bundle</packaging>
Modified: geronimo/external/trunk/tomcat-parent-7.0.19/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/pom.xml?rev=1148319&r1=1148318&r2=1148319&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.19/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.19/pom.xml Tue Jul 19 13:49:52 2011
@@ -27,7 +27,7 @@
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-7.0.19</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Geronimo Tomcat Fork 7.0.19</name>
@@ -42,9 +42,9 @@ mvn archetype:generate -DarchetypeCatalo
-->
<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-archetype/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-archetype/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/external/trunk/tomcat-archetype/</url>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-parent-7.0.19/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-parent-7.0.19/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/external/trunk/tomcat-parent-7.0.19/</url>
</scm>
<dependencyManagement>
@@ -129,42 +129,42 @@ mvn archetype:generate -DarchetypeCatalo
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>catalina-ha</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>jasper-el</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>juli</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>shared</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tribes</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>util</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: geronimo/external/trunk/tomcat-parent-7.0.19/shared/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/shared/pom.xml?rev=1148319&r1=1148318&r2=1148319&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.19/shared/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.19/shared/pom.xml Tue Jul 19 13:49:52 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-7.0.19</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</parent>
<artifactId>shared</artifactId>
<packaging>bundle</packaging>
Modified: geronimo/external/trunk/tomcat-parent-7.0.19/tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/tribes/pom.xml?rev=1148319&r1=1148318&r2=1148319&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.19/tribes/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.19/tribes/pom.xml Tue Jul 19 13:49:52 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-7.0.19</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</parent>
<artifactId>tribes</artifactId>
<packaging>bundle</packaging>
Modified: geronimo/external/trunk/tomcat-parent-7.0.19/util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/util/pom.xml?rev=1148319&r1=1148318&r2=1148319&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.19/util/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.19/util/pom.xml Tue Jul 19 13:49:52 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-7.0.19</artifactId>
- <version>7.0.19.0-SNAPSHOT</version>
+ <version>7.0.19.1-SNAPSHOT</version>
</parent>
<artifactId>util</artifactId>
<packaging>bundle</packaging>