From a1db5e07b64bd2aab400c8e8ead65b1568446a12 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 26 Jun 2012 15:55:22 +0000
Subject: [PATCH] Adapt to Argeo Distribution v1.3.1

git-svn-id: https://svn.argeo.org/commons/trunk@5360 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml | 25 ++++++++++++++++++-
 eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml | 24 ++++++++++++++++++
 pom.xml                                       |  6 ++---
 .../org.argeo.security.equinox/pom.xml        | 10 +++++---
 .../org.argeo.security.activemq/pom.xml       |  2 --
 .../dep/org.argeo.server.dep.activemq/pom.xml |  6 -----
 6 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
index 700bd8a5c..35ed06cc6 100644
--- a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -70,7 +70,6 @@
 		<dependency>
 			<groupId>org.argeo.tp.rap</groupId>
 			<artifactId>org.eclipse.rwt.widgets.upload</artifactId>
-			<version>1.0.0.argeo003</version>
 		</dependency>
 		<!-- Needed by the bundle above -->
 		<dependency>
@@ -84,7 +83,31 @@
 			<artifactId>javax.servlet</artifactId>
 		</dependency>
 
+		<!-- Security -->
+		<dependency>
+			<groupId>org.argeo.tp.rap</groupId>
+			<artifactId>org.eclipse.equinox.security</artifactId>
+		</dependency>
+
 	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.tp.rap</groupId>
+				<artifactId>binaries</artifactId>
+				<version>${version.argeo-distribution}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp.rap.platform</groupId>
+				<artifactId>binaries</artifactId>
+				<version>${version.argeo-distribution}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<profiles>
 		<profile>
 			<id>check-osgi</id>
diff --git a/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
index c89913230..d5761aba7 100644
--- a/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
+++ b/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
@@ -198,7 +198,31 @@ ex=*.source_*.jar,\
 				</exclusion>
 			</exclusions>
 		</dependency>
+
+		<!-- Security -->
+		<dependency>
+			<groupId>org.argeo.tp.rcp</groupId>
+			<artifactId>org.eclipse.equinox.security</artifactId>
+		</dependency>
 	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.tp.rcp</groupId>
+				<artifactId>binaries</artifactId>
+				<version>${version.argeo-distribution}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp.rcp.platform</groupId>
+				<artifactId>binaries</artifactId>
+				<version>${version.argeo-distribution}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<profiles>
 		<profile>
 			<id>check-osgi</id>
diff --git a/pom.xml b/pom.xml
index 82b6b7641..3ee72e6f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<properties>
 		<developmentCycle>1.1</developmentCycle>
 		<developmentCycle.startDate>2012-06-19</developmentCycle.startDate>
-		<version.argeo-distribution>1.3.0</version.argeo-distribution>
+		<version.argeo-distribution>1.3.1</version.argeo-distribution>
 		<version.argeo-commons>1.1.1-SNAPSHOT</version.argeo-commons>
 		<!-- distribution -->
 		<site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
@@ -398,7 +398,7 @@ limitations under the License.
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://dev.argeo.org/org.argeo.jcr.webapp/public/java/argeo-tp-1-staging</url>
+			<url>http://dev.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.tp-1.3.1</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -447,7 +447,7 @@ limitations under the License.
 				<snapshotRepository>
 					<id>localrepo.snapshots</id>
 					<name>Internal Snapshot Repository</name>
-					<url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
+					<url>dav:http://localhost:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.1
 					</url>
 				</snapshotRepository>
 			</distributionManagement>
diff --git a/security/plugins/org.argeo.security.equinox/pom.xml b/security/plugins/org.argeo.security.equinox/pom.xml
index d8756a531..1f5e2b49e 100644
--- a/security/plugins/org.argeo.security.equinox/pom.xml
+++ b/security/plugins/org.argeo.security.equinox/pom.xml
@@ -44,11 +44,13 @@
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
 		</dependency>
+		
+		<!-- RCP only dependency, needed at compile time -->
 		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.eclipse.equinox.security</artifactId>
-			<!-- FIXME until Equinox security is properly integrated -->
-			<version>1.0.200</version>
+			<groupId>org.argeo.commons.eclipse</groupId>
+			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+			<scope>provided</scope>
 		</dependency>
 
 		<!-- Commons -->
diff --git a/security/runtime/org.argeo.security.activemq/pom.xml b/security/runtime/org.argeo.security.activemq/pom.xml
index 0a0a2c64b..1ed9b8ab1 100644
--- a/security/runtime/org.argeo.security.activemq/pom.xml
+++ b/security/runtime/org.argeo.security.activemq/pom.xml
@@ -68,8 +68,6 @@
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.apache.activemq</artifactId>
-			<!-- FIXME until duplicated ActiveMQ is removed -->
-			<version>5.3.0.0001</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
diff --git a/server/dep/org.argeo.server.dep.activemq/pom.xml b/server/dep/org.argeo.server.dep.activemq/pom.xml
index 18f483d22..dc24b57b9 100644
--- a/server/dep/org.argeo.server.dep.activemq/pom.xml
+++ b/server/dep/org.argeo.server.dep.activemq/pom.xml
@@ -26,12 +26,6 @@
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.apache.activemq</artifactId>
-			<!-- FIXME until duplicated ActiveMQ is removed -->
-			<version>5.3.0.0001</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.apache.activemq.pool</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
-- 
2.30.2