X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=20a3075cba4b5dad04c932e083e0e648ce29956c;hb=a667d43d6a3ccef0e701320e9a61e50d8608615e;hp=a4ed4009a3b4a44aad086cdcc3fb013d7172e359;hpb=06ebecee6d33c366852eb95e3dba12c1709c6667;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index a4ed4009a..20a3075cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,17 +1,14 @@
 <?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.74-SNAPSHOT</version>
+	<version>2.1.76-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.74-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-commons>2.1.76-SNAPSHOT</version.argeo-commons>
 		<version.argeo-tp>2.1.20</version.argeo-tp>
 		<!-- RPM -->
 		<argeo.rpm.release>7</argeo.rpm.release>
@@ -222,6 +219,16 @@ limitations under the License.
 					<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>
 					<artifactId>maven-release-plugin</artifactId>
 					<version>2.5.1</version>
@@ -373,17 +380,6 @@ limitations under the License.
 			</releases>
 		</pluginRepository>
 	</pluginRepositories>
-	<distributionManagement>
-		<repository>
-			<id>staging</id>
-			<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>
 	<reporting>
 		<plugins>
 			<plugin>
@@ -428,7 +424,7 @@ limitations under the License.
 					</reportSet>
 					<reportSet>
 						<id>javadoc</id>
-						<reports></reports>
+						<reports />
 					</reportSet>
 				</reportSets>
 			</plugin>
@@ -445,12 +441,23 @@ limitations under the License.
 					</reportSet>
 					<reportSet>
 						<id>jxr</id>
-						<reports></reports>
+						<reports />
 					</reportSet>
 				</reportSets>
 			</plugin>
 		</plugins>
 	</reporting>
+	<distributionManagement>
+		<repository>
+			<id>staging</id>
+			<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>
@@ -466,10 +473,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>
@@ -494,10 +499,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>
@@ -524,14 +527,9 @@ limitations under the License.
 			<distributionManagement>
 				<repository>
 					<id>staging</id>
-					<url>dav:http://localhost:7080/data/java/argeo-${developmentCycle.argeo-commons}</url>
+					<url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
 					<uniqueVersion>false</uniqueVersion>
 				</repository>
-				<site>
-					<id>staging</id>
-<!-- 					<url>dav:http://localhost:7080/data/docs/argeo-${developmentCycle.argeo-commons}</url> -->
-					<url>file:///home/mbaudier/tmp/site</url>
-				</site>
 			</distributionManagement>
 		</profile>
 	</profiles>