X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=pom.xml;h=0491869a7a418a480b4ea33b2b428930ee9f09df;hp=2a1a10ae258db6e362cf12a1d04b55590dcfc717;hb=f21589b7f2a19a79edcc213b867c47130faa76cd;hpb=a878b1885d67c6f492ee5ca2d2831a6dd02b7a92

diff --git a/pom.xml b/pom.xml
index 2a1a10a..0491869 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,6 @@
-<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.maven</groupId>
@@ -16,25 +18,29 @@
 		<!-- 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.88-SNAPSHOT</version.argeo-commons>
-		<version.argeo-connect>2.1.82-SNAPSHOT</version.argeo-connect>
+		<version.argeo-commons>2.1.89-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>
 		<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>
+		<!-- Entity Framework -->
+		<module>org.argeo.entity.api</module>
+		<module>org.argeo.entity.core</module>
+		<module>org.argeo.entity.ui</module>
 
-		<!-- Apps -->
+		<!-- Argeo Suite -->
+		<module>org.argeo.suite.core</module>
+		<module>org.argeo.suite.ui</module>
+		<module>org.argeo.suite.ui.rap</module>
+		<module>org.argeo.suite.theme.default</module>
+
+		<!-- Functional areas -->
 		<module>library</module>
-		<module>systems</module>
-		<module>org.argeo.suite.tracker</module>
+		<module>knowledge</module>
 
+		<!-- Packaging -->
 		<module>dep</module>
 		<module>dist</module>
 		<module>lib</module>
@@ -45,54 +51,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>