X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=dbd3ed3cff8ab7492887862d662e3d5ebc6d80c5;hb=075368d6da2e88d05bdd3d047cd4e17617176afa;hp=41566da45ccd3e40390700e5446344f8608df7a0;hpb=9985c63e371f33b3dac54874dfaaea67b18ce3d1;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 41566da45..dbd3ed3cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,25 +4,68 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>1.1.8-SNAPSHOT</version>
+	<version>2.1.12-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>
-		<developmentCycle.argeo-commons>1.1</developmentCycle.argeo-commons>
-		<developmentCycle.argeo-commons.startDate>2012-06-19</developmentCycle.argeo-commons.startDate>
-		<version.argeo-distribution>1.3.1</version.argeo-distribution>
-		<version.argeo-commons>1.1.8-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.1.12-SNAPSHOT</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.rap>2.2.0-R-20131204-0942</version.rap>
+		<version.rap.addons>0.5.0.argeo.20141029</version.rap.addons>
 		<!-- RPM -->
 		<rpm.release>6</rpm.release>
-		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/6/x86_64</rpm.stagingRepository>
+		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
 		<!-- encoding, see http://is.gd/mvn_source_encoding -->
 		<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>
+		<!-- Eclipse -->
+		<module>org.argeo.eclipse.ui</module>
+		<module>org.argeo.eclipse.ui.jcr</module>
+		<module>org.argeo.eclipse.ui.rap</module>
+		<module>org.argeo.eclipse.ui.rcp</module>
+		<!-- Security -->
+		<module>org.argeo.security.core</module>
+		<module>org.argeo.security.jackrabbit</module>
+		<module>org.argeo.security.ldap</module>
+		<module>org.argeo.security.mvc</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.os</module>
+		<module>org.argeo.security.dao.jackrabbit</module>
+		<!-- Servers -->
+		<module>org.argeo.server.jcr.mvc</module>
+		<module>org.argeo.server.jackrabbit</module>
+		<module>org.argeo.jackrabbit.webapp</module>
+		<module>org.argeo.server.ads</module>
+		<module>org.argeo.server.ads.server</module>
+		<module>org.argeo.server.rap.webapp</module>
+		<!-- Node -->
+		<module>org.argeo.node.repo.jackrabbit</module>
+		<!-- Standard Workbench Perspectives -->
+		<module>org.argeo.osgi.ui.explorer</module>
+		<module>org.argeo.jcr.ui.explorer</module>
+		<module>org.argeo.security.equinox</module>
+		<module>org.argeo.security.ui</module>
+		<module>org.argeo.security.ui.admin</module>
+		<!-- Standard Workbench Products -->
+		<module>org.argeo.security.ui.rap</module>
+		<module>org.argeo.security.ui.rcp</module>
+		<!-- Legacy -->
+		<module>org.argeo.support.junit</module>
+		<module>org.argeo.server.core</module>
+		<module>org.argeo.ext.jdbm</module>
+		<!-- Dependencies and Distributions -->
+		<module>dep</module>
+		<module>dist</module>
 	</modules>
 	<organization>
 		<name>Argeo</name>
@@ -93,15 +136,37 @@ limitations under the License.
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-webdav-jackrabbit</artifactId>
-				<version>2.2</version>
+				<version>2.8</version>
 			</extension>
 		</extensions>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>.*</exclude>
+					<exclude>.*/**</exclude>
+					<exclude>src/**</exclude>
+					<exclude>target/**</exclude>
+					<exclude>bin/**</exclude>
+					<exclude>pom.xml</exclude>
+					<exclude>build.properties</exclude>
+					<exclude>*.bnd</exclude>
+					<exclude>*.target</exclude>
+				</excludes>
+			</resource>
+		</resources>
 		<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>
@@ -109,7 +174,7 @@ limitations under the License.
 				</plugin>
 				<plugin>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.2</version>
+					<version>2.4</version>
 					<executions>
 						<execution>
 							<id>attach-sources</id>
@@ -119,10 +184,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>
@@ -136,11 +208,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>
@@ -153,22 +225,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>
@@ -184,6 +256,7 @@ limitations under the License.
 							<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
 							<!-- SLC specific instructions -->
 							<SLC-GroupId>${project.groupId}</SLC-GroupId>
+							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
 						</instructions>
 					</configuration>
 					<executions>
@@ -205,7 +278,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>rpm-maven-plugin</artifactId>
-					<version>2.1-alpha-1</version>
+					<version>2.1</version>
 					<extensions>true</extensions>
 					<configuration>
 						<version>${project.version}</version>
@@ -220,13 +293,13 @@ limitations under the License.
 				<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>
+					<version>1.1.3-SNAPSHOT</version>
 				</plugin>
 				<!-- Others -->
 				<plugin>
@@ -234,11 +307,11 @@ limitations under the License.
 					<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>
-				</plugin>
+				<!-- <plugin> -->
+				<!-- <groupId>com.agilejava.docbkx</groupId> -->
+				<!-- <artifactId>docbkx-maven-plugin</artifactId> -->
+				<!-- <version>2.0.14</version> -->
+				<!-- </plugin> -->
 				<!-- Site -->
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
@@ -342,27 +415,6 @@ limitations under the License.
 				</plugin>
 			</plugins>
 		</pluginManagement>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>plugin.xml</include>
-					<include>META-INF/**</include>
-					<include>WEB-INF/**</include>
-					<include>icons/**</include>
-					<include>branding/**</include>
-					<include>*.properties</include>
-					<include>properties/*.properties</include>
-					<include>p2.inf</include>
-				</includes>
-				<excludes>
-					<exclude>build.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -442,34 +494,34 @@ limitations under the License.
 					</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>
-			</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> -->
+			<!-- </plugin> -->
 		</plugins>
 	</build>
 	<dependencyManagement>
@@ -481,18 +533,52 @@ limitations under the License.
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<!-- Eclipse RAP -->
+			<dependency>
+				<groupId>org.argeo.tp.rap</groupId>
+				<artifactId>binaries</artifactId>
+				<version>${version.argeo-distribution}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp.rap.addons</groupId>
+				<artifactId>binaries</artifactId>
+				<version>${version.rap.addons}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp.rap.platform</groupId>
+				<artifactId>binaries</artifactId>
+				<version>${version.rap}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
 		<repository>
 			<id>argeo-tp</id>
-			<url>http://repo.argeo.org/data/public/java/org.argeo.tp-1.3.1</url>
+			<url>http://repo.argeo.org/data/public/java/argeo-tp-1.4</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>
@@ -506,7 +592,7 @@ limitations under the License.
 		</pluginRepository>
 		<pluginRepository>
 			<id>argeo-maven-plugins</id>
-			<url>http://repo.argeo.org/data/public/java/org.argeo.maven.plugins-1.1.x</url>
+			<url>http://repo.argeo.org/data/public/java/argeo-maven-1.1</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -517,13 +603,12 @@ limitations under the License.
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:https://repo.argeo.org/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
+			<url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
 		<site>
 			<id>site</id>
-			<name>Argeo Commons Site</name>
-			<url>dav:https://repo.argeo.org/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
+			<url>dav:https://repo.argeo.org/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
 		</site>
 	</distributionManagement>
 	<profiles>
@@ -533,12 +618,12 @@ limitations under the License.
 				<repository>
 					<id>localrepo</id>
 					<name>Internal Release Repository</name>
-					<url>dav:http://localhost:7070/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
+					<url>dav:http://localhost:7070/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/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
+					<url>dav:http://localhost:7070/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
 				</site>
 			</distributionManagement>
 		</profile>