james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From don...@apache.org
Subject svn commit: r1522438 - in /james/hupa/trunk: client/pom.xml mock/pom.xml pom.xml server/pom.xml shared/pom.xml widgets/pom.xml
Date Thu, 12 Sep 2013 05:03:49 GMT
Author: dongxu
Date: Thu Sep 12 05:03:49 2013
New Revision: 1522438

URL: http://svn.apache.org/r1522438
Log:
Set snapshot version higger than the current hupa in svn repo

Modified:
    james/hupa/trunk/client/pom.xml
    james/hupa/trunk/mock/pom.xml
    james/hupa/trunk/pom.xml
    james/hupa/trunk/server/pom.xml
    james/hupa/trunk/shared/pom.xml
    james/hupa/trunk/widgets/pom.xml

Modified: james/hupa/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522438&r1=1522437&r2=1522438&view=diff
==============================================================================
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu Sep 12 05:03:49 2013
@@ -39,6 +39,7 @@
         <artifactId>hupa-parent</artifactId>
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
         <version>0.0.3-SNAPSHOT</version>
 =======
         <version>0.0.2-SNAPSHOT</version>
@@ -46,6 +47,9 @@
 =======
         <version>0.0.3-SNAPSHOT</version>
 >>>>>>> constantly changed by manolo
+=======
+        <version>0.0.5-SNAPSHOT</version>
+>>>>>>> Set snapshot version higger than the current hupa in svn repo
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>hupa</artifactId>

Modified: james/hupa/trunk/mock/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1522438&r1=1522437&r2=1522438&view=diff
==============================================================================
--- james/hupa/trunk/mock/pom.xml (original)
+++ james/hupa/trunk/mock/pom.xml Thu Sep 12 05:03:49 2013
@@ -26,6 +26,7 @@
     <parent>
         <groupId>org.apache.james.hupa</groupId>
         <artifactId>hupa-parent</artifactId>
+<<<<<<< HEAD
         <version>0.0.3-SNAPSHOT</version>
 =======
 =======
@@ -61,6 +62,9 @@
 =======
         <version>0.0.3-SNAPSHOT</version>
 >>>>>>> constantly changed by manolo
+=======
+        <version>0.0.5-SNAPSHOT</version>
+>>>>>>> Set snapshot version higger than the current hupa in svn repo
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>hupa-mock</artifactId>

Modified: james/hupa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1522438&r1=1522437&r2=1522438&view=diff
==============================================================================
--- james/hupa/trunk/pom.xml (original)
+++ james/hupa/trunk/pom.xml Thu Sep 12 05:03:49 2013
@@ -56,6 +56,7 @@
     </parent>
     <groupId>org.apache.james.hupa</groupId>
     <artifactId>hupa-parent</artifactId>
+<<<<<<< HEAD
     <version>0.0.3-SNAPSHOT</version>
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -75,6 +76,9 @@
 >>>>>>> first commit
 =======
 >>>>>>> constantly changed by manolo
+=======
+    <version>0.0.5-SNAPSHOT</version>
+>>>>>>> Set snapshot version higger than the current hupa in svn repo
     <packaging>pom</packaging>
     <name>Apache James Hupa Parent</name>
     <description>Hupa is a GWT based Webmail</description>

Modified: james/hupa/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/pom.xml?rev=1522438&r1=1522437&r2=1522438&view=diff
==============================================================================
--- james/hupa/trunk/server/pom.xml (original)
+++ james/hupa/trunk/server/pom.xml Thu Sep 12 05:03:49 2013
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.apache.james.hupa</groupId>
         <artifactId>hupa-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>hupa-server</artifactId>

Modified: james/hupa/trunk/shared/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/pom.xml?rev=1522438&r1=1522437&r2=1522438&view=diff
==============================================================================
--- james/hupa/trunk/shared/pom.xml (original)
+++ james/hupa/trunk/shared/pom.xml Thu Sep 12 05:03:49 2013
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.apache.james.hupa</groupId>
         <artifactId>hupa-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>hupa-shared</artifactId>

Modified: james/hupa/trunk/widgets/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/pom.xml?rev=1522438&r1=1522437&r2=1522438&view=diff
==============================================================================
--- james/hupa/trunk/widgets/pom.xml (original)
+++ james/hupa/trunk/widgets/pom.xml Thu Sep 12 05:03:49 2013
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.apache.james.hupa</groupId>
         <artifactId>hupa-parent</artifactId>
-        <version>0.0.3-SNAPSHOT</version>
+        <version>0.0.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>hupa-widgets</artifactId>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message