Adapt to new Commons structure

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

diff --git a/eclipse/plugins/org.argeo.slc.client.rap/pom.xml b/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
index c038b00cda89d43656843f3e388572730bf7880c..41d40461973d5abb3b7872ec8f0d586464e42f87 100644 (file)
--- 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 fcdd230594dbda02946644b76483723aa57eb86b..bf734da5f57178f623cc0c92584c8e6e762dbc79 100644 (file)
--- 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 d16304e44eecab63144106fdf6c76bc1c03a2f09..9b9e0a8b3e0bdb1fbd3ec78ba5fb8b9a17e564c0 100644 (file)
--- 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 4271325e975e6febe3fb7f413e7f6d337d7b6a5e..98b8880f205ed0087362cf093587c89be4e5710a 100644 (file)
--- 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 4e2b7025975ab669f157e60cc6076b86435e4a68..a390fcf966874af87c2d2a42717419fcfc56b872 100644 (file)
--- 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 90bd70f4fd496f8d801c81f87da0b1233980e96c..d86045f6140bde5f9ff7e57e0708327ddda922f3 100644 (file)
--- 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 3f143d73ad869450e51d64f1f33627066b9df556..e04c7738ca0d1613d85336d16f354e4fe78e6270 100644 (file)
--- 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 e91cdb06a6e2494f994ebfd6f214deb3726d6d27..22cce56d8a0f6cff824accf5b71b7f7bbafd7ca4 100644 (file)
--- 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>