X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=7493ec80e5bf9b69b5bd5225b70bbd7774fabe16;hb=58941a8eeab37c2b665543b1e53e3c842cbab6a5;hp=acee065dc02dcc07789fdebba888010e359b3c07;hpb=0b17aa5112d39ca8c41bbd5c2433d288835c515f;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index acee065dc..7493ec80e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,17 @@
 <?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.53-SNAPSHOT</version>
+	<version>2.1.71-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.53</version.argeo-commons>
+		<version.argeo-commons>2.1.71-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-distribution>2.1.20</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>
@@ -39,12 +40,14 @@
 		<module>org.argeo.ext.rap.ui.workbench</module>
 		<!-- Distribution -->
 		<module>dep</module>
+		<module>doc</module>
 		<module>dist</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>
@@ -108,6 +111,7 @@ limitations under the License.
 					<exclude>build.properties</exclude>
 					<exclude>*.bnd</exclude>
 					<exclude>*.target</exclude>
+					<exclude>**/*.xcf</exclude>
 				</excludes>
 			</resource>
 		</resources>
@@ -212,10 +216,10 @@ limitations under the License.
 						<autoVersionSubmodules>true</autoVersionSubmodules>
 					</configuration>
 				</plugin>
-				<plugin>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.10.1</version>
-				</plugin>
+				<!-- <plugin> -->
+				<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
+				<!-- <version>2.10.4</version> -->
+				<!-- </plugin> -->
 				<!-- Apache -->
 				<plugin>
 					<groupId>org.apache.felix</groupId>
@@ -273,50 +277,49 @@ limitations under the License.
 					<version>1.1.6</version>
 				</plugin>
 				<!-- Site -->
+
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.4</version>
+					<version>3.6</version>
 					<configuration>
-						<siteDirectory>doc/site</siteDirectory>
-						<generateSitemap>true</generateSitemap>
-						<skip>true</skip>
+						<!-- <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> -->
+							<!-- <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>
+								<version>2.10.4</version>
 								<configuration>
-									<failOnError>false</failOnError>
 									<encoding>UTF-8</encoding>
-									<excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
 									<detectLinks>true</detectLinks>
+									<sourcepath>src</sourcepath>
 									<links>
 										<!-- Java -->
-										<link>http://docs.oracle.com/javase/6/docs/api</link>
+										<link>http://docs.oracle.com/javase/8/docs/api</link>
 										<!-- OSGi -->
-										<link>http://www.osgi.org/javadoc/r4v42</link>
+										<link>http://www.osgi.org/javadoc/r5/core</link>
+										<link>http://www.osgi.org/javadoc/r5/enterprise</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>
+										<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/helios/topic/org.eclipse.platform.doc.isv/reference/api</link>
+										<link>http://help.eclipse.org/neon/topic/org.eclipse.platform.doc.isv/reference/api</link>
 									</links>
 								</configuration>
 								<reportSets>
@@ -331,12 +334,6 @@ limitations under the License.
 							<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>
@@ -365,12 +362,12 @@ limitations under the License.
 					</filesets>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
+			<!-- <plugin> -->
+			<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
+			<!-- <configuration> -->
+			<!-- <skip>true</skip> -->
+			<!-- </configuration> -->
+			<!-- </plugin> -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<configuration>
@@ -414,12 +411,19 @@ limitations under the License.
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp</groupId>
+				<artifactId>argeo-tp-rap-e4</artifactId>
+				<version>${version.argeo-distribution}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://forge.argeo.org/data/public/java/argeo-2.1/</url>
+			<url>http://forge.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -461,9 +465,13 @@ limitations under the License.
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:https://forge.argeo.org/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
+			<url>dav:https://forge.argeo.org/data/java/argeo-${developmentCycle.argeo-commons}</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
+		<site>
+			<id>staging</id>
+			<url>dav:https://forge.argeo.org/data/docs/argeo-${developmentCycle.argeo-commons}</url>
+		</site>
 	</distributionManagement>
 	<profiles>
 		<profile>
@@ -471,7 +479,7 @@ limitations under the License.
 			<repositories>
 				<repository>
 					<id>argeo</id>
-					<url>http://localhost:7080/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
+					<url>http://localhost:7080/data/java/argeo-2.1</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -482,11 +490,12 @@ limitations under the License.
 			<distributionManagement>
 				<repository>
 					<id>staging</id>
-					<url>dav:http://localhost:7080/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
+					<url>dav:http://localhost:7080/data/java/argeo-${developmentCycle.argeo-commons}</url>
+					<uniqueVersion>false</uniqueVersion>
 				</repository>
 				<site>
 					<id>staging</id>
-					<url>dav:http://localhost:7080/data/files/docs/argeo-${developmentCycle.argeo-commons}</url>
+					<url>dav:http://localhost:7080/data/docs/argeo-${developmentCycle.argeo-commons}</url>
 				</site>
 			</distributionManagement>
 		</profile>
@@ -504,8 +513,10 @@ 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>
@@ -530,8 +541,10 @@ 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>