X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=47c7067ff78da2568f7c8cd8f869fbc64384bf3e;hb=d54761c3afbd70612e0a40a4ea927b18422fc6a6;hp=904e14c792c2d5e89771f65ff80d6e87d1f46e47;hpb=62e1d92c14b67c09d485a460993604b130f60dba;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 904e14c79..661b19441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,172 +1,150 @@
 <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.32</version>
+		<groupId>org.argeo.maven</groupId>
+		<artifactId>argeo-osgi-parent</artifactId>
+		<version>2.1.4-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>2.1.2-SNAPSHOT</version>
+	<version>2.1-SNAPSHOT</version>
 	<properties>
-		<developmentCycle.slc>2.1</developmentCycle.slc>
+		<version.context>testing</version.context>
+		<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-SNAPSHOT</version.argeo-commons>
+
 		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
-		<version.slc>2.1.1</version.slc>
-		<!-- Libraries versions -->
-		<version.argeo-tp-extras>2.1.7</version.argeo-tp-extras>
+		<developmentCycle.slc>2.1</developmentCycle.slc>
+		<version.argeo-commons-legacy>2.1.87-SNAPSHOT</version.argeo-commons-legacy>
 	</properties>
 	<modules>
-		<!-- Runtime -->
+		<!-- SLC framework -->
 		<module>org.argeo.slc.api</module>
-		<module>org.argeo.slc.core</module>
-		<module>org.argeo.slc.unit</module>
-		<module>org.argeo.slc.support</module>
+		<module>org.argeo.slc.runtime</module>
+		<module>org.argeo.slc.jcr</module>
 		<module>org.argeo.slc.repo</module>
 		<module>org.argeo.slc.factory</module>
+		
+		<!-- CMS extensions -->
+		<module>cms</module>
 
-		<!-- Modules -->
-		<module>org.argeo.slc.agent</module>
-		<module>org.argeo.slc.node.jackrabbit</module>
-		<module>org.argeo.slc.agent.jcr</module>
-		<module>org.argeo.slc.server.repo</module>
-
-		<!-- UI -->
-		<module>org.argeo.slc.client.ui</module>
-		<module>org.argeo.slc.client.ui.dist</module>
-		<module>org.argeo.slc.client.rap</module>
-
-		<module>lib</module>
+		<!-- Distribution -->
 		<module>dep</module>
-		<module>dist</module>
-		<module>demo</module>
+		<module>ide</module>
+
+		<!-- Legacy -->
+		<module>legacy</module>
 	</modules>
 	<url>http://projects.argeo.org/slc/</url>
 	<scm>
-		<connection>scm:svn:https://svn.argeo.org/slc/trunk</connection>
-		<developerConnection>scm:svn:https://svn.argeo.org/slc/trunk</developerConnection>
-		<url>https://svn.argeo.org/slc/trunk</url>
+		<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-2012 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>
-		<developer>
-			<id>bsinou</id>
-			<name>Bruno Sinou</name>
-			<email><![CDATA[http://www.google.com/recaptcha/mailhide/d?k=01SZoYvDnJzcw0KOR7M7u6Qg==&c=SVgEjXA_Uu9ZrNzLES92w1ght6puLFiVpoNUddCfSU8=]]></email>
-			<organization>Argeo</organization>
-			<organizationUrl>http://www.argeo.org</organizationUrl>
-			<roles>
-				<role>developer</role>
-			</roles>
-		</developer>
-	</developers>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-site-plugin</artifactId>
-				<inherited>false</inherited>
-				<configuration>
-					<skip>false</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<repositories>
-		<repository>
-			<id>argeo-commons</id>
-			<url>http://repo.argeo.org/data/public/java/argeo-commons-2.1</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-		</repository>
-		<repository>
-			<id>argeo-tp-extras</id>
-			<url>http://forge.argeo.org/data/public/java/argeo-tp-extras-2.1</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-		</repository>
-	</repositories>
 	<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>
 			<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>
 				<version>${version.argeo-tp-extras}</version>
-				<scope>import</scope>
 				<type>pom</type>
+				<scope>import</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-	<distributionManagement>
+	<repositories>
 		<repository>
-			<id>staging</id>
-			<url>dav:https://repo.argeo.org/data/files/java/argeo-slc-${developmentCycle.slc}</url>
-			<uniqueVersion>false</uniqueVersion>
+			<id>argeo</id>
+			<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://forge.argeo.org/data/java/argeo-extras-2.1/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
+		<!-- Disable Maven default repository -->
+		<repository>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+	<distributionManagement>
 		<site>
-			<id>site</id>
-			<url>dav:https://repo.argeo.org/data/files/docs/argeo-slc-${developmentCycle.slc}</url>
+			<id>staging</id>
+			<url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
 		</site>
 	</distributionManagement>
 	<profiles>
@@ -174,17 +152,8 @@ limitations under the License.
 			<id>localrepo</id>
 			<repositories>
 				<repository>
-					<id>argeo-tp</id>
-					<url>http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/</url>
-					<releases>
-						<enabled>true</enabled>
-						<updatePolicy>daily</updatePolicy>
-						<checksumPolicy>warn</checksumPolicy>
-					</releases>
-				</repository>
-				<repository>
-					<id>argeo-tp-extras</id>
-					<url>http://localhost:7080/data/public/java/argeo-tp-extras-2.1</url>
+					<id>argeo-extras</id>
+					<url>http://localhost:7080/data/java/argeo-extras-2.1</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -192,16 +161,6 @@ limitations under the License.
 					</releases>
 				</repository>
 			</repositories>
-			<distributionManagement>
-				<repository>
-					<id>staging</id>
-					<url>dav:http://localhost:7070/data/files/java/argeo-slc-${developmentCycle.slc}</url>
-				</repository>
-				<site>
-					<id>staging</id>
-					<url>dav:http://localhost:7070/data/files/docs/argeo-slc-${developmentCycle.slc}</url>
-				</site>
-			</distributionManagement>
 		</profile>
 	</profiles>
 </project>