From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 11 Dec 2012 11:26:37 +0000 (+0000)
Subject: Adapt to Argeo Distribution v1.4.0
X-Git-Tag: argeo-commons-2.1.30~703
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=cf6bd5e72ca4420abde34abc5433824fe537ecbe;p=lgpl%2Fargeo-commons.git

Adapt to Argeo Distribution v1.4.0

git-svn-id: https://svn.argeo.org/commons/trunk@5953 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/base/dep/org.argeo.eclipse.dep.rap/pom.xml b/base/dep/org.argeo.eclipse.dep.rap/pom.xml
index 50b226983..3a36fcd0f 100644
--- a/base/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/base/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -64,6 +64,16 @@
 					<groupId>org.argeo.tp.rap.platform</groupId>
 					<artifactId>org.eclipse.rap.design.example</artifactId>
 				</exclusion>
+				
+				<!-- Troublesome bundles -->
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.jdt.junit.runtime</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.rap.junit.runtime</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
diff --git a/pom.xml b/pom.xml
index 3b54e6091..8aa6f67b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?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>
@@ -10,7 +11,7 @@
 	<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-distribution>1.4.0</version.argeo-distribution>
 		<version.argeo-commons>1.1.9-SNAPSHOT</version.argeo-commons>
 		<!-- RPM -->
 		<rpm.release>6</rpm.release>
@@ -485,7 +486,7 @@ 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>