Merge Remote RCP not working

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 517e0b798028604e099b8333f540f3fb5ed86b6d..d2fea8e8279bce8576058b8ac244788d1c8fdaa5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
                <developmentCycle.argeo-commons>1.2</developmentCycle.argeo-commons>
                <developmentCycle.argeo-commons.startDate>2012-12-18</developmentCycle.argeo-commons.startDate>
                <version.argeo-distribution>1.4.0</version.argeo-distribution>
-               <version.argeo-commons>1.2.0</version.argeo-commons>
+               <version.argeo-commons>1.2.1-SNAPSHOT</version.argeo-commons>
                <!-- RPM -->
                <rpm.release>6</rpm.release>
                <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-1-staging/6/x86_64</rpm.stagingRepository>
@@ -29,9 +29,9 @@
        </organization>
        <url>http://projects.argeo.org/commons/</url>
        <scm>
-               <connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
-               <developerConnection>scm:svn:https://svn.argeo.org/commons/trunk</developerConnection>
-               <url>https://svn.argeo.org/commons/trunk</url>
+               <connection>scm:svn:https://svn.argeo.org/commons/branches/1.x</connection>
+               <developerConnection>scm:svn:https://svn.argeo.org/commons/branches/1.x</developerConnection>
+               <url>https://svn.argeo.org/commons/branches/1.x</url>
        </scm>
        <inceptionYear>2007</inceptionYear>
        <licenses>