From 1e6c45fb2e8daf5731fcd0a58564e33e9dd16fe8 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 17 Apr 2006 22:39:14 +0000 Subject: [PATCH] Fix dependencies scopes for m2 build... git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@394797 13f79535-47bb-0310-9956-ffa450edef68 --- activecluster/pom.xml | 3 +- activeio/activeio-core/pom.xml | 34 +++++++---- activeio/activeio-jxta/pom.xml | 2 - activeio/activeio-oneport-jetty/pom.xml | 5 +- activemq-core/pom.xml | 79 +++++++++++++++++-------- activemq-jaas/pom.xml | 12 ++++ activemq-rar/pom.xml | 8 +++ assembly/pom.xml | 4 -- pom.xml | 33 ++++++++++- 9 files changed, 133 insertions(+), 47 deletions(-) diff --git a/activecluster/pom.xml b/activecluster/pom.xml index abf5314861..0f63b70b23 100644 --- a/activecluster/pom.xml +++ b/activecluster/pom.xml @@ -28,9 +28,8 @@ - incubator-activemq + ${pom.groupId} activemq-core - 4.0-SNAPSHOT org.apache.derby diff --git a/activeio/activeio-core/pom.xml b/activeio/activeio-core/pom.xml index 3b622b013d..e405f3a02f 100644 --- a/activeio/activeio-core/pom.xml +++ b/activeio/activeio-core/pom.xml @@ -51,29 +51,33 @@ backport-util-concurrent backport-util-concurrent + + + commons-logging + commons-logging + howl howl-logger - 0.1.8 + true log4j log4j + true commons-beanutils commons-beanutils - 1.6.1 test commons-collections commons-collections - 2.1 test @@ -81,19 +85,29 @@ geronimo geronimo-kernel - 1.0-M5 + true geronimo geronimo-j2ee - 1.0-M5 - - - mx4j - mx4j - 3.0.1 + true + + + jdk1.4 + + 1.4 + + + + mx4j + mx4j + + + + + diff --git a/activeio/activeio-jxta/pom.xml b/activeio/activeio-jxta/pom.xml index dc39ccbe0e..cb664250dd 100644 --- a/activeio/activeio-jxta/pom.xml +++ b/activeio/activeio-jxta/pom.xml @@ -49,12 +49,10 @@ p2psockets p2psockets-core - 1.1.2 jxta jxta - 2.0 diff --git a/activeio/activeio-oneport-jetty/pom.xml b/activeio/activeio-oneport-jetty/pom.xml index a168513cdf..66a3bce077 100644 --- a/activeio/activeio-oneport-jetty/pom.xml +++ b/activeio/activeio-oneport-jetty/pom.xml @@ -53,9 +53,8 @@ 5.1.2 - javax.servlet - servlet-api - 2.3 + org.apache.geronimo.specs + geronimo-servlet_2.4_spec diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml index a0dd781445..44afae4ef8 100755 --- a/activemq-core/pom.xml +++ b/activemq-core/pom.xml @@ -44,6 +44,7 @@ incubator-activemq activemq-jaas + true @@ -58,81 +59,96 @@ org.apache.geronimo.specs geronimo-jta_1.0.1B_spec + true org.apache.geronimo.specs geronimo-j2ee-management_1.0_spec + true org.apache.geronimo.specs geronimo-j2ee-jacc_1.0_spec + true commons-collections commons-collections + test commons-primitives commons-primitives + test commons-pool commons-pool + true - - backport-util-concurrent - backport-util-concurrent - log4j log4j + test org.apache.derby derby + true axion axion + test regexp regexp + test activemq jmdns + true activemq smack + true activemq smackx + true xmlbeans xbean + true xmlbeans xmlpublic + true xmlbeans xbean_xpath + true stax stax-api + true stax stax + runtime + true xmlbeans @@ -143,34 +159,17 @@ xalan xalan + true activesoap jaxp-api + test - - mx4j - mx4j - - - mx4j - mx4j-jmx - - - mx4j - mx4j-remote - - - mx4j - mx4j-tools - - - mx4j - mx4j-impl - org.apache.xbean xbean-spring + true @@ -304,4 +303,36 @@ + + + jdk1.4 + + 1.4 + + + + mx4j + mx4j + + + mx4j + mx4j-jmx + + + mx4j + mx4j-remote + + + mx4j + mx4j-tools + + + mx4j + mx4j-impl + + + + + + diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml index 7705af2307..f94582a52c 100644 --- a/activemq-jaas/pom.xml +++ b/activemq-jaas/pom.xml @@ -63,56 +63,68 @@ directory apacheds-core + test directory apacheds-shared + test directory-shared apache-ldapber-provider + test directory-shared ldap-common + test directory-asn1 asn1-codec + test directory-asn1 asn1-der + test directory-shared kerberos-common + test directory-network mina + test directory-protocols kerberos-protocol + test directory-protocols ldap-protocol + test junit diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml index 617fb389ec..c18f698fda 100644 --- a/activemq-rar/pom.xml +++ b/activemq-rar/pom.xml @@ -192,6 +192,14 @@ org.springframework spring + + org.apache.xbean + xbean-spring + + + org.apache.derby + derby + diff --git a/assembly/pom.xml b/assembly/pom.xml index 82fa1541ac..b0a60282af 100755 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -84,10 +84,6 @@ commons-httpclient commons-httpclient - - commons-httpclient - commons-httpclient - commons-beanutils commons-beanutils diff --git a/pom.xml b/pom.xml index aefaadb503..7587654c68 100755 --- a/pom.xml +++ b/pom.xml @@ -255,7 +255,6 @@ org.apache.geronimo.specs geronimo-jms_1.1_spec 1.0 - @@ -303,6 +301,12 @@ 1.0 + + org.apache.geronimo.specs + geronimo-servlet_2.4_spec + 1.0 + + @@ -682,6 +686,31 @@ ldap-protocol 0.9.2 + + geronimo + geronimo-kernel + 1.0 + + + geronimo + geronimo-j2ee + 1.0 + + + howl + howl-logger + 0.1.8 + + + p2psockets + p2psockets-core + 1.1.2 + + + jxta + jxta + 2.0 +