X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=68a03980970e2391adb9ae586d13e20a04378ba7;hb=4d4713b376a8f38c996e2e0d3a199bbc42bfd8ef;hp=3b54e609104084f3b0a9ccd42ddeb1a3861dd0a0;hpb=6d06f51b7468bf8fcfd63447bfcf77b9d4268fa9;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 3b54e6091..68a039809 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>1.1.9-SNAPSHOT</version>
+	<version>2.1.5-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<description>Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring</description>
 	<packaging>pom</packaging>
 	<properties>
-		<developmentCycle.argeo-commons>1.1</developmentCycle.argeo-commons>
-		<developmentCycle.argeo-commons.startDate>2012-06-19</developmentCycle.argeo-commons.startDate>
-		<version.argeo-distribution>1.3.1</version.argeo-distribution>
-		<version.argeo-commons>1.1.9-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>1.4.0</version.argeo-distribution>
+		<version.argeo-commons>2.1.4</version.argeo-commons>
 		<!-- RPM -->
 		<rpm.release>6</rpm.release>
-		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/6/x86_64</rpm.stagingRepository>
+		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
 		<!-- encoding, see http://is.gd/mvn_source_encoding -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -107,6 +107,8 @@ limitations under the License.
 					<include>WEB-INF/**</include>
 					<include>icons/**</include>
 					<include>branding/**</include>
+					<include>img/**</include>
+					<include>theme/**</include>
 					<include>*.properties</include>
 					<include>properties/*.properties</include>
 					<include>p2.inf</include>
@@ -485,7 +487,16 @@ limitations under the License.
 	<repositories>
 		<repository>
 			<id>argeo-tp</id>
-			<url>http://repo.argeo.org/data/public/java/org.argeo.tp-1.3.1</url>
+			<url>http://repo.argeo.org/data/public/java/org.argeo.tp-1.4.x</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+		</repository>
+		<repository>
+			<id>argeo-tp-rap</id>
+			<url>http://repo.argeo.org/data/public/java/org.argeo.tp.rap-2.1.x</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -521,7 +532,6 @@ limitations under the License.
 		</repository>
 		<site>
 			<id>site</id>
-			<name>Argeo Commons Site</name>
 			<url>dav:https://repo.argeo.org/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
 		</site>
 	</distributionManagement>