Merge branch 'v2.x'
[gpl/argeo-suite.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 65631144079f43e88c4fc7c7967f76f3b8b05dde..bee12d0551187087f7005b79effdfd62c57ad4b3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
-<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.commons</groupId>
-               <artifactId>argeo-commons</artifactId>
-               <version>2.1.76</version>
+               <groupId>org.argeo.maven</groupId>
+               <artifactId>argeo-osgi-parent</artifactId>
+               <version>2.1.3</version>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
-       <packaging>pom</packaging>
+       <version>2.3.1-SNAPSHOT</version>
        <name>Argeo Suite</name>
-       <description />
-       <version>2.1.14</version>
+       <packaging>pom</packaging>
+       <url>http://www.argeo.org/</url>
        <properties>
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-gpl/el7</argeo.rpm.stagingRepository>
-               <version.argeo-suite>2.1.14</version.argeo-suite>
-               <version.argeo-connect>2.1.80</version.argeo-connect>
-               <version.argeo-tp-extras>2.1.10</version.argeo-tp-extras>
+               <!-- 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.102,2.3.0-SNAPSHOT)</version.argeo-commons>
+               <version.argeo-suite-icons>[2.1.1,2.3.0-SNAPSHOT)</version.argeo-suite-icons>
+
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <modules>
-               <!-- Web -->
-               <module>org.argeo.suite.web</module>
-               <module>org.argeo.suite.apps.web</module>
-
-               <!-- Eclipse 4 -->
-               <module>org.argeo.suite.cms</module>
-               <module>org.argeo.suite.e4</module>
-               <module>org.argeo.suite.e4.rap</module>
-               <module>org.argeo.suite.standard</module>
-               
-               <!-- Apps -->
-               <module>org.argeo.suite.tracker</module>
-
-               <!-- Workbench -->
-               <module>org.argeo.suite.apps</module>
-               <module>org.argeo.suite.workbench.rap</module>
+               <module>core</module>
+               <!-- Functional areas -->
+               <module>people</module>
+               <module>library</module>
+               <module>environment</module>
+               <module>publishing</module>
+               <module>knowledge</module>
 
+               <!-- Packaging -->
                <module>dep</module>
                <module>dist</module>
+               <module>lib</module>
        </modules>
        <scm>
                <connection>scm:git:http://git.argeo.org/gpl/argeo-suite.git</connection>
                <url>http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary</url>
                <developerConnection>scm:git:https://code.argeo.org/git/gpl/argeo-suite.git</developerConnection>
-               <tag>argeo-suite-2.1.14</tag>
+               <tag>HEAD</tag>
        </scm>
+       <organization>
+               <name>Argeo GmbH</name>
+       </organization>
        <inceptionYear>2014</inceptionYear>
        <licenses>
                <license>
-                       <name>GPL v3 with exception</name>
+                       <name>GPL-3.0-or-later</name>
                        <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
                        <distribution>repo</distribution>
-                       <comments><![CDATA[
-Smart Data Productivity Suite - Lean, robust and secured distributed Java applications
-Copyright (C) 2017 Argeo GmbH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses />
-
-Additional permission under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or combining it 
-with software covered by the terms of the Eclipse Public License, the 
-licensors of this Program grant you additional permission to convey the 
-resulting work. Corresponding Source for a non-source form of such a 
-combination shall include the source code for the parts of such software 
-which are used as well as that of the covered work.]]>
-                       </comments>
                </license>
        </licenses>
-       <developers>
-               <developer>
-                       <id>mbaudier</id>
-                       <name>Mathieu Baudier</name>
-                       <email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=crsNpHjhOBDPswHG6HD_gXaqymhC69wmBf7wlagcSHw=]]></email>
-                       <organization>Argeo</organization>
-                       <organizationUrl>http://www.argeo.org</organizationUrl>
-                       <roles>
-                               <role>architect</role>
-                               <role>developer</role>
-                               <role>QA</role>
-                       </roles>
-               </developer>
-       </developers>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp</artifactId>
+                       <version>${version.argeo-tp}</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>
+                                       <artifactId>biz.aQute.bndlib</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.misc</groupId>
+                                       <artifactId>slf4j.osgi</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+       </dependencies>
        <dependencyManagement>
                <dependencies>
                        <dependency>
-                               <groupId>org.argeo.tp.extras</groupId>
-                               <artifactId>argeo-tp-extras</artifactId>
-                               <version>${version.argeo-tp-extras}</version>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>argeo-tp</artifactId>
+                               <version>${version.argeo-tp}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>argeo-tp-rap-e4</artifactId>
+                               <version>${version.argeo-tp}</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
@@ -107,21 +98,27 @@ which are used as well as that of the covered work.]]>
        <repositories>
                <repository>
                        <id>argeo</id>
-                       <url>http://repo.argeo.org/data/java/argeo-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>
                <repository>
-                       <id>argeo-extras</id>
-                       <url>http://repo.argeo.org/data/java/argeo-extras-2.1</url>
+                       <id>argeo-unstable</id>
+                       <url>http://forge.argeo.org/data/java/argeo-2.3/</url>
                        <releases>
                                <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
+                               <updatePolicy>never</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
                </repository>
        </repositories>
        <reporting>
@@ -192,6 +189,11 @@ which are used as well as that of the covered work.]]>
                </plugins>
        </reporting>
        <distributionManagement>
+               <repository>
+                       <id>staging</id>
+                       <url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
+                       <uniqueVersion>false</uniqueVersion>
+               </repository>
                <site>
                        <id>staging</id>
                        <url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>