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/20 15:11:04 UTC

svn commit: r1148754 - in /geronimo/external/trunk/tomcat-parent-7.0.19: ./ catalina-ha/ catalina-ha/src/main/java/org/apache/catalina/ha/backend/ catalina/ jasper-el/ jasper/ juli/ shared/ tribes/ util/

Author: xuhaihong
Date: Wed Jul 20 13:11:03 2011
New Revision: 1148754

URL: http://svn.apache.org/viewvc?rev=1148754&view=rev
Log:
revert release changes

Modified:
    geronimo/external/trunk/tomcat-parent-7.0.19/catalina-ha/pom.xml
    geronimo/external/trunk/tomcat-parent-7.0.19/catalina-ha/src/main/java/org/apache/catalina/ha/backend/   (props changed)
    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/catalina-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/catalina-ha/pom.xml?rev=1148754&r1=1148753&r2=1148754&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 Wed Jul 20 13:11:03 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo.ext.tomcat</groupId>
         <artifactId>tomcat-parent-7.0.19</artifactId>
-        <version>7.0.19.2-SNAPSHOT</version>
+        <version>7.0.19.1-SNAPSHOT</version>
     </parent>
     <artifactId>catalina-ha</artifactId>
     <packaging>bundle</packaging>
@@ -53,7 +53,7 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
-                    <instructions />
+                    <instructions></instructions>
                 </configuration>
             </plugin>
         </plugins>

Propchange: geronimo/external/trunk/tomcat-parent-7.0.19/catalina-ha/src/main/java/org/apache/catalina/ha/backend/
            ('svn:mergeinfo' removed)

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=1148754&r1=1148753&r2=1148754&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 Wed Jul 20 13:11:03 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo.ext.tomcat</groupId>
         <artifactId>tomcat-parent-7.0.19</artifactId>
-        <version>7.0.19.2-SNAPSHOT</version>
+        <version>7.0.19.1-SNAPSHOT</version>
     </parent>
     <artifactId>catalina</artifactId>
     <packaging>bundle</packaging>

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=1148754&r1=1148753&r2=1148754&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 Wed Jul 20 13:11:03 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo.ext.tomcat</groupId>
         <artifactId>tomcat-parent-7.0.19</artifactId>
-        <version>7.0.19.2-SNAPSHOT</version>
+        <version>7.0.19.1-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-7.0.19/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/jasper/pom.xml?rev=1148754&r1=1148753&r2=1148754&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 Wed Jul 20 13:11:03 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo.ext.tomcat</groupId>
         <artifactId>tomcat-parent-7.0.19</artifactId>
-        <version>7.0.19.2-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=1148754&r1=1148753&r2=1148754&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 Wed Jul 20 13:11:03 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo.ext.tomcat</groupId>
         <artifactId>tomcat-parent-7.0.19</artifactId>
-        <version>7.0.19.2-SNAPSHOT</version>
+        <version>7.0.19.1-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-7.0.19/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/pom.xml?rev=1148754&r1=1148753&r2=1148754&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.19/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.19/pom.xml Wed Jul 20 13:11:03 2011
@@ -27,7 +27,7 @@
 
     <groupId>org.apache.geronimo.ext.tomcat</groupId>
     <artifactId>tomcat-parent-7.0.19</artifactId>
-    <version>7.0.19.2-SNAPSHOT</version>
+    <version>7.0.19.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Apache Geronimo Tomcat Fork 7.0.19</name>
@@ -129,42 +129,42 @@ mvn archetype:generate -DarchetypeCatalo
             <dependency>
                 <groupId>org.apache.geronimo.ext.tomcat</groupId>
                 <artifactId>catalina</artifactId>
-                <version>7.0.19.2-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.2-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.2-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.2-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.2-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.2-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.2-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.2-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=1148754&r1=1148753&r2=1148754&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 Wed Jul 20 13:11:03 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo.ext.tomcat</groupId>
         <artifactId>tomcat-parent-7.0.19</artifactId>
-        <version>7.0.19.2-SNAPSHOT</version>
+        <version>7.0.19.1-SNAPSHOT</version>
     </parent>
     <artifactId>shared</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-7.0.19/tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.19/tribes/pom.xml?rev=1148754&r1=1148753&r2=1148754&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 Wed Jul 20 13:11:03 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo.ext.tomcat</groupId>
         <artifactId>tomcat-parent-7.0.19</artifactId>
-        <version>7.0.19.2-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=1148754&r1=1148753&r2=1148754&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 Wed Jul 20 13:11:03 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo.ext.tomcat</groupId>
         <artifactId>tomcat-parent-7.0.19</artifactId>
-        <version>7.0.19.2-SNAPSHOT</version>
+        <version>7.0.19.1-SNAPSHOT</version>
     </parent>
     <artifactId>util</artifactId>
     <packaging>bundle</packaging>