X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=pom.xml;h=a43adf14d8a931885075c9da0f40017cc9cb8f6e;hp=6eecf50c941b2702ab11a1f6477802f10945b22f;hb=39eca97feb1f090d10059bab25e9fa5bf2e35cf3;hpb=82cbc833f2599a658ff61633b709e30b3c601975

diff --git a/pom.xml b/pom.xml
index 6eecf50..a43adf1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,31 +10,28 @@
 	<packaging>pom</packaging>
 	<name>Argeo Suite</name>
 	<description />
-	<version>2.1.16-SNAPSHOT</version>
+	<version>2.1.18-SNAPSHOT</version>
 	<properties>
-		<version.argeo-suite>2.1.16-SNAPSHOT</version.argeo-suite>
+		<!-- <version.argeo-suite>2.1.17-SNAPSHOT</version.argeo-suite> -->
 		<!-- 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.89-SNAPSHOT</version.argeo-commons>
-		<version.argeo-connect>2.1.82-SNAPSHOT</version.argeo-connect>
-		<version.argeo-slc>2.1.17-SNAPSHOT</version.argeo-slc>
+		<version.argeo-commons>2.1.91-SNAPSHOT</version.argeo-commons>
+		<!-- <version.argeo-slc>2.1.17-SNAPSHOT</version.argeo-slc> -->
 
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-gpl/el7</argeo.rpm.stagingRepository>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
 		<git.rw />
 	</properties>
 	<modules>
-		<!-- 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>core</module>
+		<!-- Functional areas -->
+		<module>people</module>
 		<module>library</module>
-		<module>systems</module>
-		<module>org.argeo.suite.tracker</module>
+		<module>environment</module>
+		<module>publishing</module>
+		<module>knowledge</module>
 
+		<!-- Packaging -->
 		<module>dep</module>
 		<module>dist</module>
 		<module>lib</module>
@@ -45,54 +42,17 @@
 		<developerConnection>scm:git:https://code.argeo.org/git/gpl/argeo-suite.git</developerConnection>
 		<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>