X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=1ee70b4bd7c9cfeb27474b1050574eb2ce83beea;hb=4623255545604da910bd65c979870a02955872eb;hp=e445c204536793698e8edf063c76a82b8ca8a5f0;hpb=1cea4bf33030203dbd858d7d0665a1ba806da591;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index e445c2045..1ee70b4bd 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.31-SNAPSHOT</version>
+	<version>2.1.33-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.31-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.1.33-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.12</version.argeo-distribution>
 		<!-- RPM -->
-		<argeo.rpm.release>6</argeo.rpm.release>
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</argeo.rpm.stagingRepository>
+		<argeo.rpm.release>7</argeo.rpm.release>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
 		<!-- encoding, see http://is.gd/mvn_source_encoding -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -77,7 +76,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>
@@ -249,7 +248,7 @@ limitations under the License.
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>rpm-maven-plugin</artifactId>
 					<version>2.1.4</version>
-<!-- 					<version>2.1-alpha-1</version> -->
+					<!-- <version>2.1-alpha-1</version> -->
 					<extensions>true</extensions>
 					<configuration>
 						<version>${project.version}</version>
@@ -272,7 +271,7 @@ limitations under the License.
 				<!-- Site -->
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.0</version>
+					<version>3.4</version>
 					<configuration>
 						<siteDirectory>doc/site</siteDirectory>
 						<generateSitemap>true</generateSitemap>
@@ -281,7 +280,7 @@ limitations under the License.
 							<plugin>
 								<groupId>org.apache.maven.plugins</groupId>
 								<artifactId>maven-project-info-reports-plugin</artifactId>
-								<version>2.4</version>
+								<version>2.8.1</version>
 								<reportSets>
 									<reportSet>
 										<reports>
@@ -295,8 +294,9 @@ limitations under the License.
 							</plugin>
 							<plugin>
 								<artifactId>maven-javadoc-plugin</artifactId>
-								<version>2.8.1</version>
+								<version>2.10.3</version>
 								<configuration>
+									<failOnError>false</failOnError>
 									<encoding>UTF-8</encoding>
 									<excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
 									<detectLinks>true</detectLinks>
@@ -326,7 +326,7 @@ limitations under the License.
 							</plugin>
 							<plugin>
 								<artifactId>maven-jxr-plugin</artifactId>
-								<version>2.3</version>
+								<version>2.5</version>
 								<configuration>
 									<excludes>
 										<exclude>**/demo/**/*</exclude>
@@ -455,8 +455,8 @@ limitations under the License.
 			<id>localrepo</id>
 			<repositories>
 				<repository>
-					<id>argeo-tp</id>
-					<url>http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/</url>
+					<id>staging</id>
+					<url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -467,9 +467,12 @@ 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:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
 				</repository>
+				<site>
+					<id>staging</id>
+					<url>dav:http://localhost:7070/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
+				</site>
 			</distributionManagement>
 		</profile>
 		<profile>
@@ -487,8 +490,7 @@ limitations under the License.
 								<configuration>
 									<target>
 										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
+											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>
@@ -514,8 +516,7 @@ limitations under the License.
 								<configuration>
 									<target>
 										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
+											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>