X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=eeda5128d092297e07e2ae7cffcf6050bdee6def;hb=3087b14ead0baa6c1b0f91a80388077b7841cb6d;hp=fbfdae75ed2cdffb2aad8666c9fab18c9fceefec;hpb=f6d04d1e39ed1280d39a19d854f28f3df06f1842;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index fbfdae75e..eeda5128d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,122 +1,61 @@
-<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>
 		<artifactId>argeo-osgi-parent</artifactId>
-		<version>2.1.2</version>
+		<version>2.1.7</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>2.1.17-SNAPSHOT</version>
+	<version>2.3-SNAPSHOT</version>
 	<properties>
+		<version.context>unstable</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.86-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-commons>2.3-SNAPSHOT</version.argeo-commons>
 
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
+		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
+		<developmentCycle.slc>2.3</developmentCycle.slc>
+		<version.argeo-commons-legacy>2.1.104</version.argeo-commons-legacy>
 	</properties>
 	<modules>
+		<!-- SLC framework -->
 		<module>org.argeo.slc.api</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>
-		<module>org.argeo.slc.launcher</module>
-
-		<!-- Modules -->
-		<module>org.argeo.slc.agent</module>
-		<module>org.argeo.slc.agent.jcr</module>
-		<module>org.argeo.slc.server.repo</module>
-
-		<!-- E4 -->
-		<module>org.argeo.slc.e4</module>
-
-		<!-- Desktop -->
-		<module>rcp</module>
-
-		<!-- Legacy UI -->
-		<module>legacy</module>
-		<module>org.argeo.slc.client.ui</module>
-		<module>org.argeo.slc.client.ui.dist</module>
-		<module>org.argeo.slc.client.rap</module>
+		
+		<!-- CMS extensions -->
+		<module>cms</module>
 
 		<!-- Distribution -->
-		<module>lib</module>
 		<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: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>
@@ -168,110 +107,56 @@ limitations under the License.
 	<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>
+			<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>
+		<repository>
+			<id>argeo-unstable</id>
+			<url>http://forge.argeo.org/data/java/argeo-2.3/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</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>
-	<reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.9</version>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>index</report>
-							<report>summary</report>
-							<report>license</report>
-							<report>scm</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.0.0</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<additionalJOption>-Xdoclint:none</additionalJOption>
-					<excludePackageNames>*.internal.*,org.eclipse.*</excludePackageNames>
-					<encoding>UTF-8</encoding>
-					<detectLinks>true</detectLinks>
-					<links>
-						<link>http://docs.oracle.com/javase/8/docs/api</link>
-						<link>https://osgi.org/javadoc/r5/core</link>
-						<link>https://osgi.org/javadoc/r5/enterprise</link>
-						<link>https://docs.adobe.com/docs/en/spec/javax.jcr/javadocs/jcr-2.0</link>
-						<link>http://help.eclipse.org/oxygen/topic/org.eclipse.platform.doc.isv/reference/api</link>
-						<link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link>
-					</links>
-				</configuration>
-				<reportSets>
-					<reportSet>
-						<id>aggregate-javadoc</id>
-						<inherited>false</inherited>
-						<reports>
-							<report>aggregate</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<id>javadoc</id>
-						<reports />
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>2.5</version>
-				<reportSets>
-					<reportSet>
-						<id>aggregate-jxr</id>
-						<inherited>false</inherited>
-						<reports>
-							<report>aggregate</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<id>jxr</id>
-						<reports />
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
 	<distributionManagement>
 		<site>
 			<id>staging</id>
-			<url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
+			<url>file:///srv/docfactory/argeo-2.3/site/argeo-slc/</url>
 		</site>
 	</distributionManagement>
-	<profiles>
-		<profile>
-			<id>localrepo</id>
-			<repositories>
-				<repository>
-					<id>argeo-extras</id>
-					<url>http://localhost:7080/data/java/argeo-extras-2.1</url>
-					<releases>
-						<enabled>true</enabled>
-						<updatePolicy>daily</updatePolicy>
-						<checksumPolicy>warn</checksumPolicy>
-					</releases>
-				</repository>
-			</repositories>
-		</profile>
-	</profiles>
 </project>