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 924130d2421b666b0c0bfda7d7eccb8c0e0053d6..d936bff27de40d7cc8f8dc6839baf0273637f0b1 100644 (file)
--- 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 495658c5f1b97cfbaf81d75eff9b93385a59e058..5808760a376cf164908dd2fee56178af5e2d055c 100644 (file)
--- 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 31685bbeee4eefd8f050759ed6b2c98d35852bbd..bb94b79460f2dce7a75e0777ab39a3e02024d3a6 100644 (file)
--- 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 b091688c902dccb144e621808aaa0c5a01b7dc8e..c56121131cf070295209aabac8229df7982a62c3 100644 (file)
--- 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 ae1236626a07898caf2847387fc7256ca89db4c0..867f3c53c7897d1b0ee600159b96f09f71b987bd 100644 (file)
--- 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 9fc503fa506c10bf34ace87ebe870cf9c89dc1d2..1508c7bb96336377018557daecd1beddc340a07c 100644 (file)
--- 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 cc024caf986546a406c6f2e038be08889b0d1178..7eb3b8f7eca91294d3378ab004ac032924248a96 100644 (file)
--- 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>