From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 14 Sep 2016 17:17:22 +0000 (+0000)
Subject: Adapt to changes in Commons
X-Git-Tag: argeo-slc-2.1.7~40
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=bd8889c00f4b8264d990d8b75471c3a7aaec6c95;p=gpl%2Fargeo-slc.git

Adapt to changes in Commons

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

diff --git a/dep/pom.xml b/dep/pom.xml
index 924130d24..d936bff27 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -24,6 +24,13 @@
 			</plugin>
 		</plugins>
 	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 	<profiles>
 		<profile>
 			<id>check-osgi</id>
diff --git a/org.argeo.slc.client.rap/pom.xml b/org.argeo.slc.client.rap/pom.xml
index 495658c5f..5808760a3 100644
--- a/org.argeo.slc.client.rap/pom.xml
+++ b/org.argeo.slc.client.rap/pom.xml
@@ -20,7 +20,7 @@
 		<!-- Argeo common distribution for Secured UI -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui.rap</artifactId>
+			<artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 	</dependencies>
diff --git a/org.argeo.slc.client.ui.dist/pom.xml b/org.argeo.slc.client.ui.dist/pom.xml
index 31685bbee..bb94b7946 100644
--- a/org.argeo.slc.client.ui.dist/pom.xml
+++ b/org.argeo.slc.client.ui.dist/pom.xml
@@ -24,7 +24,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui</artifactId>
+			<artifactId>org.argeo.cms.ui.workbench</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 
diff --git a/org.argeo.slc.client.ui/pom.xml b/org.argeo.slc.client.ui/pom.xml
index b091688c9..c56121131 100644
--- a/org.argeo.slc.client.ui/pom.xml
+++ b/org.argeo.slc.client.ui/pom.xml
@@ -36,7 +36,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui</artifactId>
+			<artifactId>org.argeo.cms.ui.workbench</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 	</dependencies>
diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml
index ae1236626..867f3c53c 100644
--- a/org.argeo.slc.core/pom.xml
+++ b/org.argeo.slc.core/pom.xml
@@ -23,12 +23,17 @@
 		<!-- Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.util</artifactId>
+			<artifactId>org.argeo.enterprise</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.jcr</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.core</artifactId>
+			<artifactId>org.argeo.util</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 
diff --git a/org.argeo.slc.repo/pom.xml b/org.argeo.slc.repo/pom.xml
index 9fc503fa5..1508c7bb9 100644
--- a/org.argeo.slc.repo/pom.xml
+++ b/org.argeo.slc.repo/pom.xml
@@ -24,7 +24,7 @@
 		<!-- Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.server.jcr</artifactId>
+			<artifactId>org.argeo.jcr</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 	</dependencies>
diff --git a/pom.xml b/pom.xml
index cc024caf9..7eb3b8f7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.45</version>
+		<version>2.1.46-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>