Merge remote-tracking branch 'origin/unstable' into testing

[gpl/argeo-suite.git] / lib / pom.xml

diff --git a/lib/pom.xml b/lib/pom.xml
index 987c0c4a346ce44b3f55310c68ed867626613f52..5611ecf11b2e956f9b8c0d22509d86ba806ad0a7 100644 (file)
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -3,21 +3,20 @@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.2</version>
+               <version>2.1.3</version>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite-lib</artifactId>
        <packaging>pom</packaging>
        <name>Parent POM for Argeo Suite Extensions</name>
        <description />
-       <version>2.1.18-SNAPSHOT</version>
+       <version>2.1-SNAPSHOT</version>
        <properties>
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-               <version.argeo-commons>2.1.91-SNAPSHOT</version.argeo-commons>
-
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-gpl/el7</argeo.rpm.stagingRepository>
+               <version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
+               <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
                <git.rw />
        </properties>
        <dependencies>
@@ -29,13 +28,9 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-                       <version>2.1.18-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                        <exclusions>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.apache</groupId>
-                                       <artifactId>org.apache.xerces</artifactId>
-                               </exclusion>
                                <!-- Avoid slf4j implementations lurking in the classpath. -->
                                <exclusion>
                                        <groupId>org.argeo.tp.sdk</groupId>
@@ -76,33 +71,20 @@
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       <dependency>
-                               <groupId>org.argeo.tp.extras</groupId>
-                               <artifactId>argeo-tp-extras</artifactId>
-                               <version>${version.argeo-tp-extras}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
                </dependencies>
        </dependencyManagement>
        <repositories>
                <repository>
                        <id>argeo</id>
-                       <url>http://repo.argeo.org/data/java/argeo-2.1</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
-                       </releases>
-               </repository>
-               <repository>
-                       <id>argeo-extras</id>
-                       <url>http://repo.argeo.org/data/java/argeo-extras-2.1</url>
+                       <url>http://forge.argeo.org/data/java/argeo-2.1</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
                </repository>
        </repositories>
        <reporting>