X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=1862da7889e802ed46428ad61ba3c457a2fc8249;hb=86a5c06dc3f077e0d00b79e209e637e476ce0152;hp=42b5d3e9cd1f9212656e4b1ccfa0cbeabc7cf0d1;hpb=a1b5aa49378ac57a062ed0e9db682b9faeb8a751;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 42b5d3e9c..1862da788 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,15 +3,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.6</version>
+	<version>2.1.14-SNAPSHOT</version>
 	<name>Argeo Commons</name>
-	<description>Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring</description>
 	<packaging>pom</packaging>
 	<properties>
+		<version.argeo-commons>2.1.13</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>1.4.0</version.argeo-distribution>
-		<version.argeo-commons>2.1.6</version.argeo-commons>
+		<version.argeo-distribution>2.1.5</version.argeo-distribution>
 		<!-- RPM -->
 		<rpm.release>6</rpm.release>
 		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
@@ -19,19 +18,44 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<modules>
-		<module>base</module>
-		<module>server</module>
-		<module>security</module>
+		<!-- 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>
+		<module>org.argeo.security.ldap</module>
+		<!-- Security Services -->
+		<!-- <module>org.argeo.security.auth.ldap</module> -->
+		<!-- <module>org.argeo.security.dao.ldap</module> -->
+		<!-- <module>org.argeo.security.dao.cli</module> -->
+		<!-- <module>org.argeo.security.dao.jackrabbit</module> -->
+		<!-- Server -->
+		<module>org.argeo.server.core</module>
+		<!-- <module>org.argeo.server.jcr.mvc</module> -->
+		<module>org.argeo.server.jackrabbit</module>
+		<!-- Eclipse -->
+		<module>org.argeo.eclipse.ui</module>
+		<module>org.argeo.eclipse.ui.rap</module>
+		<!-- Argeo Node -->
+		<!-- <module>org.argeo.node.repo.jackrabbit</module> -->
+		<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.equinox</module> -->
+		<module>org.argeo.security.ui</module>
+		<module>org.argeo.security.ui.admin</module>
+		<module>org.argeo.security.ui.rap</module>
+		<!-- Dependencies and Distributions -->
+		<module>dep</module>
+		<module>dist</module>
 	</modules>
-	<organization>
-		<name>Argeo</name>
-		<url>http://www.argeo.org</url>
-	</organization>
-	<url>http://projects.argeo.org/commons/</url>
 	<scm>
-		<connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.6</connection>
-		<developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.6</developerConnection>
-		<url>https://svn.argeo.org/commons/tags/argeo-commons-2.1.6</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>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -59,79 +83,81 @@ limitations under the License.
 			</comments>
 		</license>
 	</licenses>
-	<issueManagement>
-		<system>Bugzilla</system>
-		<url>https://bugzilla.argeo.org</url>
-	</issueManagement>
-	<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>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>
 		<extensions>
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-webdav-jackrabbit</artifactId>
-				<version>2.2</version>
+				<version>2.8</version>
 			</extension>
 		</extensions>
+		<sourceDirectory>src</sourceDirectory>
+		<testSourceDirectory>ext/test</testSourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 			<resource>
 				<directory>.</directory>
 				<includes>
-					<include>plugin.xml</include>
-					<include>META-INF/**</include>
-					<include>WEB-INF/**</include>
-					<include>icons/**</include>
-					<include>branding/**</include>
-					<include>img/**</include>
-					<include>theme/**</include>
-					<include>*.properties</include>
-					<include>properties/*.properties</include>
-					<include>p2.inf</include>
+					<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>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>2.3.2</version>
+					<version>3.2</version>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.7</source>
+						<target>1.7</target>
+						<compilerId>eclipse</compilerId>
+						<!-- 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.3</version>
+						</dependency>
+					</dependencies>
 				</plugin>
 				<plugin>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.2</version>
+					<version>2.4</version>
 					<executions>
 						<execution>
 							<id>attach-sources</id>
@@ -141,10 +167,17 @@ 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.4.1</version>
+					<version>2.6.1</version>
 					<configuration>
 						<filesets>
 							<fileset>
@@ -158,11 +191,11 @@ limitations under the License.
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.12</version>
+					<version>2.18</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.4</version>
+					<version>2.5</version>
 					<configuration>
 						<archive>
 							<manifestFile>META-INF/MANIFEST.MF</manifestFile>
@@ -175,22 +208,22 @@ limitations under the License.
 				</plugin>
 				<plugin>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.5</version>
+					<version>2.7</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>2.4</version>
+					<version>2.9</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.2.2</version>
+					<version>2.5.1</version>
 					<configuration>
 						<autoVersionSubmodules>true</autoVersionSubmodules>
 					</configuration>
 				</plugin>
 				<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.8.1</version>
+					<version>2.10.1</version>
 				</plugin>
 				<!-- Apache -->
 				<plugin>
@@ -201,11 +234,13 @@ limitations under the License.
 					<configuration>
 						<manifestLocation>META-INF</manifestLocation>
 						<instructions>
-							<Bundle-Version>${project.version}-r${timestamp}</Bundle-Version>
+							<_include>bnd.bnd</_include>
+							<Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
 							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-							<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+							<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
 							<!-- SLC specific instructions -->
-							<SLC-GroupId>${project.groupId}</SLC-GroupId>
+							<SLC-Category>${project.groupId}</SLC-Category>
 						</instructions>
 					</configuration>
 					<executions>
@@ -219,11 +254,6 @@ limitations under the License.
 					</executions>
 				</plugin>
 				<!-- Codehaus -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>buildnumber-maven-plugin</artifactId>
-					<version>1.0</version>
-				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>rpm-maven-plugin</artifactId>
@@ -231,35 +261,22 @@ limitations under the License.
 					<extensions>true</extensions>
 					<configuration>
 						<version>${project.version}</version>
-						<release>r${timestamp}.el${rpm.release}</release>
+						<release>1.el${rpm.release}</release>
 						<distribution>argeo${rpm.release}</distribution>
-						<packager>mbaudier@argeo.org</packager>
 						<group>Applications/System</group>
 						<prefix>/usr</prefix>
-						<copyright>2012 Argeo GmbH and others</copyright>
 					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>exec-maven-plugin</artifactId>
-					<version>1.2.1</version>
+					<version>1.3.2</version>
 				</plugin>
 				<!-- Argeo -->
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>1.1.2</version>
-				</plugin>
-				<!-- Others -->
-				<plugin>
-					<groupId>com.mycila.maven-license-plugin</groupId>
-					<artifactId>maven-license-plugin</artifactId>
-					<version>1.9.0</version>
-				</plugin>
-				<plugin>
-					<groupId>com.agilejava.docbkx</groupId>
-					<artifactId>docbkx-maven-plugin</artifactId>
-					<version>2.0.14</version>
+					<version>1.1.3</version>
 				</plugin>
 				<!-- Site -->
 				<plugin>
@@ -281,8 +298,6 @@ limitations under the License.
 											<report>summary</report>
 											<report>license</report>
 											<report>scm</report>
-											<report>issue-tracking</report>
-											<report>project-team</report>
 										</reports>
 									</reportSet>
 								</reportSets>
@@ -336,52 +351,12 @@ limitations under the License.
 									</reportSet>
 								</reportSets>
 							</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>
-									</tags>
-								</configuration>
-							</plugin>
-							<plugin>
-								<artifactId>maven-changelog-plugin</artifactId>
-								<version>2.2</version>
-								<configuration>
-									<type>date</type>
-									<dates>
-										<date>${developmentCycle.argeo-commons.startDate}</date>
-									</dates>
-									<dateFormat>yyyy-MM-dd</dateFormat>
-								</configuration>
-							</plugin>
 						</reportPlugins>
 					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>create-timestamp</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<doCheck>false</doCheck>
-					<doUpdate>false</doUpdate>
-					<timestampFormat>yyMMdd_HHmm</timestampFormat>
-				</configuration>
-			</plugin>
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
 				<configuration>
@@ -422,90 +397,29 @@ limitations under the License.
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>com.mycila.maven-license-plugin</groupId>
-				<artifactId>maven-license-plugin</artifactId>
-				<configuration>
-					<header>license-apache2-header.txt</header>
-					<failIfMissing>true</failIfMissing>
-					<aggregate>true</aggregate>
-					<includes>
-						<include>src/**/*.java</include>
-						<include>src/**/*.xml</include>
-					</includes>
-					<excludes>
-						<exclude>**/springutil/**</exclude>
-						<exclude>**/qooxdoo-sdk/**</exclude>
-					</excludes>
-					<useDefaultExcludes>true</useDefaultExcludes>
-					<mapping>
-						<java>SLASHSTAR_STYLE</java>
-						<xml>XML_STYLE</xml>
-					</mapping>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.agilejava.docbkx</groupId>
-				<artifactId>docbkx-maven-plugin</artifactId>
-				<configuration>
-					<sourceDirectory>doc/reference</sourceDirectory>
-					<targetDirectory>target/site/reference</targetDirectory>
-					<htmlStylesheet>css/style.css</htmlStylesheet>
-					<postProcess>
-						<copy todir="target/site/reference">
-							<fileset dir="doc/reference">
-								<include name="*/*.css" />
-							</fileset>
-							<fileset dir="doc/reference">
-								<include name="img/**" />
-							</fileset>
-						</copy>
-					</postProcess>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate-html</goal>
-							<goal>generate-pdf</goal>
-						</goals>
-						<phase>pre-site</phase>
-					</execution>
-				</executions>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.argeo.tp</groupId>
-				<artifactId>binaries</artifactId>
-				<version>${version.argeo-distribution}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>argeo-tp</artifactId>
+			<version>${version.argeo-distribution}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
 	<repositories>
 		<repository>
 			<id>argeo-tp</id>
-			<url>http://repo.argeo.org/data/public/java/argeo-tp-1.4</url>
+			<url>https://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
-		<repository>
-			<id>argeo-tp-rap</id>
-			<url>http://repo.argeo.org/data/public/java/eclipse-rap-2.2</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-		</repository>
-		<!-- <repository> <id>argeo-tp-rap</id> <url>http://localhost:9070/data/public/java/eclipse-rap-2.2</url> 
-			<releases> <enabled>true</enabled> <updatePolicy>daily</updatePolicy> <checksumPolicy>warn</checksumPolicy> 
-			</releases> </repository> -->
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
@@ -533,10 +447,6 @@ limitations under the License.
 			<url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
-		<site>
-			<id>site</id>
-			<url>dav:https://repo.argeo.org/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
-		</site>
 	</distributionManagement>
 	<profiles>
 		<profile>
@@ -545,21 +455,9 @@ limitations under the License.
 				<repository>
 					<id>localrepo</id>
 					<name>Internal Release Repository</name>
-					<url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+					<url>dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
 				</repository>
-				<site>
-					<id>site</id>
-					<name>Argeo Commons Site</name>
-					<url>dav:http://localhost:7070/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
-				</site>
 			</distributionManagement>
 		</profile>
-		<profile>
-			<id>el5</id>
-			<properties>
-				<rpm.release>5</rpm.release>
-				<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64</rpm.stagingRepository>
-			</properties>
-		</profile>
 	</profiles>
 </project>