X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=19c58fa17898d708bf2481a96d438ae7c2c43098;hb=241709fc790719d650253ef57bd158fb6e806325;hp=8104fc77cfd88ccbdce0cbcbe2fe1aaea49fb276;hpb=b2bfc5cdb8374a7542d49b9fe729fc58558e5fdb;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 8104fc77c..19c58fa17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,35 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
 	<groupId>org.argeo.commons</groupId>
-	<version>0.1.1-SNAPSHOT</version>
 	<artifactId>argeo-commons</artifactId>
+	<version>2.1.39-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<developmentCycle>0.1</developmentCycle>
-		<version.slc>0.12.1-SNAPSHOT</version.slc>
-		<version.maven-argeo-osgi>0.1.21</version.maven-argeo-osgi>
+		<version.argeo-commons>2.1.38</version.argeo-commons>
+		<developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
+		<developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
+		<version.argeo-distribution>2.1.12</version.argeo-distribution>
+		<!-- RPM -->
+		<argeo.rpm.release>7</argeo.rpm.release>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
+		<!-- encoding, see http://is.gd/mvn_source_encoding -->
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
+	<modules>
+		<!-- Base -->
+		<module>org.argeo.util</module>
+		<module>org.argeo.osgi.boot</module>
+		<module>org.argeo.server.jcr</module>
+		<!-- Security -->
+		<module>org.argeo.security.core</module>
+		<module>org.argeo.security.jackrabbit</module>
+		<!-- Eclipse -->
+		<module>org.argeo.eclipse.ui</module>
+		<module>org.argeo.eclipse.ui.rap</module>
+		<!-- CMS -->
+		<module>org.argeo.cms</module>
+		<!-- Workbench -->
+		<module>org.argeo.eclipse.ui.workbench</module>
+		<module>org.argeo.eclipse.ui.workbench.rap</module>
+		<module>org.argeo.security.ui</module>
+		<module>org.argeo.security.ui.admin</module>
+		<module>org.argeo.security.ui.rap</module>
+		<!-- Distribution -->
+		<module>dep</module>
+		<module>dist</module>
+	</modules>
 	<scm>
-		<connection>scm:svn:https://www.argeo.org/svn/commons/trunk</connection>
-		<developerConnection>scm:svn:https://www.argeo.org/svn/commons/trunk</developerConnection>
-		<url>https://www.argeo.org/svn/commons/trunk</url>
+		<connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
+		<developerConnection>scm:svn:https://svn.argeo.org/commons/trunk</developerConnection>
+		<url>https://svn.argeo.org/commons/trunk</url>
 	</scm>
-	<issueManagement>
-		<system>Bugzilla</system>
-		<url>https://www.argeo.org/bugzilla/</url>
-	</issueManagement>
+	<inceptionYear>2007</inceptionYear>
 	<licenses>
 		<license>
 			<name>Apache 2</name>
 			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
 			<distribution>repo</distribution>
 			<comments><![CDATA[
-SLC - Software LifeCycle framework
+Argeo Commons Enterprise Framework
 			   
-Copyright 2008 Mathieu Baudier - Argeo e.U.
+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.
@@ -46,41 +71,83 @@ limitations under the License.
 			</comments>
 		</license>
 	</licenses>
-	<organization>
-		<name>Argeo</name>
-		<url>http://www.argeo.org</url>
-	</organization>
-	<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>
-	</developers>
-	<modules>
-		<module>server</module>
-	</modules>
 	<build>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-webdav-jackrabbit</artifactId>
+				<version>2.10</version>
+			</extension>
+		</extensions>
+		<sourceDirectory>src</sourceDirectory>
+		<testSourceDirectory>ext/test</testSourceDirectory>
+		<resources>
+			<resource>
+				<directory>src</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>.*</exclude>
+					<exclude>.*/**</exclude>
+					<exclude>src/**</exclude>
+					<exclude>ext/**</exclude>
+					<exclude>target/**</exclude>
+					<exclude>bin/**</exclude>
+					<exclude>pom.xml</exclude>
+					<exclude>build.properties</exclude>
+					<exclude>*.bnd</exclude>
+					<exclude>*.target</exclude>
+				</excludes>
+			</resource>
+		</resources>
+		<testResources>
+			<testResource>
+				<directory>ext/test</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</testResource>
+		</testResources>
 		<pluginManagement>
 			<plugins>
+				<!-- Maven -->
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.3</version>
 					<configuration>
-						<source>1.5</source>
-						<target>1.5</target>
+						<source>1.8</source>
+						<target>1.8</target>
+						<compilerId>eclipse</compilerId>
+						<!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->
+						<optimize>true</optimize>
+						<!-- Hack to work around issues with generated annotations : -->
+						<generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
+						<generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
 					</configuration>
+					<dependencies>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-compiler-eclipse</artifactId>
+							<version>2.6</version>
+						</dependency>
+					</dependencies>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
+					<version>2.4</version>
 					<executions>
 						<execution>
 							<id>attach-sources</id>
@@ -90,66 +157,256 @@ limitations under the License.
 							</goals>
 						</execution>
 					</executions>
+					<configuration>
+						<excludes>
+							<!-- Prevents source jars to contain misleading data -->
+							<exclude>plugin.xml</exclude>
+							<exclude>META-INF/MANIFEST.MF</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>2.6.1</version>
+					<configuration>
+						<filesets>
+							<fileset>
+								<directory>META-INF</directory>
+								<includes>
+									<include>MANIFEST.MF</include>
+								</includes>
+							</fileset>
+						</filesets>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.18</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.5</version>
+					<configuration>
+						<archive>
+							<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+						</archive>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.8</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>2.7</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<version>2.9</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>2.5.1</version>
+					<configuration>
+						<autoVersionSubmodules>true</autoVersionSubmodules>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>2.10.1</version>
+				</plugin>
+				<!-- Apache -->
+				<plugin>
+					<groupId>org.apache.felix</groupId>
+					<artifactId>maven-bundle-plugin</artifactId>
+					<version>2.3.7</version>
+					<extensions>true</extensions>
+					<configuration>
+						<manifestLocation>META-INF</manifestLocation>
+						<instructions>
+							<_include>bnd.bnd</_include>
+							<Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
+							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+							<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
+							<!-- SLC specific instructions -->
+							<SLC-Category>${project.groupId}</SLC-Category>
+						</instructions>
+					</configuration>
+					<executions>
+						<execution>
+							<id>bundle-manifest</id>
+							<phase>process-classes</phase>
+							<goals>
+								<goal>manifest</goal>
+							</goals>
+						</execution>
+					</executions>
 				</plugin>
+				<!-- Codehaus -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>rpm-maven-plugin</artifactId>
+					<version>2.1.4</version>
+					<!-- <version>2.1-alpha-1</version> -->
+					<extensions>true</extensions>
+					<configuration>
+						<version>${project.version}</version>
+						<distribution>argeo${argeo.rpm.release}</distribution>
+						<group>Applications/System</group>
+						<prefix>/usr</prefix>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId>
+					<version>1.3.2</version>
+				</plugin>
+				<!-- Argeo -->
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>${version.maven-argeo-osgi}</version>
+					<version>1.1.5</version>
+				</plugin>
+				<!-- Site -->
+				<plugin>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.4</version>
+					<configuration>
+						<siteDirectory>doc/site</siteDirectory>
+						<generateSitemap>true</generateSitemap>
+						<skip>true</skip>
+						<reportPlugins>
+							<plugin>
+								<groupId>org.apache.maven.plugins</groupId>
+								<artifactId>maven-project-info-reports-plugin</artifactId>
+								<version>2.8.1</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>2.10.3</version>
+								<configuration>
+									<failOnError>false</failOnError>
+									<encoding>UTF-8</encoding>
+									<excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
+									<detectLinks>true</detectLinks>
+									<links>
+										<!-- Java -->
+										<link>http://docs.oracle.com/javase/6/docs/api</link>
+										<!-- OSGi -->
+										<link>http://www.osgi.org/javadoc/r4v42</link>
+										<!-- Spring -->
+										<link>http://static.springsource.org/spring/docs/2.5.x/api</link>
+										<link>http://static.springsource.org/osgi/docs/1.2.x/api</link>
+										<link>http://static.springsource.org/spring-security/site/docs/2.0.x/apidocs</link>
+										<!-- JCR -->
+										<link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link>
+										<!-- Eclipse -->
+										<link>http://help.eclipse.org/helios/topic/org.eclipse.platform.doc.isv/reference/api</link>
+									</links>
+								</configuration>
+								<reportSets>
+									<reportSet>
+										<id>aggregate</id>
+										<reports>
+											<report>aggregate</report>
+										</reports>
+									</reportSet>
+								</reportSets>
+							</plugin>
+							<plugin>
+								<artifactId>maven-jxr-plugin</artifactId>
+								<version>2.5</version>
+								<configuration>
+									<excludes>
+										<exclude>**/demo/**/*</exclude>
+										<exclude>**/internal/**/*</exclude>
+									</excludes>
+								</configuration>
+								<reportSets>
+									<reportSet>
+										<id>aggregate</id>
+										<reports>
+											<report>aggregate</report>
+										</reports>
+									</reportSet>
+								</reportSets>
+							</plugin>
+						</reportPlugins>
+					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-3</version>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>META-INF</directory>
+							<includes>
+								<include>MANIFEST.MF</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
 				<configuration>
-					<doCheck>false</doCheck>
-					<doUpdate>false</doUpdate>
-					<useLastCommittedRevision>true</useLastCommittedRevision>
+					<skip>true</skip>
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
 				<configuration>
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>2.0-beta-5</version>
-				<!--
-					The site plugin is buggy with multi modules.
-					http://jira.codehaus.org/browse/MSITE-276
-				-->
+				<inherited>false</inherited>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
 				<configuration>
-					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<releaseProfiles>release</releaseProfiles>
 					<goals>deploy</goals>
+					<releaseProfiles>rpmbuild,rpmbuild-tp</releaseProfiles>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>argeo-tp</artifactId>
+			<version>${version.argeo-distribution}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.argeo.slc</groupId>
-				<artifactId>argeo-slc</artifactId>
-				<version>${version.slc}</version>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>argeo-tp</artifactId>
+				<version>${version.argeo-distribution}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -157,100 +414,118 @@ limitations under the License.
 	</dependencyManagement>
 	<repositories>
 		<repository>
-			<id>central</id>
-			<url>http://repo1.maven.org/maven2</url>
+			<id>argeo-tp</id>
+			<url>http://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
 		</repository>
-		<repository>
-			<id>com.springsource.repository.bundles.release</id>
-			<name>
-				SpringSource Enterprise Bundle Repository - SpringSource
-				Bundle Releases
-			</name>
-			<url>
-				http://repository.springsource.com/maven/bundles/release
-			</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>com.springsource.repository.bundles.external</id>
-			<name>
-				SpringSource Enterprise Bundle Repository - External
-				Bundle Releases
-			</name>
-			<url>
-				http://repository.springsource.com/maven/bundles/external
-			</url>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
+				<checksumPolicy>warn</checksumPolicy>
 			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>argeo</id>
-			<url>http://www.argeo.org/maven/argeo</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>argeo-maven-plugins</id>
+			<url>http://repo.argeo.org/data/public/java/argeo-maven-1.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://www.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>
+		</pluginRepository>
+	</pluginRepositories>
 	<distributionManagement>
 		<repository>
+			<id>staging</id>
+			<url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
 			<uniqueVersion>false</uniqueVersion>
-			<id>argeo-restricted</id>
-			<name>Argeo FOSS Repository</name>
-			<url>file:///var/argeo/maven2/argeo</url>
 		</repository>
-		<snapshotRepository>
-			<uniqueVersion>true</uniqueVersion>
-			<id>argeo-snapshots-restricted</id>
-			<name>Argeo FOSS Snapshots Repository</name>
-			<url>file:///var/argeo/maven2/argeo-snapshots</url>
-		</snapshotRepository>
 	</distributionManagement>
-</project>
\ No newline at end of file
+	<profiles>
+		<profile>
+			<id>localrepo</id>
+			<repositories>
+				<repository>
+					<id>staging</id>
+					<url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+					<releases>
+						<enabled>true</enabled>
+						<updatePolicy>daily</updatePolicy>
+						<checksumPolicy>warn</checksumPolicy>
+					</releases>
+				</repository>
+			</repositories>
+			<distributionManagement>
+				<repository>
+					<id>staging</id>
+					<url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+				</repository>
+				<site>
+					<id>staging</id>
+					<url>dav:http://localhost:7070/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
+				</site>
+			</distributionManagement>
+		</profile>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>install</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
+											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+											<flattenmapper />
+										</copy>
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>rpmbuild-tp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>install</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
+											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+											<flattenmapper />
+										</copy>
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>