Fix dependencies scopes for m2 build...

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@394797 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Guillaume Nodet 2006-04-17 22:39:14 +00:00
parent 0b88dbe3e7
commit 1e6c45fb2e
9 changed files with 133 additions and 47 deletions

View File

@ -28,9 +28,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>incubator-activemq</groupId> <groupId>${pom.groupId}</groupId>
<artifactId>activemq-core</artifactId> <artifactId>activemq-core</artifactId>
<version>4.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>

View File

@ -51,29 +51,33 @@
<groupId>backport-util-concurrent</groupId> <groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId> <artifactId>backport-util-concurrent</artifactId>
</dependency> </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<!-- For HOWL integration --> <!-- For HOWL integration -->
<dependency> <dependency>
<groupId>howl</groupId> <groupId>howl</groupId>
<artifactId>howl-logger</artifactId> <artifactId>howl-logger</artifactId>
<version>0.1.8</version> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-beanutils</groupId> <groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId> <artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
<version>2.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -81,19 +85,29 @@
<dependency> <dependency>
<groupId>geronimo</groupId> <groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId> <artifactId>geronimo-kernel</artifactId>
<version>1.0-M5</version> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>geronimo</groupId> <groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId> <artifactId>geronimo-j2ee</artifactId>
<version>1.0-M5</version> <optional>true</optional>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>3.0.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles>
<profile>
<id>jdk1.4</id>
<activation>
<jdk>1.4</jdk>
</activation>
<dependencies>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project> </project>

View File

@ -49,12 +49,10 @@
<dependency> <dependency>
<groupId>p2psockets</groupId> <groupId>p2psockets</groupId>
<artifactId>p2psockets-core</artifactId> <artifactId>p2psockets-core</artifactId>
<version>1.1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jxta</groupId> <groupId>jxta</groupId>
<artifactId>jxta</artifactId> <artifactId>jxta</artifactId>
<version>2.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -53,9 +53,8 @@
<version>5.1.2</version> <version>5.1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>servlet-api</artifactId> <artifactId>geronimo-servlet_2.4_spec</artifactId>
<version>2.3</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -44,6 +44,7 @@
<dependency> <dependency>
<groupId>incubator-activemq</groupId> <groupId>incubator-activemq</groupId>
<artifactId>activemq-jaas</artifactId> <artifactId>activemq-jaas</artifactId>
<optional>true</optional>
</dependency> </dependency>
<!-- =============================== --> <!-- =============================== -->
@ -58,81 +59,96 @@
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId> <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId> <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
<optional>true</optional>
</dependency> </dependency>
<!-- commons --> <!-- commons -->
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-primitives</groupId> <groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId> <artifactId>commons-primitives</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-pool</groupId> <groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId> <artifactId>commons-pool</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>axion</groupId> <groupId>axion</groupId>
<artifactId>axion</artifactId> <artifactId>axion</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>regexp</groupId> <groupId>regexp</groupId>
<artifactId>regexp</artifactId> <artifactId>regexp</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>activemq</groupId> <groupId>activemq</groupId>
<artifactId>jmdns</artifactId> <artifactId>jmdns</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>activemq</groupId> <groupId>activemq</groupId>
<artifactId>smack</artifactId> <artifactId>smack</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>activemq</groupId> <groupId>activemq</groupId>
<artifactId>smackx</artifactId> <artifactId>smackx</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xmlbeans</groupId> <groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId> <artifactId>xbean</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xmlbeans</groupId> <groupId>xmlbeans</groupId>
<artifactId>xmlpublic</artifactId> <artifactId>xmlpublic</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xmlbeans</groupId> <groupId>xmlbeans</groupId>
<artifactId>xbean_xpath</artifactId> <artifactId>xbean_xpath</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>stax</groupId> <groupId>stax</groupId>
<artifactId>stax-api</artifactId> <artifactId>stax-api</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>stax</groupId> <groupId>stax</groupId>
<artifactId>stax</artifactId> <artifactId>stax</artifactId>
<scope>runtime</scope>
<optional>true</optional>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>xmlbeans</groupId> <groupId>xmlbeans</groupId>
@ -143,34 +159,17 @@
<dependency> <dependency>
<groupId>xalan</groupId> <groupId>xalan</groupId>
<artifactId>xalan</artifactId> <artifactId>xalan</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>activesoap</groupId> <groupId>activesoap</groupId>
<artifactId>jaxp-api</artifactId> <artifactId>jaxp-api</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-impl</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.xbean</groupId> <groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId> <artifactId>xbean-spring</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
@ -304,4 +303,36 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>jdk1.4</id>
<activation>
<jdk>1.4</jdk>
</activation>
<dependencies>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-impl</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project> </project>

View File

@ -63,56 +63,68 @@
<dependency> <dependency>
<groupId>directory</groupId> <groupId>directory</groupId>
<artifactId>apacheds-core</artifactId> <artifactId>apacheds-core</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>directory</groupId> <groupId>directory</groupId>
<artifactId>apacheds-shared</artifactId> <artifactId>apacheds-shared</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>directory-shared</groupId> <groupId>directory-shared</groupId>
<artifactId>apache-ldapber-provider</artifactId> <artifactId>apache-ldapber-provider</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>directory-shared</groupId> <groupId>directory-shared</groupId>
<artifactId>ldap-common</artifactId> <artifactId>ldap-common</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>directory-asn1</groupId> <groupId>directory-asn1</groupId>
<artifactId>asn1-codec</artifactId> <artifactId>asn1-codec</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>directory-asn1</groupId> <groupId>directory-asn1</groupId>
<artifactId>asn1-der</artifactId> <artifactId>asn1-der</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>directory-shared</groupId> <groupId>directory-shared</groupId>
<artifactId>kerberos-common</artifactId> <artifactId>kerberos-common</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>directory-network</groupId> <groupId>directory-network</groupId>
<artifactId>mina</artifactId> <artifactId>mina</artifactId>
<scope>test</scope>
</dependency> </dependency>
<!-- <!--
<dependency> <dependency>
<groupId>org.apache.directory.server</groupId> <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-kerberos</artifactId> <artifactId>apacheds-protocol-kerberos</artifactId>
<version>0.7-SNAPSHOT</version> <version>0.7-SNAPSHOT</version>
<scope>test</scope>
</dependency> </dependency>
--> -->
<dependency> <dependency>
<groupId>directory-protocols</groupId> <groupId>directory-protocols</groupId>
<artifactId>kerberos-protocol</artifactId> <artifactId>kerberos-protocol</artifactId>
<scope>test</scope>
</dependency> </dependency>
<!-- <!--
<dependency> <dependency>
<groupId>org.apache.directory.server</groupId> <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId> <artifactId>apacheds-protocol-ldap</artifactId>
<version>1.0-RC1-SNAPSHOT</version> <version>1.0-RC1-SNAPSHOT</version>
<scope>test</scope>
</dependency> </dependency>
--> -->
<dependency> <dependency>
<groupId>directory-protocols</groupId> <groupId>directory-protocols</groupId>
<artifactId>ldap-protocol</artifactId> <artifactId>ldap-protocol</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>

View File

@ -192,6 +192,14 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring</artifactId> <artifactId>spring</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -84,10 +84,6 @@
<groupId>commons-httpclient</groupId> <groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId> <artifactId>commons-httpclient</artifactId>
</dependency> </dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
<dependency> <dependency>
<groupId>commons-beanutils</groupId> <groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId> <artifactId>commons-beanutils</artifactId>

33
pom.xml
View File

@ -255,7 +255,6 @@
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId> <artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.0</version> <version>1.0</version>
<!--
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>mockobjects</groupId> <groupId>mockobjects</groupId>
@ -270,7 +269,6 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
-->
</dependency> </dependency>
<dependency> <dependency>
@ -303,6 +301,12 @@
<version>1.0</version> <version>1.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
<version>1.0</version>
</dependency>
<!-- =============================== --> <!-- =============================== -->
<!-- Optional dependencies --> <!-- Optional dependencies -->
@ -682,6 +686,31 @@
<artifactId>ldap-protocol</artifactId> <artifactId>ldap-protocol</artifactId>
<version>0.9.2</version> <version>0.9.2</version>
</dependency> </dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
<version>0.1.8</version>
</dependency>
<dependency>
<groupId>p2psockets</groupId>
<artifactId>p2psockets-core</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>jxta</groupId>
<artifactId>jxta</artifactId>
<version>2.0</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>