Prepare repositories merge

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

diff --git a/pom.xml b/pom.xml
index 6d6a3020f083fd841d3453093054067052562fb5..9bfec3acb65df0f2ded53b71403f579edd1a5a3e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.commons</groupId>
        <artifactId>argeo-commons</artifactId>
@@ -455,23 +456,32 @@ limitations under the License.
                        <id>localrepo</id>
                        <repositories>
                                <repository>
-                                       <id>staging</id>
-                                       <url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+                                       <id>argeo-tp</id>
+                                       <url>http://localhost:7070/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>
                                                <checksumPolicy>warn</checksumPolicy>
                                        </releases>
                                </repository>
+<!--                           <repository> -->
+<!--                                   <id>staging</id> -->
+<!--                                   <url>dav:http://localhost:7070/data/files/java/argeo-${developmentCycle.argeo-commons}</url> -->
+<!--                                   <releases> -->
+<!--                                           <enabled>true</enabled> -->
+<!--                                           <updatePolicy>daily</updatePolicy> -->
+<!--                                           <checksumPolicy>warn</checksumPolicy> -->
+<!--                                   </releases> -->
+<!--                           </repository> -->
                        </repositories>
                        <distributionManagement>
                                <repository>
                                        <id>staging</id>
-                                       <url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+                                       <url>dav:http://localhost:7070/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
                                </repository>
                                <site>
                                        <id>staging</id>
-                                       <url>dav:http://localhost:7070/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
+                                       <url>dav:http://localhost:7070/data/files/docs/argeo-${developmentCycle.argeo-commons}</url>
                                </site>
                        </distributionManagement>
                </profile>
@@ -489,8 +499,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>
@@ -515,8 +527,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>