X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=6b4ef25db41ab12b01721f4037387a07cfbb273b;hb=fc005681c72e67ee57d2f89f4ce5485e660d5acf;hp=8e26fb261aaf73ef119885d563d6e1002b24975d;hpb=7d7b92206bea0a5b92f15823f0d6490306e7e28b;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 8e26fb261..6b4ef25db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,13 @@
 <?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.32-SNAPSHOT</version>
+	<version>2.1.40-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.32-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.1.39</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.12</version.argeo-distribution>
@@ -297,6 +296,7 @@ limitations under the License.
 								<artifactId>maven-javadoc-plugin</artifactId>
 								<version>2.10.3</version>
 								<configuration>
+									<failOnError>false</failOnError>
 									<encoding>UTF-8</encoding>
 									<excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
 									<detectLinks>true</detectLinks>
@@ -455,23 +455,32 @@ limitations under the License.
 			<id>localrepo</id>
 			<repositories>
 				<repository>
-					<id>staging</id>
-					<url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+					<id>argeo-tp</id>
+					<url>http://localhost:7070/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
 						<checksumPolicy>warn</checksumPolicy>
 					</releases>
 				</repository>
+<!-- 				<repository> -->
+<!-- 					<id>staging</id> -->
+<!-- 					<url>dav:http://localhost:7070/data/files/java/argeo-${developmentCycle.argeo-commons}</url> -->
+<!-- 					<releases> -->
+<!-- 						<enabled>true</enabled> -->
+<!-- 						<updatePolicy>daily</updatePolicy> -->
+<!-- 						<checksumPolicy>warn</checksumPolicy> -->
+<!-- 					</releases> -->
+<!-- 				</repository> -->
 			</repositories>
 			<distributionManagement>
 				<repository>
 					<id>staging</id>
-					<url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+					<url>dav:http://localhost:7070/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
 				</repository>
 				<site>
 					<id>staging</id>
-					<url>dav:http://localhost:7070/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
+					<url>dav:http://localhost:7070/data/files/docs/argeo-${developmentCycle.argeo-commons}</url>
 				</site>
 			</distributionManagement>
 		</profile>
@@ -489,10 +498,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>
@@ -517,10 +524,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>