Adapt to changes in Commons

[gpl/argeo-slc.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 5376fa05690ed8ce6d1426a463cc23d0adac1916..5ffd6073e501670ee5a71b69e98466e73d02a2ae 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,19 +4,17 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.32</version>
+               <version>2.1.46</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC</name>
-       <version>2.1.1-SNAPSHOT</version>
+       <version>2.1.5-SNAPSHOT</version>
        <properties>
                <developmentCycle.slc>2.1</developmentCycle.slc>
                <developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
-               <version.slc>2.1.1-SNAPSHOT</version.slc>
-               <!-- Libraries versions -->
-               <version.argeo-tp-extras>2.1.7</version.argeo-tp-extras>
+               <version.slc>2.1.5-SNAPSHOT</version.slc>
        </properties>
        <modules>
                <!-- Runtime -->
@@ -29,7 +27,7 @@
 
                <!-- Modules -->
                <module>org.argeo.slc.agent</module>
-               <module>org.argeo.slc.node.jackrabbit</module>
+               <!-- <module>org.argeo.slc.node.jackrabbit</module> -->
                <module>org.argeo.slc.agent.jcr</module>
                <module>org.argeo.slc.server.repo</module>
 
@@ -122,70 +120,51 @@ limitations under the License.
        </build>
        <repositories>
                <repository>
-                       <id>argeo-commons</id>
-                       <url>http://repo.argeo.org/data/public/java/argeo-commons-2.1</url>
+                       <id>argeo</id>
+                       <url>http://forge.argeo.org/data/public/java/argeo-2.1/</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
                </repository>
+               <!-- Disable Maven default repository -->
                <repository>
-                       <id>argeo-tp-extras</id>
-                       <url>http://forge.argeo.org/data/public/java/argeo-tp-extras-2.1</url>
+                       <id>central</id>
+                       <url>http://repo1.maven.org/maven2</url>
                        <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
+                               <enabled>false</enabled>
                        </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
                </repository>
        </repositories>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.tp.extras</groupId>
-                       <artifactId>argeo-tp-extras</artifactId>
-                       <version>${version.argeo-tp-extras}</version>
-                       <scope>provided</scope>
-               </dependency>
-       </dependencies>
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.argeo.tp.extras</groupId>
-                               <artifactId>argeo-tp-extras</artifactId>
-                               <version>${version.argeo-tp-extras}</version>
-                               <scope>import</scope>
-                               <type>pom</type>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       <distributionManagement>
-               <repository>
-                       <id>staging</id>
-                       <url>dav:https://repo.argeo.org/data/files/java/argeo-slc-${developmentCycle.slc}</url>
-                       <uniqueVersion>false</uniqueVersion>
-               </repository>
-               <site>
-                       <id>site</id>
-                       <url>dav:https://repo.argeo.org/data/files/docs/argeo-slc-${developmentCycle.slc}</url>
-               </site>
-       </distributionManagement>
        <profiles>
                <profile>
                        <id>localrepo</id>
                        <repositories>
                                <repository>
                                        <id>argeo-tp</id>
-                                       <url>http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/</url>
+                                       <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>argeo-tp-extras</id> -->
+                               <!-- <url>http://localhost:7080/data/public/java/argeo-tp-extras-2.1</url> -->
+                               <!-- <releases> -->
+                               <!-- <enabled>true</enabled> -->
+                               <!-- <updatePolicy>daily</updatePolicy> -->
+                               <!-- <checksumPolicy>warn</checksumPolicy> -->
+                               <!-- </releases> -->
+                               <!-- </repository> -->
                                <repository>
-                                       <id>argeo-tp-extras</id>
-                                       <url>http://localhost:7080/data/public/java/argeo-tp-extras-2.1</url>
+                                       <id>argeo-commons</id>
+                                       <url>http://localhost:7070/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>