From 1ae3a446a15cfaffffe8a476212bd33596e99cdf Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 13 Jan 2009 13:55:51 +0000 Subject: [PATCH] Centralize SLC modules versions in parent git-svn-id: https://svn.argeo.org/slc/trunk@2082 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org.argeo.slc.it.webapp/pom.xml | 10 --- org.argeo.slc.dist/pom.xml | 16 ++-- org.argeo.slc.webapp/pom.xml | 1 - org.argeo.slc/pom.xml | 84 ++++++++++++++++--- runtime/org.argeo.slc.launcher/pom.xml | 3 - runtime/org.argeo.slc.lib.detached/pom.xml | 4 - runtime/org.argeo.slc.server/pom.xml | 3 - .../org.argeo.slc.support.activemq/pom.xml | 1 - runtime/org.argeo.slc.support.ant/pom.xml | 1 - runtime/org.argeo.slc.support.castor/pom.xml | 1 - .../org.argeo.slc.support.hibernate/pom.xml | 1 - runtime/org.argeo.slc.support.simple/pom.xml | 1 - .../org.argeo.slc.support.ws.client/pom.xml | 2 - 13 files changed, 80 insertions(+), 48 deletions(-) diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml index 621d20eea..7ebc06016 100644 --- a/integration-tests/org.argeo.slc.it.webapp/pom.xml +++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml @@ -85,31 +85,21 @@ org.argeo.slc org.argeo.slc.webapp - ${project.version} war org.argeo.slc.runtime org.argeo.slc.launcher - ${project.version} test org.argeo.slc.runtime org.argeo.slc.support.ant - ${project.version} - test - - - org.argeo.slc.runtime - org.argeo.slc.support.ant - ${project.version} test org.argeo.slc.runtime org.argeo.slc.support.ws.client - ${project.version} test diff --git a/org.argeo.slc.dist/pom.xml b/org.argeo.slc.dist/pom.xml index 8f0d2e938..b0d2027ea 100644 --- a/org.argeo.slc.dist/pom.xml +++ b/org.argeo.slc.dist/pom.xml @@ -4,7 +4,7 @@ org.argeo.slc argeo-slc - 0.11.2-SNAPSHOT + 0.11.3-SNAPSHOT ../org.argeo.slc argeo-slc-dist @@ -46,21 +46,18 @@ - org.argeo.slc - org.argeo.slc.agent - ${project.version} + org.argeo.slc.runtime + org.argeo.slc.launcher - org.argeo.slc + org.argeo.slc.runtime org.argeo.slc.server - ${project.version} - org.argeo.slc - org.argeo.slc.agent - ${project.version} + org.argeo.slc.runtime + org.argeo.slc.launcher tar.gz base @@ -68,7 +65,6 @@ org.argeo.slc org.argeo.slc.detached.launcher - ${project.version} tar.gz dist diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml index ffa856989..005c96748 100644 --- a/org.argeo.slc.webapp/pom.xml +++ b/org.argeo.slc.webapp/pom.xml @@ -114,7 +114,6 @@ org.argeo.slc.runtime org.argeo.slc.server - ${project.version} diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml index 901aa28ff..fea24c248 100644 --- a/org.argeo.slc/pom.xml +++ b/org.argeo.slc/pom.xml @@ -241,6 +241,74 @@ limitations under the License. + + + org.argeo.slc.runtime + org.argeo.slc.specs + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.launcher + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.detached + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.support.simple + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.support.ant + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.support.hibernate + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.support.castor + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.support.activemq + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.server + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.support.ws.client + ${project.version} + + + org.argeo.slc + org.argeo.slc.webapp + ${project.version} + war + + + + + org.argeo.slc + org.argeo.slc.detached.launcher + ${project.version} + tar.gz + dist + + + javax.transaction @@ -619,7 +687,7 @@ limitations under the License. com.springsource.javax.management.j2ee 1.0.1 - + org.apache.activemq @@ -631,18 +699,14 @@ limitations under the License. com.springsource.org.apache.activemq.web ${version.activemq} - + ${version.activemq} + --> org.apache.xbean com.springsource.org.apache.xbean.spring diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml index 97b5ab3eb..bf69adb28 100644 --- a/runtime/org.argeo.slc.launcher/pom.xml +++ b/runtime/org.argeo.slc.launcher/pom.xml @@ -74,7 +74,6 @@ org.argeo.slc.runtime org.argeo.slc.support.simple - ${project.version} @@ -86,13 +85,11 @@ org.argeo.slc.runtime org.argeo.slc.support.activemq - ${project.version} testing org.argeo.slc.runtime org.argeo.slc.support.castor - ${project.version} testing diff --git a/runtime/org.argeo.slc.lib.detached/pom.xml b/runtime/org.argeo.slc.lib.detached/pom.xml index c2e7a8590..b7a89af92 100644 --- a/runtime/org.argeo.slc.lib.detached/pom.xml +++ b/runtime/org.argeo.slc.lib.detached/pom.xml @@ -47,22 +47,18 @@ org.argeo.slc.runtime org.argeo.slc.support.simple - ${project.version} org.argeo.slc.runtime org.argeo.slc.support.ant - ${project.version} org.argeo.slc.runtime org.argeo.slc.detached - ${project.version} org.argeo.slc.runtime org.argeo.slc.support.castor - ${project.version} \ No newline at end of file diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml index a74058c2f..f29a673c1 100644 --- a/runtime/org.argeo.slc.server/pom.xml +++ b/runtime/org.argeo.slc.server/pom.xml @@ -64,17 +64,14 @@ org.argeo.slc.runtime org.argeo.slc.support.hibernate - ${project.version} org.argeo.slc.runtime org.argeo.slc.support.castor - ${project.version} org.argeo.slc.runtime org.argeo.slc.support.activemq - ${project.version} diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml index 5e33d9f29..f4b5083cb 100644 --- a/runtime/org.argeo.slc.support.activemq/pom.xml +++ b/runtime/org.argeo.slc.support.activemq/pom.xml @@ -48,7 +48,6 @@ org.argeo.slc.runtime org.argeo.slc.support.simple - ${project.version} diff --git a/runtime/org.argeo.slc.support.ant/pom.xml b/runtime/org.argeo.slc.support.ant/pom.xml index 4bccacead..7f7801196 100644 --- a/runtime/org.argeo.slc.support.ant/pom.xml +++ b/runtime/org.argeo.slc.support.ant/pom.xml @@ -47,7 +47,6 @@ org.argeo.slc.runtime org.argeo.slc.support.simple - ${project.version} diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml index 4fe2a75ad..3647c2493 100644 --- a/runtime/org.argeo.slc.support.castor/pom.xml +++ b/runtime/org.argeo.slc.support.castor/pom.xml @@ -55,7 +55,6 @@ org.argeo.slc.runtime org.argeo.slc.support.simple - ${project.version} diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml index 4c8304a65..1b25c47a6 100644 --- a/runtime/org.argeo.slc.support.hibernate/pom.xml +++ b/runtime/org.argeo.slc.support.hibernate/pom.xml @@ -45,7 +45,6 @@ org.argeo.slc.runtime org.argeo.slc.support.simple - ${project.version} diff --git a/runtime/org.argeo.slc.support.simple/pom.xml b/runtime/org.argeo.slc.support.simple/pom.xml index e7f8914a3..13c2eefa3 100644 --- a/runtime/org.argeo.slc.support.simple/pom.xml +++ b/runtime/org.argeo.slc.support.simple/pom.xml @@ -54,7 +54,6 @@ org.argeo.slc.runtime org.argeo.slc.specs - ${project.version} diff --git a/runtime/org.argeo.slc.support.ws.client/pom.xml b/runtime/org.argeo.slc.support.ws.client/pom.xml index b720efb95..2631cd9b7 100644 --- a/runtime/org.argeo.slc.support.ws.client/pom.xml +++ b/runtime/org.argeo.slc.support.ws.client/pom.xml @@ -47,12 +47,10 @@ org.argeo.slc.runtime org.argeo.slc.support.simple - ${project.version} org.argeo.slc.runtime org.argeo.slc.support.castor - ${project.version} -- 2.39.2