X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=cab81d11715fa13905d17dd13a265b07bde5207e;hb=0ec5134a2a650d98b5ca56e7dad81dd252023052;hp=55b6d8ab462e6bd76ae3d9587aa8fa50379ac3b4;hpb=5330a39edafd14df2e6cdc57aae4e9393ebca75c;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 55b6d8ab4..cab81d117 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,19 @@
 <?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.69-SNAPSHOT</version>
+	<version>2.1.73-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.69-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.1.73-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>2.1.17</version.argeo-distribution>
+		<version.argeo-tp>2.1.20</version.argeo-tp>
 		<!-- RPM -->
 		<argeo.rpm.release>7</argeo.rpm.release>
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
+		<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>
@@ -30,7 +29,9 @@
 		<module>org.argeo.eclipse.ui.rap</module>
 		<!-- CMS -->
 		<module>org.argeo.node.api</module>
+		<module>org.argeo.maintenance</module>
 		<module>org.argeo.cms</module>
+		<module>org.argeo.cms.ui.theme</module>
 		<module>org.argeo.cms.ui</module>
 		<!-- CMS Workbench -->
 		<module>org.argeo.cms.ui.workbench</module>
@@ -40,6 +41,7 @@
 		<module>org.argeo.ext.rap.ui.workbench</module>
 		<!-- Distribution -->
 		<module>dep</module>
+		<module>doc</module>
 		<module>dist</module>
 	</modules>
 	<scm>
@@ -110,6 +112,7 @@ limitations under the License.
 					<exclude>build.properties</exclude>
 					<exclude>*.bnd</exclude>
 					<exclude>*.target</exclude>
+					<exclude>**/*.xcf</exclude>
 				</excludes>
 			</resource>
 		</resources>
@@ -275,75 +278,96 @@ limitations under the License.
 					<version>1.1.6</version>
 				</plugin>
 				<!-- Site -->
-
 				<plugin>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.6</version>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>3.0.0</version>
 					<configuration>
-						<!-- <siteDirectory>doc/site</siteDirectory> -->
-						<!-- <generateSitemap>true</generateSitemap> -->
-						<!-- <skip>false</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.4</version>
-								<configuration>
-									<encoding>UTF-8</encoding>
-									<detectLinks>true</detectLinks>
-									<sourcepath>src</sourcepath>
-									<links>
-										<!-- Java -->
-										<link>http://docs.oracle.com/javase/8/docs/api</link>
-										<!-- OSGi -->
-										<link>http://www.osgi.org/javadoc/r5/core</link>
-										<link>http://www.osgi.org/javadoc/r5/enterprise</link>
-										<!-- Spring -->
-										<link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link>
-										<!-- JCR -->
-										<link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link>
-										<!-- Eclipse -->
-										<link>http://help.eclipse.org/neon/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>
-								<reportSets>
-									<reportSet>
-										<id>aggregate</id>
-										<reports>
-											<report>aggregate</report>
-										</reports>
-									</reportSet>
-								</reportSets>
-							</plugin>
-						</reportPlugins>
+						<encoding>UTF-8</encoding>
+						<detectLinks>true</detectLinks>
+						<!-- <sourcepath>src</sourcepath> -->
+						<links>
+							<!-- Java -->
+							<link>http://docs.oracle.com/javase/8/docs/api</link>
+							<!-- OSGi -->
+							<link>http://www.osgi.org/javadoc/r5/core</link>
+							<link>http://www.osgi.org/javadoc/r5/enterprise</link>
+							<!-- Spring -->
+							<link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link>
+							<!-- JCR -->
+							<link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link>
+							<!-- Eclipse -->
+							<link>http://help.eclipse.org/neon/topic/org.eclipse.platform.doc.isv/reference/api</link>
+						</links>
 					</configuration>
 				</plugin>
+				<plugin>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.7</version>
+					<!-- <configuration> -->
+					<!-- <siteDirectory>doc/site</siteDirectory> -->
+					<!-- <generateSitemap>true</generateSitemap> -->
+					<!-- <skip>false</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>3.0.0</version> -->
+					<!-- <configuration> -->
+					<!-- <encoding>UTF-8</encoding> -->
+					<!-- <detectLinks>true</detectLinks> -->
+					<!-- <sourcepath>src</sourcepath> -->
+					<!-- <links> -->
+					<!-- Java -->
+					<!-- <link>http://docs.oracle.com/javase/8/docs/api</link> -->
+					<!-- OSGi -->
+					<!-- <link>http://www.osgi.org/javadoc/r5/core</link> -->
+					<!-- <link>http://www.osgi.org/javadoc/r5/enterprise</link> -->
+					<!-- Spring -->
+					<!-- <link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link> -->
+					<!-- JCR -->
+					<!-- <link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link> -->
+					<!-- Eclipse -->
+					<!-- <link>http://help.eclipse.org/neon/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> -->
+					<!-- <reportSets> -->
+					<!-- <reportSet> -->
+					<!-- <id>aggregate</id> -->
+					<!-- <reports> -->
+					<!-- <report>aggregate</report> -->
+					<!-- </reports> -->
+					<!-- </reportSet> -->
+					<!-- </reportSets> -->
+					<!-- </plugin> -->
+					<!-- </reportPlugins> -->
+					<!-- </configuration> -->
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -376,7 +400,7 @@ limitations under the License.
 				<artifactId>maven-site-plugin</artifactId>
 				<inherited>false</inherited>
 				<configuration>
-					<skip>true</skip>
+					<skip>false</skip>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -396,7 +420,7 @@ 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>
 		</dependency>
 	</dependencies>
@@ -405,7 +429,14 @@ limitations under the License.
 			<dependency>
 				<groupId>org.argeo.tp</groupId>
 				<artifactId>argeo-tp</artifactId>
-				<version>${version.argeo-distribution}</version>
+				<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>
@@ -464,13 +495,86 @@ limitations under the License.
 			<url>dav:https://forge.argeo.org/data/docs/argeo-${developmentCycle.argeo-commons}</url>
 		</site>
 	</distributionManagement>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<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>
+					<encoding>UTF-8</encoding>
+					<detectLinks>true</detectLinks>
+					<!-- <sourcepath>src</sourcepath> -->
+					<links>
+						<!-- Java -->
+						<link>http://docs.oracle.com/javase/8/docs/api</link>
+						<!-- OSGi -->
+						<link>http://www.osgi.org/javadoc/r5/core</link>
+						<link>http://www.osgi.org/javadoc/r5/enterprise</link>
+						<!-- Spring -->
+						<link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link>
+						<!-- JCR -->
+						<link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link>
+						<!-- Eclipse -->
+						<link>http://help.eclipse.org/neon/topic/org.eclipse.platform.doc.isv/reference/api</link>
+					</links>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<id>aggregate-javadoc</id>
+						<inherited>false</inherited>
+						<reports>
+							<report>aggregate</report>
+						</reports>
+					</reportSet>
+					<reportSet>
+						<id>javadoc</id>
+						<reports>
+						</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>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+		</plugins>
+	</reporting>
 	<profiles>
 		<profile>
 			<id>localrepo</id>
 			<repositories>
 				<repository>
 					<id>argeo</id>
-					<url>http://localhost:7080/data/java/argeo-${developmentCycle.argeo-commons}</url>
+					<url>http://localhost:7080/data/java/argeo-2.1</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -482,6 +586,7 @@ limitations under the License.
 				<repository>
 					<id>staging</id>
 					<url>dav:http://localhost:7080/data/java/argeo-${developmentCycle.argeo-commons}</url>
+					<uniqueVersion>false</uniqueVersion>
 				</repository>
 				<site>
 					<id>staging</id>
@@ -503,10 +608,8 @@ limitations under the License.
 								</goals>
 								<configuration>
 									<target>
-										<copy todir="${argeo.rpm.stagingRepository}" quiet="true"
-											failonerror="false">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
+										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
+											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>
@@ -531,10 +634,8 @@ limitations under the License.
 								</goals>
 								<configuration>
 									<target>
-										<copy todir="${argeo.rpm.stagingRepository}" quiet="true"
-											failonerror="false">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
+										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
+											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>