From 35c649820830ae787dd299f46c1d625a56a1af18 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 17 Jul 2012 13:18:23 +0000 Subject: [PATCH] New Commons structure building git-svn-id: https://svn.argeo.org/commons/trunk@5488 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- base/dep/org.argeo.dep.jackrabbit/pom.xml | 4 +- .../dep/org.argeo.osgi.dep.stdruntime/pom.xml | 27 --------- base/dep/pom.xml | 56 +++++++++++++++++++ base/dist/osgi-boot/pom.xml | 2 +- .../org.argeo.osgi.ui.explorer/pom.xml | 6 +- base/runtime/org.argeo.eclipse.ui.jcr/pom.xml | 10 ++-- base/runtime/org.argeo.eclipse.ui.rap/pom.xml | 6 +- base/runtime/org.argeo.eclipse.ui.rcp/pom.xml | 8 +-- base/runtime/org.argeo.eclipse.ui/pom.xml | 6 +- .../pom.xml | 6 +- .../org.argeo.security.dep.node.rap/pom.xml | 4 +- .../org.argeo.security.dep.node.rcp/pom.xml | 2 +- .../dep/org.argeo.security.dep.node/pom.xml | 21 +++++-- .../org.argeo.security.equinox/pom.xml | 6 +- .../org.argeo.security.ui.admin/pom.xml | 10 ++-- .../plugins/org.argeo.security.ui.rap/pom.xml | 8 +-- .../plugins/org.argeo.security.ui.rcp/pom.xml | 8 +-- .../plugins/org.argeo.security.ui/pom.xml | 8 +-- security/plugins/pom.xml | 2 +- .../org.argeo.security.activemq/pom.xml | 4 +- .../runtime/org.argeo.security.core/pom.xml | 8 +-- .../runtime/org.argeo.security.ldap/pom.xml | 4 +- .../dep/org.argeo.server.dep.activemq/pom.xml | 4 +- server/dep/org.argeo.server.dep.ads/pom.xml | 4 +- .../org.argeo.server.dep.hibernate/pom.xml | 4 +- .../pom.xml | 4 +- .../dep/org.argeo.server.dep.tomcat/pom.xml | 6 +- server/dep/pom.xml | 2 +- .../plugins/org.argeo.jcr.ui.explorer/pom.xml | 6 +- server/runtime/org.argeo.server.ads/pom.xml | 4 +- server/runtime/org.argeo.server.core/pom.xml | 4 +- .../org.argeo.server.jackrabbit/pom.xml | 14 ++--- server/runtime/org.argeo.server.jcr/pom.xml | 16 +++--- server/runtime/org.argeo.server.jxl/pom.xml | 4 +- .../org.argeo.server.modeshape/pom.xml | 6 +- 35 files changed, 166 insertions(+), 128 deletions(-) delete mode 100644 base/dep/org.argeo.osgi.dep.stdruntime/pom.xml diff --git a/base/dep/org.argeo.dep.jackrabbit/pom.xml b/base/dep/org.argeo.dep.jackrabbit/pom.xml index 8073ef951..3a4b8a89f 100644 --- a/base/dep/org.argeo.dep.jackrabbit/pom.xml +++ b/base/dep/org.argeo.dep.jackrabbit/pom.xml @@ -32,8 +32,8 @@ org.apache.lucene - org.argeo.commons.basic - org.argeo.basic.dep.log4j + org.argeo.commons.base + org.argeo.dep.log4j 1.1.4-SNAPSHOT pom 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 index d924266c4..000000000 --- a/base/dep/org.argeo.osgi.dep.stdruntime/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - 4.0.0 - - org.argeo.commons.base - 1.1.4-SNAPSHOT - dep - .. - - org.argeo.osgi.dep.stdruntime - pom - Commons OSGi Standard Runtime Dependencies - - - - org.argeo.commons.osgi - org.argeo.osgi.boot - 1.1.4-SNAPSHOT - - - - org.argeo.commons.basic - org.argeo.basic.dep.log4j - 1.1.4-SNAPSHOT - pom - - - \ No newline at end of file diff --git a/base/dep/pom.xml b/base/dep/pom.xml index 033888368..9aed13adf 100644 --- a/base/dep/pom.xml +++ b/base/dep/pom.xml @@ -17,4 +17,60 @@ org.argeo.eclipse.dep.rap org.argeo.eclipse.dep.rcp + + + + . + + *.inf + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + false + + + + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + + + + + + org.argeo.maven.plugins + maven-argeo-osgi-plugin + + + generate-descriptors + + descriptors + + generate-resources + + + + + + + + + check-osgi + + + org.argeo.commons.base + org.argeo.osgi.boot + 1.1.4-SNAPSHOT + test + + + + \ No newline at end of file diff --git a/base/dist/osgi-boot/pom.xml b/base/dist/osgi-boot/pom.xml index 9cd92061a..8935efd7a 100644 --- a/base/dist/osgi-boot/pom.xml +++ b/base/dist/osgi-boot/pom.xml @@ -33,7 +33,7 @@ - org.argeo.commons.osgi + org.argeo.commons.base org.argeo.osgi.boot 1.1.4-SNAPSHOT diff --git a/base/plugins/org.argeo.osgi.ui.explorer/pom.xml b/base/plugins/org.argeo.osgi.ui.explorer/pom.xml index e4009be02..be574a810 100644 --- a/base/plugins/org.argeo.osgi.ui.explorer/pom.xml +++ b/base/plugins/org.argeo.osgi.ui.explorer/pom.xml @@ -33,20 +33,20 @@ - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui 1.1.4-SNAPSHOT - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.dep.rcp 1.1.4-SNAPSHOT provided - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui.rcp 1.1.4-SNAPSHOT provided diff --git a/base/runtime/org.argeo.eclipse.ui.jcr/pom.xml b/base/runtime/org.argeo.eclipse.ui.jcr/pom.xml index 62141ed4c..8ce1d81e5 100644 --- a/base/runtime/org.argeo.eclipse.ui.jcr/pom.xml +++ b/base/runtime/org.argeo.eclipse.ui.jcr/pom.xml @@ -43,7 +43,7 @@ - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui 1.1.4-SNAPSHOT @@ -61,13 +61,13 @@ - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.dep.rcp 1.1.4-SNAPSHOT provided - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui.rcp 1.1.4-SNAPSHOT provided @@ -75,8 +75,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT diff --git a/base/runtime/org.argeo.eclipse.ui.rap/pom.xml b/base/runtime/org.argeo.eclipse.ui.rap/pom.xml index eb1679637..64d681bd1 100644 --- 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, --> - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.dep.rap 1.1.4-SNAPSHOT diff --git a/base/runtime/org.argeo.eclipse.ui.rcp/pom.xml b/base/runtime/org.argeo.eclipse.ui.rcp/pom.xml index 52ccbcba2..28db155c0 100644 --- a/base/runtime/org.argeo.eclipse.ui.rcp/pom.xml +++ b/base/runtime/org.argeo.eclipse.ui.rcp/pom.xml @@ -50,22 +50,22 @@ - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui 1.1.4-SNAPSHOT - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.dep.rcp 1.1.4-SNAPSHOT - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT diff --git a/base/runtime/org.argeo.eclipse.ui/pom.xml b/base/runtime/org.argeo.eclipse.ui/pom.xml index 3b2d42f99..333a161a8 100644 --- a/base/runtime/org.argeo.eclipse.ui/pom.xml +++ b/base/runtime/org.argeo.eclipse.ui/pom.xml @@ -55,7 +55,7 @@ - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.dep.rcp 1.1.4-SNAPSHOT provided @@ -63,8 +63,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT 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 61e27e49e..83475403b 100644 --- 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 @@ 1.1.4-SNAPSHOT - org.argeo.commons.osgi + org.argeo.commons.base org.argeo.osgi.ui.explorer 1.1.4-SNAPSHOT @@ -45,12 +45,12 @@ - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui 1.1.4-SNAPSHOT - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui.jcr 1.1.4-SNAPSHOT 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 c7deddc78..2f844ea74 100644 --- 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 @@ 1.1.4-SNAPSHOT - org.argeo.commons.osgi + org.argeo.commons.base org.argeo.osgi.ui.explorer 1.1.4-SNAPSHOT @@ -89,7 +89,7 @@ - org.argeo.commons.osgi + org.argeo.commons.base org.argeo.osgi.boot 1.1.4-SNAPSHOT test 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 ceffbb54d..e92540e61 100644 --- 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 @@ - org.argeo.commons.osgi + org.argeo.commons.base org.argeo.osgi.boot 1.1.4-SNAPSHOT test diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml index 8c838bbaf..cc824996e 100644 --- a/security/dep/org.argeo.security.dep.node/pom.xml +++ b/security/dep/org.argeo.security.dep.node/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 org.argeo.commons.security @@ -26,10 +28,17 @@ - + - org.argeo.commons.osgi - org.argeo.osgi.dep.stdruntime + org.argeo.commons.base + org.argeo.osgi.boot + 1.1.4-SNAPSHOT + + + + + org.argeo.commons.base + org.argeo.dep.log4j 1.1.4-SNAPSHOT pom @@ -265,7 +274,7 @@ - org.argeo.commons.basic + org.argeo.commons.base org.argeo.support.junit 1.1.4-SNAPSHOT @@ -296,7 +305,7 @@ - org.argeo.commons.osgi + org.argeo.commons.base org.argeo.osgi.boot 1.1.4-SNAPSHOT test diff --git a/security/plugins/org.argeo.security.equinox/pom.xml b/security/plugins/org.argeo.security.equinox/pom.xml index 47c429207..4595388b2 100644 --- a/security/plugins/org.argeo.security.equinox/pom.xml +++ b/security/plugins/org.argeo.security.equinox/pom.xml @@ -47,7 +47,7 @@ - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.dep.rcp 1.1.4-SNAPSHOT provided @@ -55,8 +55,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT diff --git a/security/plugins/org.argeo.security.ui.admin/pom.xml b/security/plugins/org.argeo.security.ui.admin/pom.xml index 9ae8f8bdc..f0ded9648 100644 --- a/security/plugins/org.argeo.security.ui.admin/pom.xml +++ b/security/plugins/org.argeo.security.ui.admin/pom.xml @@ -57,20 +57,20 @@ - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui 1.1.4-SNAPSHOT - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.dep.rcp 1.1.4-SNAPSHOT provided - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui.rcp 1.1.4-SNAPSHOT provided @@ -78,8 +78,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT diff --git a/security/plugins/org.argeo.security.ui.rap/pom.xml b/security/plugins/org.argeo.security.ui.rap/pom.xml index c5aad4940..e39c3671c 100644 --- a/security/plugins/org.argeo.security.ui.rap/pom.xml +++ b/security/plugins/org.argeo.security.ui.rap/pom.xml @@ -40,8 +40,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT @@ -65,12 +65,12 @@ - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.dep.rap 1.1.4-SNAPSHOT - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui.rap 1.1.4-SNAPSHOT diff --git a/security/plugins/org.argeo.security.ui.rcp/pom.xml b/security/plugins/org.argeo.security.ui.rcp/pom.xml index 215f6b454..4f515ba49 100644 --- a/security/plugins/org.argeo.security.ui.rcp/pom.xml +++ b/security/plugins/org.argeo.security.ui.rcp/pom.xml @@ -40,8 +40,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT @@ -65,12 +65,12 @@ - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui.rcp 1.1.4-SNAPSHOT - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.dep.rcp 1.1.4-SNAPSHOT diff --git a/security/plugins/org.argeo.security.ui/pom.xml b/security/plugins/org.argeo.security.ui/pom.xml index 32cd9c4bf..d6932650e 100644 --- a/security/plugins/org.argeo.security.ui/pom.xml +++ b/security/plugins/org.argeo.security.ui/pom.xml @@ -55,14 +55,14 @@ - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui 1.1.4-SNAPSHOT - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.dep.rcp 1.1.4-SNAPSHOT provided @@ -70,8 +70,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml index a03827335..10cdd110a 100644 --- a/security/plugins/pom.xml +++ b/security/plugins/pom.xml @@ -79,7 +79,7 @@ - org.argeo.commons.osgi + org.argeo.commons.base org.argeo.osgi.boot 1.1.4-SNAPSHOT test diff --git a/security/runtime/org.argeo.security.activemq/pom.xml b/security/runtime/org.argeo.security.activemq/pom.xml index 68a1bf772..779e34f17 100644 --- a/security/runtime/org.argeo.security.activemq/pom.xml +++ b/security/runtime/org.argeo.security.activemq/pom.xml @@ -38,8 +38,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml index 7207ab58c..dca34b352 100644 --- a/security/runtime/org.argeo.security.core/pom.xml +++ b/security/runtime/org.argeo.security.core/pom.xml @@ -55,8 +55,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT @@ -115,8 +115,8 @@ test - org.argeo.commons.basic - org.argeo.basic.dep.log4j + org.argeo.commons.base + org.argeo.dep.log4j 1.1.4-SNAPSHOT pom test diff --git a/security/runtime/org.argeo.security.ldap/pom.xml b/security/runtime/org.argeo.security.ldap/pom.xml index 5f309df9b..801504c55 100644 --- a/security/runtime/org.argeo.security.ldap/pom.xml +++ b/security/runtime/org.argeo.security.ldap/pom.xml @@ -44,8 +44,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT diff --git a/server/dep/org.argeo.server.dep.activemq/pom.xml b/server/dep/org.argeo.server.dep.activemq/pom.xml index 9efc65d3e..46e2eb9c2 100644 --- a/server/dep/org.argeo.server.dep.activemq/pom.xml +++ b/server/dep/org.argeo.server.dep.activemq/pom.xml @@ -12,8 +12,8 @@ - org.argeo.commons.basic - org.argeo.basic.dep.log4j + org.argeo.commons.base + org.argeo.dep.log4j 1.1.4-SNAPSHOT pom diff --git a/server/dep/org.argeo.server.dep.ads/pom.xml b/server/dep/org.argeo.server.dep.ads/pom.xml index f1a5f5d81..00acbb49d 100644 --- a/server/dep/org.argeo.server.dep.ads/pom.xml +++ b/server/dep/org.argeo.server.dep.ads/pom.xml @@ -12,8 +12,8 @@ - org.argeo.commons.basic - org.argeo.basic.dep.log4j + org.argeo.commons.base + org.argeo.dep.log4j 1.1.4-SNAPSHOT pom diff --git a/server/dep/org.argeo.server.dep.hibernate/pom.xml b/server/dep/org.argeo.server.dep.hibernate/pom.xml index c700cb192..59f5ed8de 100644 --- a/server/dep/org.argeo.server.dep.hibernate/pom.xml +++ b/server/dep/org.argeo.server.dep.hibernate/pom.xml @@ -12,8 +12,8 @@ - org.argeo.commons.basic - org.argeo.basic.dep.log4j + org.argeo.commons.base + org.argeo.dep.log4j 1.1.4-SNAPSHOT pom 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 5a9a2ef02..2e51b6b91 100644 --- 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 @@ Commons Jackrabbit Dependencies - org.argeo.commons.osgi - org.argeo.osgi.dep.jackrabbit + org.argeo.commons.base + org.argeo.dep.jackrabbit pom 1.1.4-SNAPSHOT diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml index 0aedd4cae..5b2490742 100644 --- a/server/dep/org.argeo.server.dep.tomcat/pom.xml +++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml @@ -12,8 +12,8 @@ - org.argeo.commons.basic - org.argeo.basic.dep.log4j + org.argeo.commons.base + org.argeo.dep.log4j 1.1.4-SNAPSHOT pom @@ -101,7 +101,7 @@ - org.argeo.commons.osgi + org.argeo.commons.base org.argeo.osgi.boot 1.1.4-SNAPSHOT test diff --git a/server/dep/pom.xml b/server/dep/pom.xml index c5690c033..37f8c8eac 100644 --- a/server/dep/pom.xml +++ b/server/dep/pom.xml @@ -44,7 +44,7 @@ - org.argeo.commons.osgi + org.argeo.commons.base org.argeo.osgi.boot 1.1.4-SNAPSHOT test diff --git a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml b/server/plugins/org.argeo.jcr.ui.explorer/pom.xml index f6f455694..3f92ce1ab 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml +++ b/server/plugins/org.argeo.jcr.ui.explorer/pom.xml @@ -35,20 +35,20 @@ - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui.jcr 1.1.4-SNAPSHOT - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.dep.rcp 1.1.4-SNAPSHOT provided - org.argeo.commons.eclipse + org.argeo.commons.base org.argeo.eclipse.ui.rcp 1.1.4-SNAPSHOT provided diff --git a/server/runtime/org.argeo.server.ads/pom.xml b/server/runtime/org.argeo.server.ads/pom.xml index d16295532..5479e8367 100644 --- a/server/runtime/org.argeo.server.ads/pom.xml +++ b/server/runtime/org.argeo.server.ads/pom.xml @@ -38,8 +38,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT diff --git a/server/runtime/org.argeo.server.core/pom.xml b/server/runtime/org.argeo.server.core/pom.xml index f6da4a3ae..8e158f110 100644 --- a/server/runtime/org.argeo.server.core/pom.xml +++ b/server/runtime/org.argeo.server.core/pom.xml @@ -40,8 +40,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT diff --git a/server/runtime/org.argeo.server.jackrabbit/pom.xml b/server/runtime/org.argeo.server.jackrabbit/pom.xml index f018b69aa..98dfaa29f 100644 --- a/server/runtime/org.argeo.server.jackrabbit/pom.xml +++ b/server/runtime/org.argeo.server.jackrabbit/pom.xml @@ -46,8 +46,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT @@ -68,8 +68,8 @@ - org.argeo.commons.osgi - org.argeo.osgi.dep.jackrabbit + org.argeo.commons.base + org.argeo.dep.jackrabbit pom 1.1.4-SNAPSHOT @@ -97,14 +97,14 @@ - org.argeo.commons.basic + org.argeo.commons.base org.argeo.support.junit 1.1.4-SNAPSHOT test - org.argeo.commons.basic - org.argeo.basic.dep.log4j + org.argeo.commons.base + org.argeo.dep.log4j 1.1.4-SNAPSHOT pom test diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml index ae8532f8d..4983dccf8 100644 --- a/server/runtime/org.argeo.server.jcr/pom.xml +++ b/server/runtime/org.argeo.server.jcr/pom.xml @@ -58,8 +58,8 @@ - org.argeo.commons.basic - org.argeo.basic.nodeps + org.argeo.commons.base + org.argeo.util 1.1.4-SNAPSHOT @@ -107,27 +107,27 @@ true - org.argeo.commons.osgi - org.argeo.osgi.dep.jackrabbit + org.argeo.commons.base + org.argeo.dep.jackrabbit 1.1.4-SNAPSHOT pom test - org.argeo.commons.basic + org.argeo.commons.base org.argeo.support.junit 1.1.4-SNAPSHOT test - org.argeo.commons.basic - org.argeo.basic.dep.log4j + org.argeo.commons.base + org.argeo.dep.log4j 1.1.4-SNAPSHOT pom test - org.argeo.commons.osgi + org.argeo.commons.base org.argeo.osgi.boot 1.1.4-SNAPSHOT test diff --git a/server/runtime/org.argeo.server.jxl/pom.xml b/server/runtime/org.argeo.server.jxl/pom.xml index 7660659a5..82b2ba12e 100644 --- a/server/runtime/org.argeo.server.jxl/pom.xml +++ b/server/runtime/org.argeo.server.jxl/pom.xml @@ -57,8 +57,8 @@ test - org.argeo.commons.basic - org.argeo.basic.dep.log4j + org.argeo.commons.base + org.argeo.dep.log4j 1.1.4-SNAPSHOT pom test diff --git a/server/runtime/org.argeo.server.modeshape/pom.xml b/server/runtime/org.argeo.server.modeshape/pom.xml index 3b2879b87..379a5e1f6 100644 --- a/server/runtime/org.argeo.server.modeshape/pom.xml +++ b/server/runtime/org.argeo.server.modeshape/pom.xml @@ -54,15 +54,15 @@ - org.argeo.commons.basic - org.argeo.basic.dep.log4j + org.argeo.commons.base + org.argeo.dep.log4j 1.1.4-SNAPSHOT pom - org.argeo.commons.osgi + org.argeo.commons.base org.argeo.osgi.boot 1.1.4-SNAPSHOT test -- 2.39.2