X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=5eb1ead88d69d7b4a199f0d989853cdd21799930;hb=3a49a9abea074b23e8d543ff1084b4adfbe863a0;hp=888fd7a9efde8c2421895741d1e558ffc2e5fc46;hpb=e01612eb49c5e0d32095b86c623cd35bf0995f99;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 888fd7a9e..5eb1ead88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,17 +1,16 @@
 <?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.46-SNAPSHOT</version>
+	<version>2.1.50-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.46-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.1.50-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.15</version.argeo-distribution>
+		<version.argeo-distribution>2.1.17</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>
@@ -257,6 +256,9 @@ limitations under the License.
 						<distribution>argeo${argeo.rpm.release}</distribution>
 						<group>Applications/System</group>
 						<prefix>/usr</prefix>
+						<!-- <copyTo>${argeo.rpm.stagingRepository}</copyTo> -->
+						<defaultDirMode>755</defaultDirMode>
+						<defaultFileMode>644</defaultFileMode>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -268,7 +270,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>1.1.5</version>
+					<version>1.1.6</version>
 				</plugin>
 				<!-- Site -->
 				<plugin>
@@ -469,7 +471,7 @@ limitations under the License.
 			<repositories>
 				<repository>
 					<id>argeo</id>
-					<url>http://localhost:7070/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
+					<url>http://localhost:7080/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -480,11 +482,11 @@ limitations under the License.
 			<distributionManagement>
 				<repository>
 					<id>staging</id>
-					<url>dav:http://localhost:7070/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
+					<url>dav:http://localhost:7080/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
 				</repository>
 				<site>
 					<id>staging</id>
-					<url>dav:http://localhost:7070/data/files/docs/argeo-${developmentCycle.argeo-commons}</url>
+					<url>dav:http://localhost:7080/data/files/docs/argeo-${developmentCycle.argeo-commons}</url>
 				</site>
 			</distributionManagement>
 		</profile>
@@ -502,10 +504,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>
@@ -530,10 +530,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>