X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=35cbabaa92a1564ba7100b5c5e81e072598c6b48;hb=06acf73a99f0e3908fe8998f1ff08dee109c5562;hp=09c194dae4c3ae2b264877690f1fd54fc2ecde63;hpb=0529e574ae45e311922957283be10a9364cd4f8c;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 09c194dae..35cbabaa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,21 +1,23 @@
 <?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.36-SNAPSHOT</version>
+	<version>2.1.45-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.36-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.1.45-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>
+		<version.argeo-distribution>2.1.15</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>
-		<!-- encoding, see http://is.gd/mvn_source_encoding -->
+		<!-- Encoding, see http://is.gd/mvn_source_encoding -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.scm.id>code.argeo.org</project.scm.id>
 	</properties>
 	<modules>
 		<!-- Base -->
@@ -24,12 +26,13 @@
 		<module>org.argeo.server.jcr</module>
 		<!-- Security -->
 		<module>org.argeo.security.core</module>
-		<module>org.argeo.security.jackrabbit</module>
 		<!-- Eclipse -->
 		<module>org.argeo.eclipse.ui</module>
 		<module>org.argeo.eclipse.ui.rap</module>
 		<!-- CMS -->
+		<module>org.argeo.cms.api</module>
 		<module>org.argeo.cms</module>
+		<module>org.argeo.security.jackrabbit</module>
 		<!-- Workbench -->
 		<module>org.argeo.eclipse.ui.workbench</module>
 		<module>org.argeo.eclipse.ui.workbench.rap</module>
@@ -54,7 +57,7 @@
 			<comments><![CDATA[
 Argeo Commons Enterprise Framework
 			   
-Copyright (C) 2007-2012 Argeo GmbH
+Copyright (C) 2007-2016 Argeo GmbH
 
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -219,7 +222,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>2.3.7</version>
+					<version>3.0.1</version>
 					<extensions>true</extensions>
 					<configuration>
 						<manifestLocation>META-INF</manifestLocation>
@@ -414,14 +417,25 @@ limitations under the License.
 	</dependencyManagement>
 	<repositories>
 		<repository>
-			<id>argeo-tp</id>
-			<url>http://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
+			<id>argeo</id>
+			<url>http://forge.argeo.org/data/public/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
+		<!-- Disable Maven default repository -->
+		<repository>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
@@ -446,7 +460,7 @@ limitations under the License.
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+			<url>dav:https://forge.argeo.org/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
 	</distributionManagement>
@@ -455,8 +469,8 @@ 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</id>
+					<url>http://localhost:7070/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -467,11 +481,11 @@ limitations under the License.
 			<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,8 +503,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>
@@ -515,8 +531,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>