From a5b25ca3e5efc8de3571993f6bfc1671c0e2f3ba Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 17 Jul 2012 13:21:10 +0000
Subject: [PATCH] Adapt to new Commons structure

git-svn-id: https://svn.argeo.org/slc/trunk@5489 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 eclipse/plugins/org.argeo.slc.client.rap/pom.xml     | 2 +-
 eclipse/plugins/org.argeo.slc.client.rcp/pom.xml     | 2 +-
 eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml | 6 +++---
 eclipse/plugins/org.argeo.slc.client.ui/pom.xml      | 8 ++++----
 pom.xml                                              | 2 +-
 runtime/org.argeo.slc.core/pom.xml                   | 8 ++++----
 runtime/org.argeo.slc.launcher/pom.xml               | 2 +-
 runtime/org.argeo.slc.unit/pom.xml                   | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/eclipse/plugins/org.argeo.slc.client.rap/pom.xml b/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
index c038b00cd..41d404619 100644
--- a/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
@@ -20,7 +20,7 @@
 
 		<!-- Argeo common distribution for RAP projects -->
 		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 			<exclusions>
diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml b/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
index fcdd23059..bf734da5f 100644
--- a/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
@@ -47,7 +47,7 @@
 
 		<!-- Security UI -->
 		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml b/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml
index d16304e44..9b9e0a8b3 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/pom.xml
@@ -14,17 +14,17 @@
 	<dependencies>
 		<!-- Commons UI -->
 		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.eclipse.ui</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.eclipse.ui.jcr</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.eclipse.ui.rcp</artifactId>
 			<version>${version.argeo-commons}</version>
 			<scope>provided</scope>
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/pom.xml b/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
index 4271325e9..98b8880f2 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
@@ -44,25 +44,25 @@
 
 		<!-- Argeo Eclipse -->
 		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.eclipse.ui</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.eclipse.ui.jcr</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 
 		<!-- Eclipse and RCP only dependency, needed at compile time -->
 		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.eclipse.ui.rcp</artifactId>
 			<version>${version.argeo-commons}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.eclipse</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
 			<version>${version.argeo-commons}</version>
 			<scope>provided</scope>
diff --git a/pom.xml b/pom.xml
index 4e2b70259..a390fcf96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>1.1.3</version>
+		<version>1.1.4-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
diff --git a/runtime/org.argeo.slc.core/pom.xml b/runtime/org.argeo.slc.core/pom.xml
index 90bd70f4f..d86045f61 100644
--- a/runtime/org.argeo.slc.core/pom.xml
+++ b/runtime/org.argeo.slc.core/pom.xml
@@ -45,8 +45,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
-			<artifactId>org.argeo.basic.nodeps</artifactId>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.util</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 
@@ -73,8 +73,8 @@
 			<artifactId>slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
-			<artifactId>org.argeo.basic.dep.log4j</artifactId>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.dep.log4j</artifactId>
 			<version>${version.argeo-commons}</version>
 			<type>pom</type>
 		</dependency>
diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml
index 3f143d73a..e04c7738c 100644
--- a/runtime/org.argeo.slc.launcher/pom.xml
+++ b/runtime/org.argeo.slc.launcher/pom.xml
@@ -78,7 +78,7 @@
 			<version>1.1.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
diff --git a/runtime/org.argeo.slc.unit/pom.xml b/runtime/org.argeo.slc.unit/pom.xml
index e91cdb06a..22cce56d8 100644
--- a/runtime/org.argeo.slc.unit/pom.xml
+++ b/runtime/org.argeo.slc.unit/pom.xml
@@ -75,7 +75,7 @@
 
 		<!-- OSGi -->
 		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
-- 
2.39.2