X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=16378dccadc4d98017ed323385a867652ac94642;hb=58b35f147f3c1c1a12a07c303105618f679c7161;hp=90fa2b4fa37bddca0631b3970d64d24f96bfc6bb;hpb=7317c5c172fe411eaaf26ff6bc9012b3f36a3c01;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 90fa2b4fa..16378dcca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
 	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.85-SNAPSHOT</version>
+		<groupId>org.argeo.maven</groupId>
+		<artifactId>argeo-osgi-parent</artifactId>
+		<version>2.1.2</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
@@ -13,19 +13,24 @@
 	<name>Argeo SLC</name>
 	<version>2.1.17-SNAPSHOT</version>
 	<properties>
+		<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.slc>2.1.17-SNAPSHOT</version.slc>
 		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
 		<developmentCycle.slc>2.1</developmentCycle.slc>
+		<version.argeo-commons-legacy>2.1.86-SNAPSHOT</version.argeo-commons-legacy>
 
-		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-
-		<version.argeo-commons-legacy>2.1.85-SNAPSHOT</version.argeo-commons-legacy>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
 	</properties>
 	<modules>
-		<!-- Runtime -->
 		<module>org.argeo.slc.api</module>
-		<module>org.argeo.slc.core</module>
-		<module>org.argeo.slc.unit</module>
+		<module>org.argeo.slc.runtime</module>
+		<module>org.argeo.slc.jcr</module>
+
+		<!-- Runtime -->
+		<module>org.argeo.slc.spring</module>
 		<module>org.argeo.slc.support</module>
 		<module>org.argeo.slc.repo</module>
 		<module>org.argeo.slc.factory</module>
@@ -57,63 +62,61 @@
 	</modules>
 	<url>http://projects.argeo.org/slc/</url>
 	<scm>
-		<connection>scm:git:http://git.argeo.org/apache2/argeo-slc.git</connection>
-		<url>http://git.argeo.org/?p=apache2/argeo-slc.git;a=summary</url>
-		<developerConnection>scm:git:https://code.argeo.org/git/apache2/argeo-slc.git</developerConnection>
+		<connection>scm:git:http://git.argeo.org/lgpl/argeo-slc.git</connection>
+		<url>http://git.argeo.org/?p=lgpl/argeo-slc.git;a=summary</url>
+		<developerConnection>scm:git:https://code.argeo.org/git/lgpl/argeo-slc.git</developerConnection>
 		<tag>HEAD</tag>
 	</scm>
+	<organization>
+		<name>Argeo GmbH</name>
+	</organization>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
 		<license>
-			<name>Apache 2</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<name>LGPL-3.0-or-later</name>
+			<url>https://www.gnu.org/licenses/lgpl-3.0.txt</url>
 			<distribution>repo</distribution>
-			<comments><![CDATA[
-SLC (Software Life Cycle) framework
-			   
-Copyright (C) 2007-2018 Argeo GmbH
-
-Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-]]>
-			</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>
-		<developer>
-			<id>ocapillo</id>
-			<name>Olivier Capillon</name>
-			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=BYw8i94WiejnvegUKJoCZQQr0h-mYlKCNKZVe_3WPIA=]]></email>
-			<organization>Argeo</organization>
-			<organizationUrl>http://www.argeo.org</organizationUrl>
-			<roles>
-				<role>developer</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</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>
 			<dependency>
 				<groupId>org.argeo.tp.extras</groupId>
 				<artifactId>argeo-tp-extras</artifactId>