[maven-release-plugin] prepare branch 0.11.mbaudier

git-svn-id: https://svn.argeo.org/slc/trunk@1751 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.agent/pom.xml b/org.argeo.slc.agent/pom.xml
index 4c90f75d9aeefc2eb4cd48939fca3e22ff47f4ab..27deb79a06506b5b2aa74ce2c680da182f29f0c3 100644 (file)
--- a/org.argeo.slc.agent/pom.xml
+++ b/org.argeo.slc.agent/pom.xml
@@ -3,14 +3,14 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>0.11.1-SNAPSHOT</version>
+               <version>0.11.mbaudier-SNAPSHOT</version>
                <relativePath>../org.argeo.slc</relativePath>
        </parent>
        <artifactId>argeo-slc-agent</artifactId>
        <name>Argeo SLC Agent</name>
        <scm>
-               <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.agent</connection>
-         <url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc/argeo-slc-agent</url>
+               <connection>scm:svn:https://www.argeo.org/svn/slc/branches/0.11.mbaudier/org.argeo.slc.agent</connection>
+         <url>https://www.argeo.org/svn/slc/branches/0.11.mbaudier/org.argeo.slc.agent</url>
   </scm>
        <build>
                <plugins>

diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml
index 5b9fbd081add3be22c2327c08588b5b81f8dfbc8..11461b65ebeea97f90f103d448aa53428607d48c 100644 (file)
--- a/org.argeo.slc.core/pom.xml
+++ b/org.argeo.slc.core/pom.xml
@@ -1,23 +1,17 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.argeo.slc</groupId>
         <artifactId>argeo-slc</artifactId>
-        <version>0.11.1-SNAPSHOT</version>
+        <version>0.11.mbaudier-SNAPSHOT</version>
         <relativePath>../org.argeo.slc</relativePath>
     </parent>
     <artifactId>argeo-slc-core</artifactId>
     <name>Argeo SLC Core</name>
     <description>SLC Core</description>
     <scm>
-        <connection>
-            scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core
-        </connection>
-        <url>
-            https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core
-        </url>
+        <connection>scm:svn:https://www.argeo.org/svn/slc/branches/0.11.mbaudier/org.argeo.slc.core</connection>
+        <url>https://www.argeo.org/svn/slc/branches/0.11.mbaudier/org.argeo.slc.core</url>
     </scm>
     <build>
         <plugins>

diff --git a/org.argeo.slc.detached.launcher/pom.xml b/org.argeo.slc.detached.launcher/pom.xml
index 799d5703dd5b63e5edc8d3d9ca43ccfb7b679b18..0cc3b2c27afcdbf7526e5c372dd59a5167f598b0 100644 (file)
--- a/org.argeo.slc.detached.launcher/pom.xml
+++ b/org.argeo.slc.detached.launcher/pom.xml
@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.argeo.slc</groupId>
         <artifactId>argeo-slc</artifactId>
-        <version>0.11.1-SNAPSHOT</version>
+        <version>0.11.mbaudier-SNAPSHOT</version>
         <relativePath>../org.argeo.slc</relativePath>
     </parent>
     <artifactId>org.argeo.slc.detached.launcher</artifactId>
@@ -86,9 +84,9 @@
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
         </dependency>
-        <dependency>\r
-            <groupId>xalan</groupId>\r
-            <artifactId>xalan</artifactId>\r
-        </dependency>\r
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.slc.detached/pom.xml b/org.argeo.slc.detached/pom.xml
index 7083a9f8ad6309358bc2ffc1d4d05745701f4a7b..270ee57e7bce13672e8d745cadb695d49aade097 100644 (file)
--- a/org.argeo.slc.detached/pom.xml
+++ b/org.argeo.slc.detached/pom.xml
@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.argeo.slc</groupId>
         <artifactId>argeo-slc</artifactId>
-        <version>0.11.1-SNAPSHOT</version>
+        <version>0.11.mbaudier-SNAPSHOT</version>
         <relativePath>../org.argeo.slc</relativePath>
     </parent>
     <artifactId>org.argeo.slc.detached</artifactId>

diff --git a/org.argeo.slc.dist/pom.xml b/org.argeo.slc.dist/pom.xml
index bc9778c29dfa695323e1fe8ee6e3b7fec1167ca9..fe3450fe0617416684fb0df0a59c8ab0741c954d 100644 (file)
--- a/org.argeo.slc.dist/pom.xml
+++ b/org.argeo.slc.dist/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>0.11.1-SNAPSHOT</version>
+               <version>0.11.mbaudier-SNAPSHOT</version>
                <relativePath>../org.argeo.slc</relativePath>
        </parent>
        <artifactId>argeo-slc-dist</artifactId>
@@ -40,27 +40,27 @@
                </dependency>
 
                <!--  Additional SLC dependencies -->
-               <dependency>\r
-                       <groupId>org.argeo.slc</groupId>\r
-                       <artifactId>argeo-slc-agent</artifactId>\r
-            <version>${project.version}</version>\r
-                       <type>tar.gz</type>\r
-                       <classifier>base</classifier>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                       <groupId>org.argeo.slc</groupId>\r
-                       <artifactId>org.argeo.slc.detached.launcher</artifactId>\r
-            <version>${project.version}</version>\r
-                       <type>tar.gz</type>\r
-                       <classifier>dist</classifier>\r
-               </dependency>\r
-\r
-        <dependency>\r
-            <groupId>org.argeo.dep.jemmy</groupId>\r
-            <artifactId>org.argeo.dep.jemmy.nb61</artifactId>\r
-        </dependency>\r
-\r
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>argeo-slc-agent</artifactId>
+            <version>${project.version}</version>
+                       <type>tar.gz</type>
+                       <classifier>base</classifier>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.detached.launcher</artifactId>
+            <version>${project.version}</version>
+                       <type>tar.gz</type>
+                       <classifier>dist</classifier>
+               </dependency>
+
+        <dependency>
+            <groupId>org.argeo.dep.jemmy</groupId>
+            <artifactId>org.argeo.dep.jemmy.nb61</artifactId>
+        </dependency>
+
                <!-- Additional Third Parties
                <dependency>
                        <groupId>net.sourceforge.jtds</groupId>

diff --git a/org.argeo.slc.example/pom.xml b/org.argeo.slc.example/pom.xml
index 4eb93ba62c378e039bba20de5dd0e697c2f74e2c..e99c49f5a9137d6c517ea5d6f94cddff0871c026 100644 (file)
--- a/org.argeo.slc.example/pom.xml
+++ b/org.argeo.slc.example/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>0.11.1-SNAPSHOT</version>
+               <version>0.11.mbaudier-SNAPSHOT</version>
                <relativePath>../org.argeo.slc</relativePath>
        </parent>
        <artifactId>argeo-slc-example</artifactId>
@@ -11,8 +11,8 @@
        <packaging>jar</packaging>
        <description>An Example SLC application</description>
        <scm>
-               <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.example</connection>
-               <url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc.example</url>
+               <connection>scm:svn:https://www.argeo.org/svn/slc/branches/0.11.mbaudier/org.argeo.slc.example</connection>
+               <url>https://www.argeo.org/svn/slc/branches/0.11.mbaudier/org.argeo.slc.example</url>
        </scm>
        <build>
                <plugins>

diff --git a/org.argeo.slc.hibernate/pom.xml b/org.argeo.slc.hibernate/pom.xml
index 4c229db17cea9d7bbb393e916c144a877c48d482..6cf8d6da396c4141e2706c9ff7f2f6cf5191310b 100644 (file)
--- a/org.argeo.slc.hibernate/pom.xml
+++ b/org.argeo.slc.hibernate/pom.xml
@@ -3,14 +3,14 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>0.11.1-SNAPSHOT</version>
+               <version>0.11.mbaudier-SNAPSHOT</version>
                <relativePath>../org.argeo.slc</relativePath>
        </parent>
        <artifactId>argeo-slc-hibernate</artifactId>
        <name>Argeo SLC Hibernate</name>
        <scm>
-               <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.hibernate</connection>
-         <url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc/argeo-slc-hibernate</url>
+               <connection>scm:svn:https://www.argeo.org/svn/slc/branches/0.11.mbaudier/org.argeo.slc.hibernate</connection>
+         <url>https://www.argeo.org/svn/slc/branches/0.11.mbaudier/org.argeo.slc.hibernate</url>
   </scm>
        <build>
                <plugins>

diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml
index 300cadac0b34fe3673c0b78f8f17d8ee71e3e0cb..035c2da6d6ad01bb25448d0b4c3ec6cb365e1e08 100644 (file)
--- a/org.argeo.slc.server/pom.xml
+++ b/org.argeo.slc.server/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>0.11.1-SNAPSHOT</version>
+               <version>0.11.mbaudier-SNAPSHOT</version>
                <relativePath>../org.argeo.slc</relativePath>
        </parent>
        <artifactId>argeo-slc-server</artifactId>

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index 231735bb51a087096cc043b2b0726ef900d0cec5..be691104d5f597cf1b0a5dcbc393f7e61799cd51 100644 (file)
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>0.11.1-SNAPSHOT</version>
+               <version>0.11.mbaudier-SNAPSHOT</version>
                <relativePath>../org.argeo.slc</relativePath>
        </parent>
        <artifactId>org.argeo.slc.webapp</artifactId>

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 923a7e7682343a2e65e9cf7960beddf815f785c2..da04909ca8ddd1a66e91fa80d94d65cfff0cc8f5 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -1,12 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.argeo.slc</groupId>
     <artifactId>argeo-slc</artifactId>
     <packaging>pom</packaging>
     <name>Argeo SLC</name>
-    <version>0.11.1-SNAPSHOT</version>
+    <version>0.11.mbaudier-SNAPSHOT</version>
     <description>SLC Distribution</description>
     <url>
         http://www.argeo.org/projects/slc/${project.artfactId}/${project.version}
@@ -19,10 +17,8 @@
         <version.jetty>6.1.11</version.jetty>
     </properties>
     <scm>
-        <connection>
-            scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc
-        </connection>
-        <url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc</url>
+        <connection>scm:svn:https://www.argeo.org/svn/slc/branches/0.11.mbaudier/org.argeo.slc</connection>
+        <url>https://www.argeo.org/svn/slc/branches/0.11.mbaudier/org.argeo.slc</url>
     </scm>
     <issueManagement>
         <system>Bugzilla</system>
@@ -100,8 +96,7 @@
                         <stopKey>stopKey</stopKey>
                         <stopPort>9091</stopPort>
                         <connectors>
-                            <connector
-                                implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
                                 <port>9090</port>
                                 <maxIdleTime>60000</maxIdleTime>
                             </connector>

diff --git a/pom.xml b/pom.xml
index b104d8e79e48db6597bc2535b071582dd2527095..c72a2bd267c2ef090db2895e0da670ee7be1995e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>0.11.1-SNAPSHOT</version>
+               <version>0.11.mbaudier-SNAPSHOT</version>
                <relativePath>org.argeo.slc</relativePath>
        </parent>
        <artifactId>argeo-slc-all</artifactId>
@@ -25,8 +25,8 @@
                <module>org.argeo.slc.webapp</module>
        </modules>
        <scm>
-               <connection>scm:svn:https://www.argeo.org/svn/slc/trunk</connection>
-         <url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc/argeo-slc-all</url>
+               <connection>scm:svn:https://www.argeo.org/svn/slc/branches/0.11.mbaudier</connection>
+         <url>https://www.argeo.org/svn/slc/branches/0.11.mbaudier</url>
   </scm>
        <build>
                <plugins>