X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=64c3d592b5b1be4c4ad43e0ea9d6e691c854ef93;hb=ad42a84b78e26be716e2bf42ef1b7208bc021a7d;hp=53432c442277663084260d8d18400397f99d3c24;hpb=6e50ada6777af556ba03d2c6e91fde4b2ecb4792;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 53432c442..64c3d592b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,30 +1,28 @@
-<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>0.4.0</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>1.1.1-SNAPSHOT</version>
 	<properties>
-		<developmentCycle.slc>0.13</developmentCycle.slc>
+		<developmentCycle.slc>0.14</developmentCycle.slc>
+		<developmentCycle.startDate>2012-06-19</developmentCycle.startDate>
 		<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>${developmentCycle.slc}.2</version.slc>
 	</properties>
 	<modules>
 		<module>runtime</module>
 		<module>modules</module>
-<!-- 		<module>server</module> -->
 		<module>eclipse</module>
 		<module>demo</module>
 		<module>dep</module>
-		<!-- FIXME: integration tests are currently failing -->
 		<!-- <module>integration-tests</module> -->
 		<module>dist</module>
 	</modules>
@@ -34,6 +32,7 @@
 		<developerConnection>scm:svn:https://svn.argeo.org/slc/trunk</developerConnection>
 		<url>https://svn.argeo.org/slc/trunk</url>
 	</scm>
+	<inceptionYear>2007</inceptionYear>
 	<licenses>
 		<license>
 			<name>Apache 2</name>
@@ -105,170 +104,17 @@ limitations under the License.
 			</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>
-	<!-- -->
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-site-plugin</artifactId>
+				<inherited>false</inherited>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 	<repositories>
 		<repository>
 			<id>argeo</id>
@@ -306,100 +152,6 @@ limitations under the License.
 			<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>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>index</report>
-							<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>
-				<configuration>
-					<aggregate>true</aggregate>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</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>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>cpd</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
 	<profiles>
 		<profile>
 			<id>developer</id>