X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=854638ffe0e677f1c68312a6040748987cce4a10;hb=fba40295a1ebb9a7e1da5ccf5b1e715843f5f466;hp=79cf1f35f19f1161a313faaedeca835f2aa9bbb9;hpb=4ad2e1af45a7c3a4d398e98c8bd04b88a7caebe2;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 79cf1f35f..854638ffe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,49 +1,63 @@
 <?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>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.28-SNAPSHOT</version>
+	<version>2.1.80-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
+	<!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
 	<properties>
-		<version.argeo-commons>2.1.27</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.8</version.argeo-distribution>
+		<version.argeo-commons>2.1.80</version.argeo-commons>
+		<version.argeo-tp>2.1.24</version.argeo-tp>
 		<!-- RPM -->
-		<rpm.release>6</rpm.release>
-		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
-		<!-- encoding, see http://is.gd/mvn_source_encoding -->
+		<argeo.rpm.release>7</argeo.rpm.release>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
+		<!-- Encoding, see http://is.gd/mvn_source_encoding -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.scm.id>code.argeo.org</project.scm.id>
 	</properties>
 	<modules>
 		<!-- Base -->
 		<module>org.argeo.util</module>
+		<module>org.argeo.enterprise</module>
+		<module>org.argeo.jcr</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.core</module>
 		<!-- Eclipse -->
 		<module>org.argeo.eclipse.ui</module>
 		<module>org.argeo.eclipse.ui.rap</module>
 		<!-- CMS -->
+		<module>org.argeo.node.api</module>
+		<module>org.argeo.maintenance</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.ui</module>
-		<module>org.argeo.security.ui.admin</module>
-		<module>org.argeo.security.ui.rap</module>
+		<module>org.argeo.cms.ui.theme</module>
+		<module>org.argeo.cms.ui</module>
+		<!-- CMS E4 -->
+		<module>org.argeo.cms.e4</module>
+		<module>org.argeo.cms.e4.rap</module>
+		<!-- CMS Workbench -->
+		<module>org.argeo.cms.ui.workbench</module>
+		<module>org.argeo.cms.ui.workbench.rap</module>
+		<!-- Third Parties Extensions -->
+		<module>org.argeo.ext.jackrabbit</module>
+		<module>org.argeo.ext.equinox.jetty</module>
+		<module>org.argeo.ext.rap.ui.workbench</module>
 		<!-- Distribution -->
+		<module>maven</module>
 		<module>dep</module>
+		<module>demo</module>
+		<module>doc</module>
 		<module>dist</module>
+		<module>rcp</module>
 	</modules>
 	<scm>
-		<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>
+		<connection>scm:git:http://git.argeo.org/apache2/argeo-commons.git</connection>
+		<url>http://git.argeo.org/?p=apache2/argeo-commons.git;a=summary</url>
+		<developerConnection>scm:git:https://code.argeo.org/git/apache2/argeo-commons.git</developerConnection>
+		<tag>HEAD</tag>
 	</scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -54,7 +68,7 @@
 			<comments><![CDATA[
 Argeo Commons Enterprise Framework
 			   
-Copyright (C) 2007-2012 Argeo GmbH
+Copyright (C) 2007-2016 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.
@@ -76,7 +90,7 @@ limitations under the License.
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-webdav-jackrabbit</artifactId>
-				<version>2.8</version>
+				<version>2.10</version>
 			</extension>
 		</extensions>
 		<sourceDirectory>src</sourceDirectory>
@@ -107,6 +121,7 @@ limitations under the License.
 					<exclude>build.properties</exclude>
 					<exclude>*.bnd</exclude>
 					<exclude>*.target</exclude>
+					<exclude>**/*.xcf</exclude>
 				</excludes>
 			</resource>
 		</resources>
@@ -126,10 +141,10 @@ limitations under the License.
 				<!-- Maven -->
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.2</version>
+					<version>3.3</version>
 					<configuration>
-						<source>1.7</source>
-						<target>1.7</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>
@@ -141,30 +156,10 @@ limitations under the License.
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-compiler-eclipse</artifactId>
-							<version>2.3</version>
+							<version>2.6</version>
 						</dependency>
 					</dependencies>
 				</plugin>
-				<plugin>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.4</version>
-					<executions>
-						<execution>
-							<id>attach-sources</id>
-							<phase>package</phase>
-							<goals>
-								<goal>jar</goal>
-							</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>
@@ -192,9 +187,21 @@ limitations under the License.
 						</archive>
 					</configuration>
 				</plugin>
+				<plugin>
+					<artifactId>maven-source-plugin</artifactId>
+					<version>3.1.0</version>
+					<configuration>
+						<excludes>
+							<exclude>**/*.class</exclude>
+							<!-- Prevents source jars to contain misleading data -->
+							<exclude>plugin.xml</exclude>
+							<exclude>META-INF/MANIFEST.MF</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
 				<plugin>
 					<artifactId>maven-antrun-plugin</artifactId>
-					<version>1.7</version>
+					<version>1.8</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-resources-plugin</artifactId>
@@ -204,6 +211,25 @@ limitations under the License.
 					<artifactId>maven-dependency-plugin</artifactId>
 					<version>2.9</version>
 				</plugin>
+				<plugin>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.7</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>3.0.0</version>
+					<configuration>
+						<failOnError>false</failOnError>
+						<additionalJOption>-Xdoclint:none</additionalJOption>
+						<excludePackageNames>*.internal.*,org.eclipse.*</excludePackageNames>
+						<encoding>UTF-8</encoding>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>pl.project13.maven</groupId>
+					<artifactId>git-commit-id-plugin</artifactId>
+					<version>3.0.0</version>
+				</plugin>
 				<plugin>
 					<artifactId>maven-release-plugin</artifactId>
 					<version>2.5.1</version>
@@ -211,15 +237,10 @@ limitations under the License.
 						<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>
+					<version>3.0.1</version>
 					<extensions>true</extensions>
 					<configuration>
 						<manifestLocation>META-INF</manifestLocation>
@@ -227,10 +248,14 @@ limitations under the License.
 							<_include>bnd.bnd</_include>
 							<Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
 							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-							<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+							<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
 							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
-							<!-- SLC specific instructions -->
+							<Automatic-Module-Name>${project.artifactId}</Automatic-Module-Name>
 							<SLC-Category>${project.groupId}</SLC-Category>
+							<!-- Git metadata -->
+							<!-- <SLC-Git-Commit-Id>${git.commit.id}</SLC-Git-Commit-Id> -->
+							<!-- <SLC-Git-Commit-Describe>${git.commit.id.describe}</SLC-Git-Commit-Describe> -->
+							<!-- <SLC-Git-Commit-Count>${git.closest.tag.commit.count}</SLC-Git-Commit-Count> -->
 						</instructions>
 					</configuration>
 					<executions>
@@ -247,14 +272,16 @@ limitations under the License.
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>rpm-maven-plugin</artifactId>
-					<version>2.1-alpha-1</version>
+					<version>2.1.4</version>
 					<extensions>true</extensions>
 					<configuration>
 						<version>${project.version}</version>
-						<release>1.el${rpm.release}</release>
-						<distribution>argeo${rpm.release}</distribution>
+						<distribution>argeo${argeo.rpm.release}</distribution>
 						<group>Applications/System</group>
 						<prefix>/usr</prefix>
+						<defaultDirMode>755</defaultDirMode>
+						<defaultFileMode>644</defaultFileMode>
+						<autoRequires>false</autoRequires>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -265,84 +292,8 @@ limitations under the License.
 				<!-- Argeo -->
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
-					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>1.1.4</version>
-				</plugin>
-				<!-- Site -->
-				<plugin>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.0</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.4</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.8.1</version>
-								<configuration>
-									<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.3</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>
+					<artifactId>argeo-osgi-plugin</artifactId>
+					<version>2.1.1</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -360,12 +311,19 @@ limitations under the License.
 					</filesets>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
+			<!-- <plugin> -->
+			<!-- <groupId>pl.project13.maven</groupId> -->
+			<!-- <artifactId>git-commit-id-plugin</artifactId> -->
+			<!-- <executions> -->
+			<!-- <execution> -->
+			<!-- <id>get-the-git-infos</id> -->
+			<!-- <goals> -->
+			<!-- <goal>revision</goal> -->
+			<!-- </goals> -->
+			<!-- <phase>initialize</phase> -->
+			<!-- </execution> -->
+			<!-- </executions> -->
+			<!-- </plugin> -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<configuration>
@@ -379,6 +337,19 @@ limitations under the License.
 					<skip>false</skip>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<artifactId>maven-release-plugin</artifactId>
 				<configuration>
@@ -396,14 +367,38 @@ limitations under the License.
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>argeo-tp</artifactId>
-			<version>${version.argeo-distribution}</version>
+			<version>${version.argeo-tp}</version>
 			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.argeo.tp.apache</groupId>
+					<artifactId>org.apache.xerces</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>argeo-tp</artifactId>
+				<version>${version.argeo-tp}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>argeo-tp-rap-e4</artifactId>
+				<version>${version.argeo-tp}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<repositories>
 		<repository>
-			<id>argeo-tp</id>
-			<url>https://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
+			<id>argeo</id>
+			<url>http://repo.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -412,18 +407,9 @@ limitations under the License.
 		</repository>
 	</repositories>
 	<pluginRepositories>
-		<pluginRepository>
-			<id>central</id>
-			<url>http://repo1.maven.org/maven2</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-		</pluginRepository>
 		<pluginRepository>
 			<id>argeo-maven-plugins</id>
-			<url>http://repo.argeo.org/data/public/java/argeo-maven-1.1</url>
+			<url>http://repo.argeo.org/data/java/argeo-2.1</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -431,20 +417,147 @@ limitations under the License.
 			</releases>
 		</pluginRepository>
 	</pluginRepositories>
+	<reporting>
+		<plugins>
+			<plugin>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.9</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>3.0.0</version>
+				<configuration>
+					<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>
+				<artifactId>maven-jxr-plugin</artifactId>
+				<version>2.5</version>
+				<reportSets>
+					<reportSet>
+						<id>aggregate-jxr</id>
+						<inherited>false</inherited>
+						<reports>
+							<report>aggregate</report>
+						</reports>
+					</reportSet>
+					<reportSet>
+						<id>jxr</id>
+						<reports />
+					</reportSet>
+				</reportSets>
+			</plugin>
+		</plugins>
+	</reporting>
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+			<url>dav:https://forge.argeo.org/data/java/argeo-2.1/</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
+		<site>
+			<id>staging</id>
+			<url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
+		</site>
 	</distributionManagement>
 	<profiles>
+		<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>
 		<profile>
 			<id>localrepo</id>
 			<repositories>
 				<repository>
-					<id>argeo-tp</id>
-					<url>http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/</url>
+					<id>argeo</id>
+					<url>http://localhost:7080/data/java/argeo-2.1</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -455,8 +568,8 @@ limitations under the License.
 			<distributionManagement>
 				<repository>
 					<id>staging</id>
-					<name>Internal Release Repository</name>
-					<url>dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+					<url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
+					<uniqueVersion>false</uniqueVersion>
 				</repository>
 			</distributionManagement>
 		</profile>