New Commons structure building

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

diff --git a/base/dep/org.argeo.dep.jackrabbit/pom.xml b/base/dep/org.argeo.dep.jackrabbit/pom.xml
index 8073ef951695613c928e982c5966b663e13fbcf2..3a4b8a89fc5bcca87c5d26dd78d56abd73dfc25b 100644 (file)
--- a/base/dep/org.argeo.dep.jackrabbit/pom.xml
+++ b/base/dep/org.argeo.dep.jackrabbit/pom.xml
@@ -32,8 +32,8 @@
                        <artifactId>org.apache.lucene</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>1.1.4-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>

diff --git a/base/dep/org.argeo.osgi.dep.stdruntime/pom.xml b/base/dep/org.argeo.osgi.dep.stdruntime/pom.xml
deleted file mode 100644 (file)
index d924266..0000000
--- a/base/dep/org.argeo.osgi.dep.stdruntime/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons.base</groupId>
-               <version>1.1.4-SNAPSHOT</version>
-               <artifactId>dep</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.osgi.dep.stdruntime</artifactId>
-       <packaging>pom</packaging>
-       <name>Commons OSGi Standard Runtime Dependencies</name>
-       <dependencies>
-               <!-- OSGi Boot (and Equinox) -->
-               <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>1.1.4-SNAPSHOT</version>
-               </dependency>
-               <!--  Logging -->
-               <dependency>
-                       <groupId>org.argeo.commons.basic</groupId>
-                       <artifactId>org.argeo.basic.dep.log4j</artifactId>
-                       <version>1.1.4-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-       </dependencies>
-</project>
\ No newline at end of file

diff --git a/base/dep/pom.xml b/base/dep/pom.xml
index 033888368628d09e834ad1fc7b67fb2af7c74a26..9aed13adff899142747a9125f1ca3511b5618fc3 100644 (file)
--- a/base/dep/pom.xml
+++ b/base/dep/pom.xml
@@ -17,4 +17,60 @@
                <module>org.argeo.eclipse.dep.rap</module>
                <module>org.argeo.eclipse.dep.rcp</module>
        </modules>
+       <build>
+               <resources>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>*.inf</include>
+                               </includes>
+                       </resource>
+               </resources>
+               <plugins>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>buildnumber-maven-plugin</artifactId>
+                               <configuration>
+                                       <useLastCommittedRevision>false</useLastCommittedRevision>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-jar-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                       </plugin>
+               </plugins>
+               <pluginManagement>
+                       <plugins>
+                               <plugin>
+                                       <groupId>org.argeo.maven.plugins</groupId>
+                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                       <executions>
+                                               <execution>
+                                                       <id>generate-descriptors</id>
+                                                       <goals>
+                                                               <goal>descriptors</goal>
+                                                       </goals>
+                                                       <phase>generate-resources</phase>
+                                               </execution>
+                                       </executions>
+                               </plugin>
+                       </plugins>
+               </pluginManagement>
+       </build>
+       <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <dependencies>
+                               <dependency>
+                                       <groupId>org.argeo.commons.base</groupId>
+                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <version>1.1.4-SNAPSHOT</version>
+                                       <scope>test</scope>
+                               </dependency>
+                       </dependencies>
+               </profile>
+       </profiles>
 </project>
\ No newline at end of file

diff --git a/base/dist/osgi-boot/pom.xml b/base/dist/osgi-boot/pom.xml
index 9cd92061a8829d4853677b48cba32290f6b7d0d3..8935efd7a061a416464e34e797c10148bdb86f4d 100644 (file)
--- a/base/dist/osgi-boot/pom.xml
+++ b/base/dist/osgi-boot/pom.xml
@@ -33,7 +33,7 @@
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>

diff --git a/base/plugins/org.argeo.osgi.ui.explorer/pom.xml b/base/plugins/org.argeo.osgi.ui.explorer/pom.xml
index e4009be02d2c866276ca783981ec28bdaadbaa89..be574a8104114bd466f0c1960dc375d2982f761e 100644 (file)
--- a/base/plugins/org.argeo.osgi.ui.explorer/pom.xml
+++ b/base/plugins/org.argeo.osgi.ui.explorer/pom.xml
@@ -33,20 +33,20 @@
                </dependency>
 
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
 
                <!-- RCP only dependency, needed at compile time -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>provided</scope>

diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/pom.xml b/base/runtime/org.argeo.eclipse.ui.jcr/pom.xml
index 62141ed4c36703778bd3cf175c1b62dda0f32afb..8ce1d81e58b01ca3cc456897b7f4f46dc7011b70 100644 (file)
--- a/base/runtime/org.argeo.eclipse.ui.jcr/pom.xml
+++ b/base/runtime/org.argeo.eclipse.ui.jcr/pom.xml
@@ -43,7 +43,7 @@
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
@@ -61,13 +61,13 @@
 
                <!-- RCP only dependency, needed at compile time -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>provided</scope>
@@ -75,8 +75,8 @@
 
                <!-- Argeo Commons -->
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
 

diff --git a/base/runtime/org.argeo.eclipse.ui.rap/pom.xml b/base/runtime/org.argeo.eclipse.ui.rap/pom.xml
index eb1679637af8c3b728bd6be487e9c27eeaa948d2..64d681bd18d7d33857230c60384e99d9a053df84 100644 (file)
--- a/base/runtime/org.argeo.eclipse.ui.rap/pom.xml
+++ b/base/runtime/org.argeo.eclipse.ui.rap/pom.xml
@@ -57,14 +57,14 @@
                org.eclipse.jface.dialogs, -->
        <dependencies>
                        <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>1.1.4-SNAPSHOT</version>
                </dependency>
        
                <!-- 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>1.1.4-SNAPSHOT</version>
                </dependency>

diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/pom.xml b/base/runtime/org.argeo.eclipse.ui.rcp/pom.xml
index 52ccbcba29d37e2b28497ebd5cbfbf73248ea3a8..28db155c01424e591120b629c3b8eb09273a75a8 100644 (file)
--- a/base/runtime/org.argeo.eclipse.ui.rcp/pom.xml
+++ b/base/runtime/org.argeo.eclipse.ui.rcp/pom.xml
@@ -50,22 +50,22 @@
        <dependencies>
                <!-- Argeo Commons for Eclipse (not specific) -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons third party distribution for RCP projects -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </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>1.1.4-SNAPSHOT</version>
                </dependency>
 

diff --git a/base/runtime/org.argeo.eclipse.ui/pom.xml b/base/runtime/org.argeo.eclipse.ui/pom.xml
index 3b2d42f99327a24bb2374241417ccc7388d161a1..333a161a8932f53c66cd83d02c273dd32804349c 100644 (file)
--- a/base/runtime/org.argeo.eclipse.ui/pom.xml
+++ b/base/runtime/org.argeo.eclipse.ui/pom.xml
@@ -55,7 +55,7 @@
 
                <!-- RCP only dependency, needed at compile time -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>provided</scope>
@@ -63,8 +63,8 @@
 
                <!-- Commons -->
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
 

diff --git a/security/dep/org.argeo.security.dep.node.eclipse/pom.xml b/security/dep/org.argeo.security.dep.node.eclipse/pom.xml
index 61e27e49e280ab3fc81dc3e9043afcf2ac1821e3..83475403b928473c405b3a02b2569a2056108187 100644 (file)
--- a/security/dep/org.argeo.security.dep.node.eclipse/pom.xml
+++ b/security/dep/org.argeo.security.dep.node.eclipse/pom.xml
@@ -33,7 +33,7 @@
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.osgi.ui.explorer</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
@@ -45,12 +45,12 @@
 
                <!-- Eclipse -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui.jcr</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>

diff --git a/security/dep/org.argeo.security.dep.node.rap/pom.xml b/security/dep/org.argeo.security.dep.node.rap/pom.xml
index c7deddc786976dcdd4870c6fd584dc584ec5f9b9..2f844ea74ddbfd95f6bf4491b05edb982ac91e3a 100644 (file)
--- a/security/dep/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/dep/org.argeo.security.dep.node.rap/pom.xml
@@ -33,7 +33,7 @@
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.osgi.ui.explorer</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
@@ -89,7 +89,7 @@
                        <dependencies>
                                <!-- OSGi test -->
                                <dependency>
-                                       <groupId>org.argeo.commons.osgi</groupId>
+                                       <groupId>org.argeo.commons.base</groupId>
                                        <artifactId>org.argeo.osgi.boot</artifactId>
                                        <version>1.1.4-SNAPSHOT</version>
                                        <scope>test</scope>

diff --git a/security/dep/org.argeo.security.dep.node.rcp/pom.xml b/security/dep/org.argeo.security.dep.node.rcp/pom.xml
index ceffbb54dbf48771d56d718c241fd048494e97a2..e92540e6189c5f03016616e39d65601c80531b3c 100644 (file)
--- a/security/dep/org.argeo.security.dep.node.rcp/pom.xml
+++ b/security/dep/org.argeo.security.dep.node.rcp/pom.xml
@@ -64,7 +64,7 @@
                        <dependencies>
                                <!-- OSGi test -->
                                <dependency>
-                                       <groupId>org.argeo.commons.osgi</groupId>
+                                       <groupId>org.argeo.commons.base</groupId>
                                        <artifactId>org.argeo.osgi.boot</artifactId>
                                        <version>1.1.4-SNAPSHOT</version>
                                        <scope>test</scope>

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 8c838bbaf545e1ea07d90b3cb5250bc9267a8d9c..cc824996e948b12baf498005419391de5be4a300 100644 (file)
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.security</groupId>
@@ -26,10 +28,17 @@
                </plugins>
        </build>
        <dependencies>
-               <!-- Base runtime -->
+               <!-- OSGi Boot (and Equinox) -->
                <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
-                       <artifactId>org.argeo.osgi.dep.stdruntime</artifactId>
+                       <groupId>org.argeo.commons.base</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>1.1.4-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Logging -->
+               <dependency>
+                       <groupId>org.argeo.commons.base</groupId>
+                       <artifactId>org.argeo.dep.log4j</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
@@ -265,7 +274,7 @@
 
                <!-- Software development -->
                <dependency>
-                       <groupId>org.argeo.commons.basic</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.support.junit</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
@@ -296,7 +305,7 @@
                        <dependencies>
                                <!-- OSGi test -->
                                <dependency>
-                                       <groupId>org.argeo.commons.osgi</groupId>
+                                       <groupId>org.argeo.commons.base</groupId>
                                        <artifactId>org.argeo.osgi.boot</artifactId>
                                        <version>1.1.4-SNAPSHOT</version>
                                        <scope>test</scope>

diff --git a/security/plugins/org.argeo.security.equinox/pom.xml b/security/plugins/org.argeo.security.equinox/pom.xml
index 47c4292076eec3e1bf182502424dcf67a47f1fff..4595388b23adade6cbe33754e122c0d3b1d03d90 100644 (file)
--- a/security/plugins/org.argeo.security.equinox/pom.xml
+++ b/security/plugins/org.argeo.security.equinox/pom.xml
@@ -47,7 +47,7 @@
                
                <!-- RCP only dependency, needed at compile time -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>provided</scope>
@@ -55,8 +55,8 @@
 
                <!-- Commons -->
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
                <dependency>

diff --git a/security/plugins/org.argeo.security.ui.admin/pom.xml b/security/plugins/org.argeo.security.ui.admin/pom.xml
index 9ae8f8bdca265c9c382be1a3bdea6f968b291f0a..f0ded96483af94a1ddb3b5460cae9a9a7e22ccc9 100644 (file)
--- a/security/plugins/org.argeo.security.ui.admin/pom.xml
+++ b/security/plugins/org.argeo.security.ui.admin/pom.xml
@@ -57,20 +57,20 @@
 
                <!-- Argeo Eclipse -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
 
                <!-- RCP only dependency, needed at compile time -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>provided</scope>
@@ -78,8 +78,8 @@
 
                <!-- Commons -->
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
 

diff --git a/security/plugins/org.argeo.security.ui.rap/pom.xml b/security/plugins/org.argeo.security.ui.rap/pom.xml
index c5aad4940e1256413a4733fd7ca701b2b27cc74a..e39c3671c85a65cb9b2c6f5284a0d52731793609 100644 (file)
--- a/security/plugins/org.argeo.security.ui.rap/pom.xml
+++ b/security/plugins/org.argeo.security.ui.rap/pom.xml
@@ -40,8 +40,8 @@
        <dependencies>
                <!-- Commons -->
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
 
@@ -65,12 +65,12 @@
 
                <!-- RAP specific -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>

diff --git a/security/plugins/org.argeo.security.ui.rcp/pom.xml b/security/plugins/org.argeo.security.ui.rcp/pom.xml
index 215f6b454fe5fffc871297e05eb831e4eeea3782..4f515ba491446b9598eb875a5418fb3bc3041f3c 100644 (file)
--- a/security/plugins/org.argeo.security.ui.rcp/pom.xml
+++ b/security/plugins/org.argeo.security.ui.rcp/pom.xml
@@ -40,8 +40,8 @@
        <dependencies>
                <!-- Commons -->
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
 
@@ -65,12 +65,12 @@
 
                <!-- RCP specific -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>

diff --git a/security/plugins/org.argeo.security.ui/pom.xml b/security/plugins/org.argeo.security.ui/pom.xml
index 32cd9c4bf33be6daafd6a0a225e64d959399f762..d6932650e08fdbe7a6f33cf6352fbe009e3ad76d 100644 (file)
--- a/security/plugins/org.argeo.security.ui/pom.xml
+++ b/security/plugins/org.argeo.security.ui/pom.xml
@@ -55,14 +55,14 @@
 
                <!-- Argeo Eclipse -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
 
                <!-- RCP only dependency, needed at compile time -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>provided</scope>
@@ -70,8 +70,8 @@
 
                <!-- Commons -->
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
 

diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml
index a038273350ab025b97b6b11ba483acf3cc897500..10cdd110a68421403382031921ec1c16f9b1c37a 100644 (file)
--- a/security/plugins/pom.xml
+++ b/security/plugins/pom.xml
@@ -79,7 +79,7 @@
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>test</scope>

diff --git a/security/runtime/org.argeo.security.activemq/pom.xml b/security/runtime/org.argeo.security.activemq/pom.xml
index 68a1bf7721250bdd97fe547204b866165a5133f0..779e34f178ed86d696f542d45147152ee3e82a13 100644 (file)
--- a/security/runtime/org.argeo.security.activemq/pom.xml
+++ b/security/runtime/org.argeo.security.activemq/pom.xml
@@ -38,8 +38,8 @@
        </build>
        <dependencies>
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
                <dependency>

diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index 7207ab58cfa658cb9473505aaa5e5772f9994820..dca34b352729714f759c15682b887e7955dc9d93 100644 (file)
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -55,8 +55,8 @@
        </build>
        <dependencies>
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
                <dependency>
@@ -115,8 +115,8 @@
                        <scope>test</scope>
                </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>1.1.4-SNAPSHOT</version>
                        <type>pom</type>
                        <scope>test</scope>

diff --git a/security/runtime/org.argeo.security.ldap/pom.xml b/security/runtime/org.argeo.security.ldap/pom.xml
index 5f309df9bdfa90b32693483b317786858ce38486..801504c553198f803eb5543b747812717657a645 100644 (file)
--- a/security/runtime/org.argeo.security.ldap/pom.xml
+++ b/security/runtime/org.argeo.security.ldap/pom.xml
@@ -44,8 +44,8 @@
        </build>
        <dependencies>
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
                <dependency>

diff --git a/server/dep/org.argeo.server.dep.activemq/pom.xml b/server/dep/org.argeo.server.dep.activemq/pom.xml
index 9efc65d3e87574d88c0c2992f9559c965894c319..46e2eb9c28e845eb2d2b1aa783027919a538c138 100644 (file)
--- a/server/dep/org.argeo.server.dep.activemq/pom.xml
+++ b/server/dep/org.argeo.server.dep.activemq/pom.xml
@@ -12,8 +12,8 @@
        <dependencies>
                <!-- Commons Dep -->
                <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>1.1.4-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>

diff --git a/server/dep/org.argeo.server.dep.ads/pom.xml b/server/dep/org.argeo.server.dep.ads/pom.xml
index f1a5f5d81b9e9221c24161936a4aaa91309bd547..00acbb49dae4ac4d72d342240d761e2e06ec67f5 100644 (file)
--- a/server/dep/org.argeo.server.dep.ads/pom.xml
+++ b/server/dep/org.argeo.server.dep.ads/pom.xml
@@ -12,8 +12,8 @@
        <dependencies>
                <!-- Commons Dep -->
                <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>1.1.4-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>

diff --git a/server/dep/org.argeo.server.dep.hibernate/pom.xml b/server/dep/org.argeo.server.dep.hibernate/pom.xml
index c700cb192db3358abef7bb62da10868f215ee6b4..59f5ed8ded7b942d4e9c7ff9e34078a5f567038f 100644 (file)
--- a/server/dep/org.argeo.server.dep.hibernate/pom.xml
+++ b/server/dep/org.argeo.server.dep.hibernate/pom.xml
@@ -12,8 +12,8 @@
        <dependencies>
                <!--  Commons Dep -->
                <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>1.1.4-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>

diff --git a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
index 5a9a2ef0211826ef430bceaf6ed8ff946b9415a4..2e51b6b911aa4ac6b6bb65dc74b01ad9a9842433 100644 (file)
--- a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
+++ b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
@@ -11,8 +11,8 @@
        <name>Commons Jackrabbit Dependencies</name>
        <dependencies>
                <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
-                       <artifactId>org.argeo.osgi.dep.jackrabbit</artifactId>
+                       <groupId>org.argeo.commons.base</groupId>
+                       <artifactId>org.argeo.dep.jackrabbit</artifactId>
                        <type>pom</type>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>

diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index 0aedd4cae51b2c4d0e67ee03cd25f285314e5375..5b2490742819ac5834ee30b9206911dbb15ea4d6 100644 (file)
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -12,8 +12,8 @@
        <dependencies>
                <!-- Commons Dep -->
                <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>1.1.4-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
@@ -101,7 +101,7 @@
                
                                                <!-- OSGi test -->
                                <dependency>
-                                       <groupId>org.argeo.commons.osgi</groupId>
+                                       <groupId>org.argeo.commons.base</groupId>
                                        <artifactId>org.argeo.osgi.boot</artifactId>
                                        <version>1.1.4-SNAPSHOT</version>
                                        <scope>test</scope>

diff --git a/server/dep/pom.xml b/server/dep/pom.xml
index c5690c0335fe67719dd1a501fe67f795f378bcc3..37f8c8eacf193ba88ce765901fd2e4d055a09cd2 100644 (file)
--- a/server/dep/pom.xml
+++ b/server/dep/pom.xml
@@ -44,7 +44,7 @@
                        <dependencies>
                                <!-- OSGi test -->
                                <dependency>
-                                       <groupId>org.argeo.commons.osgi</groupId>
+                                       <groupId>org.argeo.commons.base</groupId>
                                        <artifactId>org.argeo.osgi.boot</artifactId>
                                        <version>1.1.4-SNAPSHOT</version>
                                        <scope>test</scope>

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml b/server/plugins/org.argeo.jcr.ui.explorer/pom.xml
index f6f4556946a48c624f3456b672293f5012f5781b..3f92ce1ab04a1cefb80a9d7ff39fd2550ea45f3f 100644 (file)
--- a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml
+++ b/server/plugins/org.argeo.jcr.ui.explorer/pom.xml
@@ -35,20 +35,20 @@
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui.jcr</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
 
                <!-- RCP only dependency, needed at compile time -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.eclipse.ui.rcp</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>provided</scope>

diff --git a/server/runtime/org.argeo.server.ads/pom.xml b/server/runtime/org.argeo.server.ads/pom.xml
index d16295532be0179976611dc7fe9a665d782fdf3a..5479e8367febebe0964e9a6412daa9a7e0cd85e4 100644 (file)
--- a/server/runtime/org.argeo.server.ads/pom.xml
+++ b/server/runtime/org.argeo.server.ads/pom.xml
@@ -38,8 +38,8 @@
        </build>
        <dependencies>
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
 

diff --git a/server/runtime/org.argeo.server.core/pom.xml b/server/runtime/org.argeo.server.core/pom.xml
index f6da4a3aea5b092851e1dd5ee6329bd8ccd4a0a0..8e158f110f2c50290a8709b49150e6debd7280f7 100644 (file)
--- a/server/runtime/org.argeo.server.core/pom.xml
+++ b/server/runtime/org.argeo.server.core/pom.xml
@@ -40,8 +40,8 @@
        </build>
        <dependencies>
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
 

diff --git a/server/runtime/org.argeo.server.jackrabbit/pom.xml b/server/runtime/org.argeo.server.jackrabbit/pom.xml
index f018b69aa0faaa013e2ecf556ce371c4826cc14e..98dfaa29fcc8871ebf2755b6edfec4d879d7792b 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/pom.xml
+++ b/server/runtime/org.argeo.server.jackrabbit/pom.xml
@@ -46,8 +46,8 @@
        </build>
        <dependencies>
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
                <dependency>
@@ -68,8 +68,8 @@
 
                <!-- Jackrabbit -->
                <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
-                       <artifactId>org.argeo.osgi.dep.jackrabbit</artifactId>
+                       <groupId>org.argeo.commons.base</groupId>
+                       <artifactId>org.argeo.dep.jackrabbit</artifactId>
                        <type>pom</type>
                        <version>1.1.4-SNAPSHOT</version>
                </dependency>
@@ -97,14 +97,14 @@
 
                <!-- TEST -->
                <dependency>
-                       <groupId>org.argeo.commons.basic</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.support.junit</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>test</scope>
                </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>1.1.4-SNAPSHOT</version>
                        <type>pom</type>
                        <scope>test</scope>

diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml
index ae8532f8dfd13d1fa5bb28d29845593f3f2ad5ed..4983dccf8a87e0ba431d250ac3c7229909d7a7af 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/pom.xml
+++ b/server/runtime/org.argeo.server.jcr/pom.xml
@@ -58,8 +58,8 @@
        </build>
        <dependencies>
                <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>1.1.4-SNAPSHOT</version>
                </dependency>
 
@@ -107,27 +107,27 @@
                        <optional>true</optional>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
-                       <artifactId>org.argeo.osgi.dep.jackrabbit</artifactId>
+                       <groupId>org.argeo.commons.base</groupId>
+                       <artifactId>org.argeo.dep.jackrabbit</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <type>pom</type>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.basic</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.support.junit</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>test</scope>
                </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>1.1.4-SNAPSHOT</version>
                        <type>pom</type>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>test</scope>

diff --git a/server/runtime/org.argeo.server.jxl/pom.xml b/server/runtime/org.argeo.server.jxl/pom.xml
index 7660659a5df0fa5c9253f5633c970d95fad8b441..82b2ba12eafa5a87b50496a23e26121a94c7938c 100644 (file)
--- a/server/runtime/org.argeo.server.jxl/pom.xml
+++ b/server/runtime/org.argeo.server.jxl/pom.xml
@@ -57,8 +57,8 @@
                        <scope>test</scope>
                </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>1.1.4-SNAPSHOT</version>
                        <type>pom</type>
                        <scope>test</scope>

diff --git a/server/runtime/org.argeo.server.modeshape/pom.xml b/server/runtime/org.argeo.server.modeshape/pom.xml
index 3b2879b8778a3aea560bee86d00eadf9e9ead62c..379a5e1f621ea0fd59175e190283aa8111ac516d 100644 (file)
--- a/server/runtime/org.argeo.server.modeshape/pom.xml
+++ b/server/runtime/org.argeo.server.modeshape/pom.xml
@@ -54,15 +54,15 @@
                </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>1.1.4-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
 
                <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
                        <version>1.1.4-SNAPSHOT</version>
                        <scope>test</scope>