You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/09/19 01:50:48 UTC
svn commit: r816814 - in /geronimo/external/trunk/tomcat-parent-6.0.20:
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: djencks
Date: Fri Sep 18 23:50:47 2009
New Revision: 816814
URL: http://svn.apache.org/viewvc?rev=816814&view=rev
Log:
undo release attampt
Modified:
geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/pom.xml
geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml
geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/pom.xml
geronimo/external/trunk/tomcat-parent-6.0.20/jasper/pom.xml
geronimo/external/trunk/tomcat-parent-6.0.20/juli/pom.xml
geronimo/external/trunk/tomcat-parent-6.0.20/pom.xml
geronimo/external/trunk/tomcat-parent-6.0.20/shared/pom.xml
geronimo/external/trunk/tomcat-parent-6.0.20/tribes/pom.xml
geronimo/external/trunk/tomcat-parent-6.0.20/util/pom.xml
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/pom.xml?rev=816814&r1=816813&r2=816814&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/pom.xml Fri Sep 18 23:50:47 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-6.0.20</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</parent>
<artifactId>catalina-ha</artifactId>
<packaging>bundle</packaging>
@@ -57,7 +57,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions />
+ <instructions></instructions>
</configuration>
</plugin>
</plugins>
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml?rev=816814&r1=816813&r2=816814&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml Fri Sep 18 23:50:47 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-6.0.20</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</parent>
<artifactId>catalina</artifactId>
<packaging>bundle</packaging>
@@ -97,13 +97,13 @@
<configuration>
<tasks>
<tstamp>
- <format property="TODAY" pattern="MMM d yyyy" locale="en" />
- <format property="TSTAMP" pattern="hh:mm:ss" />
+ <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+ <format property="TSTAMP" pattern="hh:mm:ss"/>
</tstamp>
<replace file="target/classes/org/apache/catalina/util/ServerInfo.properties">
- <replacefilter token="@VERSION@" value="${version}" />
- <replacefilter token="@VERSION_NUMBER@" value="${version}" />
- <replacefilter token="@VERSION_BUILT@" value="${TODAY} ${TSTAMP}" />
+ <replacefilter token="@VERSION@" value="${version}"/>
+ <replacefilter token="@VERSION_NUMBER@" value="${version}"/>
+ <replacefilter token="@VERSION_BUILT@" value="${TODAY} ${TSTAMP}"/>
</replace>
</tasks>
</configuration>
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/pom.xml?rev=816814&r1=816813&r2=816814&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/pom.xml Fri Sep 18 23:50:47 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-6.0.20</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</parent>
<artifactId>jasper-el</artifactId>
<packaging>bundle</packaging>
@@ -41,7 +41,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions />
+ <instructions></instructions>
</configuration>
</plugin>
</plugins>
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/jasper/pom.xml?rev=816814&r1=816813&r2=816814&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/jasper/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/jasper/pom.xml Fri Sep 18 23:50:47 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-6.0.20</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</parent>
<artifactId>jasper</artifactId>
<packaging>bundle</packaging>
@@ -77,7 +77,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions />
+ <instructions></instructions>
</configuration>
</plugin>
</plugins>
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/juli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/juli/pom.xml?rev=816814&r1=816813&r2=816814&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/juli/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/juli/pom.xml Fri Sep 18 23:50:47 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-6.0.20</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</parent>
<artifactId>juli</artifactId>
<packaging>bundle</packaging>
@@ -34,7 +34,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions />
+ <instructions></instructions>
</configuration>
</plugin>
</plugins>
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/pom.xml?rev=816814&r1=816813&r2=816814&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/pom.xml Fri Sep 18 23:50:47 2009
@@ -27,7 +27,7 @@
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-6.0.20</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>tomcat-parent</name>
@@ -141,42 +141,42 @@
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>catalina-ha</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>jasper-el</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>juli</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>shared</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tribes</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>util</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/shared/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/shared/pom.xml?rev=816814&r1=816813&r2=816814&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/shared/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/shared/pom.xml Fri Sep 18 23:50:47 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-6.0.20</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</parent>
<artifactId>shared</artifactId>
<packaging>bundle</packaging>
@@ -34,7 +34,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions />
+ <instructions></instructions>
</configuration>
</plugin>
</plugins>
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/tribes/pom.xml?rev=816814&r1=816813&r2=816814&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/tribes/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/tribes/pom.xml Fri Sep 18 23:50:47 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-6.0.20</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</parent>
<artifactId>tribes</artifactId>
<packaging>bundle</packaging>
@@ -41,7 +41,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions />
+ <instructions></instructions>
</configuration>
</plugin>
</plugins>
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/util/pom.xml?rev=816814&r1=816813&r2=816814&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/util/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/util/pom.xml Fri Sep 18 23:50:47 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>tomcat-parent-6.0.20</artifactId>
- <version>6.0.20.1-SNAPSHOT</version>
+ <version>6.0.20.0-SNAPSHOT</version>
</parent>
<artifactId>util</artifactId>
<packaging>bundle</packaging>
@@ -45,7 +45,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions />
+ <instructions></instructions>
</configuration>
</plugin>
</plugins>