X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=093401739051a1e94e6d529cfb5a0cf0cbe48b1e;hb=729a093f0629fd73b6c3b00163320ebde9206314;hp=53432c442277663084260d8d18400397f99d3c24;hpb=6e50ada6777af556ba03d2c6e91fde4b2ecb4792;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 53432c442..093401739 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,39 +1,57 @@
-<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.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>0.3.4-SNAPSHOT</version>
+		<version>2.1.80</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.13.1-SNAPSHOT</version>
+	<version>2.1.16</version>
 	<properties>
-		<developmentCycle.slc>0.13</developmentCycle.slc>
-		<site.repoBase>file:///srv/projects/www/slc/site</site.repoBase>
-		<site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
-<!-- 		<version.slc>${developmentCycle.slc}.1-SNAPSHOT</version.slc> -->
+		<version.slc>2.1.16</version.slc>
+		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
+		<developmentCycle.slc>2.1</developmentCycle.slc>
 	</properties>
 	<modules>
-		<module>runtime</module>
-		<module>modules</module>
-<!-- 		<module>server</module> -->
-		<module>eclipse</module>
-		<module>demo</module>
+		<!-- Runtime -->
+		<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.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>
+
+		<!-- 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>
 		<module>dep</module>
-		<!-- FIXME: integration tests are currently failing -->
-		<!-- <module>integration-tests</module> -->
 		<module>dist</module>
+		<module>demo</module>
+		<module>ide</module>
 	</modules>
-	<url>${site.urlBase}/${developmentCycle.slc}</url>
+	<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/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>
+		<tag>argeo-slc-2.1.16</tag>
 	</scm>
+	<inceptionYear>2007</inceptionYear>
 	<licenses>
 		<license>
 			<name>Apache 2</name>
@@ -42,7 +60,7 @@
 			<comments><![CDATA[
 SLC (Software Life Cycle) framework
 			   
-Copyright 2011 Mathieu Baudier
+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.
@@ -82,236 +100,23 @@ limitations under the License.
 				<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>
-	<contributors>
-		<contributor>
-			<name>Philippe Rioland</name>
-			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=w76gYPekGIELW7dvvImvvNzdDSJ3sgCmCXJHFngDGlA=]]></email>
-			<organization>CapCo</organization>
-			<organizationUrl>http://www.capco.com</organizationUrl>
-			<roles>
-				<role>tester</role>
-				<role>sponsor</role>
-			</roles>
-		</contributor>
-	</contributors>
-	<dependencyManagement>
-		<dependencies>
-			<!-- FIXME : use distribution > v1.1.5 and remove this -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.eclipse.core</groupId> -->
-<!-- 				<artifactId>org.eclipse.core.databinding.observable</artifactId> -->
-<!-- 				<version>1.3.0</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.eclipse.core</groupId> -->
-<!-- 				<artifactId>org.eclipse.core.databinding.property</artifactId> -->
-<!-- 				<version>1.3.0</version> -->
-<!-- 			</dependency> -->
-
-
-			<dependency>
-				<groupId>org.argeo.dep</groupId>
-				<artifactId>versions-all</artifactId>
-				<version>${version.argeo-distribution}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<!-- SLC (itself) -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.specs</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.core</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.unit</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.launcher</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.detached</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.lib.detached</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.support.simple</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.support.ant</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.support.maven</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.support.hibernate</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.support.castor</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.support.activemq</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.support.jcr</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.server</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.support.osgi</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.support.equinox</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.support.jemmy</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.server</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.ria</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.ria</groupId> -->
-<!-- 				<artifactId>org.argeo.ria.core</artifactId> -->
-<!-- 				<version>${version.argeo-ria}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.server</groupId> -->
-<!-- 				<artifactId>deploy</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 				<type>pom</type> -->
-<!-- 			</dependency> -->
-<!-- 			SLC dubious -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.slc.runtime</groupId> -->
-<!-- 				<artifactId>org.argeo.slc.detached.launcher</artifactId> -->
-<!-- 				<version>${version.slc}</version> -->
-<!-- 				<type>tar.gz</type> -->
-<!-- 				<classifier>dist</classifier> -->
-<!-- 			</dependency> -->
-			<!-- Argeo Commons -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.commons.security</groupId> -->
-<!-- 				<artifactId>org.argeo.security.dep.ads</artifactId> -->
-<!-- 				<version>${version.argeo-commons}</version> -->
-<!-- 				<type>pom</type> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.commons.osgi</groupId> -->
-<!-- 				<artifactId>org.argeo.osgi.boot</artifactId> -->
-<!-- 				<version>${version.argeo-commons}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.commons.server</groupId> -->
-<!-- 				<artifactId>org.argeo.server.ads</artifactId> -->
-<!-- 				<version>${version.argeo-commons}</version> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.commons.server</groupId> -->
-<!-- 				<artifactId>org.argeo.server.dep.jackrabbit.server</artifactId> -->
-<!-- 				<version>${version.argeo-commons}</version> -->
-<!-- 				<type>pom</type> -->
-<!-- 			</dependency> -->
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.argeo.commons.server</groupId> -->
-<!-- 				<artifactId>org.argeo.server.jackrabbit</artifactId> -->
-<!-- 				<version>${version.argeo-commons}</version> -->
-<!-- 			</dependency> -->
-		</dependencies>
-	</dependencyManagement>
-	<!-- -->
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://maven.argeo.org/argeo</url>
+			<url>http://repo.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>argeo-snapshots</id>
-			<url>http://dev.argeo.org/maven/argeo-snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
+				<checksumPolicy>warn</checksumPolicy>
 			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
 		</repository>
 	</repositories>
-	<distributionManagement>
-		<site>
-			<id>argeo-slc-site</id>
-			<name>SLC Site</name>
-			<url>file://${site.repoBase}/${developmentCycle.slc}/</url>
-		</site>
-	</distributionManagement>
 	<reporting>
 		<plugins>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.3.1</version>
+				<version>2.9</version>
 				<reportSets>
 					<reportSet>
 						<reports>
@@ -319,113 +124,65 @@ limitations under the License.
 							<report>summary</report>
 							<report>license</report>
 							<report>scm</report>
-							<report>issue-tracking</report>
-							<report>dependencies</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<inherited>false</inherited>
-						<reports>
-							<report>project-team</report>
 						</reports>
 					</reportSet>
 				</reportSets>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.7</version>
-				<inherited>false</inherited>
+				<version>3.0.0</version>
 				<configuration>
-					<aggregate>true</aggregate>
+					<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>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jxr-plugin</artifactId>
-				<version>2.2</version>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-				<version>2.7.1</version>
-				<inherited>false</inherited>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>taglist-maven-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<aggregate>true</aggregate>
-					<tags>
-						<tag>TODO</tag>
-						<tag>FIXME</tag>
-						<tag>@deprecated</tag>
-					</tags>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-changelog-plugin</artifactId>
-				<version>2.2</version>
-				<inherited>false</inherited>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<version>2.3</version>
-				<inherited>false</inherited>
-				<configuration>
-					<linkXref>true</linkXref>
-					<targetJdk>1.5</targetJdk>
-					<aggregate>true</aggregate>
-					<excludes>
-						<exclude>**/springutil/*.java</exclude>
-					</excludes>
-				</configuration>
+				<version>2.5</version>
 				<reportSets>
 					<reportSet>
+						<id>aggregate-jxr</id>
+						<inherited>false</inherited>
 						<reports>
-							<report>cpd</report>
+							<report>aggregate</report>
 						</reports>
 					</reportSet>
+					<reportSet>
+						<id>jxr</id>
+						<reports />
+					</reportSet>
 				</reportSets>
 			</plugin>
 		</plugins>
 	</reporting>
-	<profiles>
-		<profile>
-			<id>developer</id>
-			<properties>
-				<site.repoBase>file://${user.home}/dev/work/slcSite</site.repoBase>
-				<site.urlBase>${site.repoBase}</site.urlBase>
-			</properties>
-			<distributionManagement>
-				<snapshotRepository>
-					<uniqueVersion>true</uniqueVersion>
-					<id>argeo-snapshots-restricted</id>
-					<name>Argeo FOSS Snapshots Repository</name>
-					<url>scpexe://argeo.org/var/argeo/maven2/argeo-snapshots</url>
-				</snapshotRepository>
-			</distributionManagement>
-		</profile>
-		<profile>
-			<id>release</id>
-			<distributionManagement>
-				<site>
-					<id>argeo-slc-site</id>
-					<name>SLC Site</name>
-					<url>file://${site.repoBase}/${version.slc}</url>
-				</site>
-			</distributionManagement>
-		</profile>
-	</profiles>
-
+	<distributionManagement>
+		<site>
+			<id>staging</id>
+			<url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
+		</site>
+	</distributionManagement>
 </project>