Author: gnodet
Date: Mon Apr 17 15:39:14 2006
New Revision: 394797
URL: http://svn.apache.org/viewcvs?rev=394797&view=rev
Log:
Fix dependencies scopes for m2 build...
Modified:
incubator/activemq/trunk/activecluster/pom.xml
incubator/activemq/trunk/activeio/activeio-core/pom.xml
incubator/activemq/trunk/activeio/activeio-jxta/pom.xml
incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml
incubator/activemq/trunk/activemq-core/pom.xml
incubator/activemq/trunk/activemq-jaas/pom.xml
incubator/activemq/trunk/activemq-rar/pom.xml
incubator/activemq/trunk/assembly/pom.xml
incubator/activemq/trunk/pom.xml
Modified: incubator/activemq/trunk/activecluster/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activecluster/pom.xml?rev=394797&r1=394796&r2=394797&view=diff
==============================================================================
--- incubator/activemq/trunk/activecluster/pom.xml (original)
+++ incubator/activemq/trunk/activecluster/pom.xml Mon Apr 17 15:39:14 2006
@@ -28,9 +28,8 @@
<dependencies>
<dependency>
- <groupId>incubator-activemq</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>activemq-core</artifactId>
- <version>4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
Modified: incubator/activemq/trunk/activeio/activeio-core/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/pom.xml?rev=394797&r1=394796&r2=394797&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-core/pom.xml Mon Apr 17 15:39:14
2006
@@ -51,29 +51,33 @@
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
<!-- For HOWL integration -->
<dependency>
<groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
- <version>0.1.8</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>2.1</version>
<scope>test</scope>
</dependency>
@@ -81,19 +85,29 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>1.0-M5</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>1.0-M5</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- <version>3.0.1</version>
+ <optional>true</optional>
</dependency>
</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>
Modified: incubator/activemq/trunk/activeio/activeio-jxta/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-jxta/pom.xml?rev=394797&r1=394796&r2=394797&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-jxta/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-jxta/pom.xml Mon Apr 17 15:39:14
2006
@@ -49,12 +49,10 @@
<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>
Modified: incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml?rev=394797&r1=394796&r2=394797&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml Mon Apr 17
15:39:14 2006
@@ -53,9 +53,8 @@
<version>5.1.2</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
</dependency>
</dependencies>
Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/pom.xml?rev=394797&r1=394796&r2=394797&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Mon Apr 17 15:39:14 2006
@@ -44,6 +44,7 @@
<dependency>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-jaas</artifactId>
+ <optional>true</optional>
</dependency>
<!-- =============================== -->
@@ -58,81 +59,96 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+ <optional>true</optional>
</dependency>
<!-- commons -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>axion</groupId>
<artifactId>axion</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>jmdns</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>smack</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>smackx</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xmlpublic</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean_xpath</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
+ <scope>runtime</scope>
+ <optional>true</optional>
<exclusions>
<exclusion>
<groupId>xmlbeans</groupId>
@@ -143,34 +159,17 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>activesoap</groupId>
<artifactId>jaxp-api</artifactId>
+ <scope>test</scope>
</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>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -303,5 +302,37 @@
</plugins>
</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>
Modified: incubator/activemq/trunk/activemq-jaas/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/pom.xml?rev=394797&r1=394796&r2=394797&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/pom.xml (original)
+++ incubator/activemq/trunk/activemq-jaas/pom.xml Mon Apr 17 15:39:14 2006
@@ -63,56 +63,68 @@
<dependency>
<groupId>directory</groupId>
<artifactId>apacheds-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>directory</groupId>
<artifactId>apacheds-shared</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>apache-ldapber-provider</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>ldap-common</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
<artifactId>asn1-codec</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
<artifactId>asn1-der</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>kerberos-common</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>directory-network</groupId>
<artifactId>mina</artifactId>
+ <scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-kerberos</artifactId>
<version>0.7-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
-->
<dependency>
<groupId>directory-protocols</groupId>
<artifactId>kerberos-protocol</artifactId>
+ <scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
<version>1.0-RC1-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
-->
<dependency>
<groupId>directory-protocols</groupId>
<artifactId>ldap-protocol</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/activemq/trunk/activemq-rar/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-rar/pom.xml?rev=394797&r1=394796&r2=394797&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-rar/pom.xml (original)
+++ incubator/activemq/trunk/activemq-rar/pom.xml Mon Apr 17 15:39:14 2006
@@ -192,6 +192,14 @@
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/activemq/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/pom.xml?rev=394797&r1=394796&r2=394797&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Mon Apr 17 15:39:14 2006
@@ -85,10 +85,6 @@
<artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
Modified: incubator/activemq/trunk/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/pom.xml?rev=394797&r1=394796&r2=394797&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Mon Apr 17 15:39:14 2006
@@ -255,7 +255,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.0</version>
- <!--
<exclusions>
<exclusion>
<groupId>mockobjects</groupId>
@@ -270,7 +269,6 @@
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
- -->
</dependency>
<dependency>
@@ -303,6 +301,12 @@
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
<!-- =============================== -->
<!-- Optional dependencies -->
@@ -681,6 +685,31 @@
<groupId>directory-protocols</groupId>
<artifactId>ldap-protocol</artifactId>
<version>0.9.2</version>
+ </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>
