Fix for maven 2 builds and organized the dependencies.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389950 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Frederick G. Oconer 2006-03-30 01:12:00 +00:00
parent ae01926a0b
commit b8b2258fc7
10 changed files with 651 additions and 315 deletions

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2006 The Apache Software Foundation
@ -14,13 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-console</artifactId>
@ -28,11 +35,26 @@
<description>ActiveMQ Management Console</description>
<dependencies>
<!-- activemq related dependencies -->
<dependency>
<groupId>incubator-activemq</groupId>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core-test</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activeio-core</artifactId>
</dependency>
<!-- geronimo -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
@ -112,4 +134,4 @@
</plugins>
</build>
</project>
</project>

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2006 The Apache Software Foundation
@ -14,13 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-core</artifactId>
@ -29,29 +36,21 @@
<dependencies>
<!--
<!-- activemq related dependencies -->
<dependency>
<groupId>org.apache.activemq.activeio</groupId>
<groupId>${pom.groupId}</groupId>
<artifactId>activeio-core</artifactId>
<version>3.0-SNAPSHOT</version>
</dependency>
-->
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-jaas</artifactId>
</dependency>
<!-- =============================== -->
<!-- common dependencies -->
<!-- =============================== -->
<!-- geronimo -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
@ -68,16 +67,8 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
<dependency>
<groupId>axion</groupId>
<artifactId>axion</artifactId>
</dependency>
<!-- commons -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@ -87,20 +78,34 @@
<artifactId>commons-primitives</artifactId>
</dependency>
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
<dependency>
<groupId>axion</groupId>
<artifactId>axion</artifactId>
</dependency>
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>jmdns</artifactId>
</dependency>
<dependency>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-jaas</artifactId>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>smack</artifactId>
@ -109,7 +114,6 @@
<groupId>activemq</groupId>
<artifactId>smackx</artifactId>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
@ -144,7 +148,6 @@
<groupId>activesoap</groupId>
<artifactId>jaxp-api</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
@ -164,13 +167,7 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-impl</artifactId>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
@ -307,4 +304,4 @@
</plugins>
</build>
</project>
</project>

View File

@ -1,56 +1,57 @@
<project>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq.sandbox</groupId>
<artifactId>activemq-sandbox</artifactId>
<groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-gbean-management</artifactId>
<name>ActiveMQ :: GBean Interfaces</name>
<build>
<sourceDirectory>src/java</sourceDirectory>
</build>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
</build>
<dependencies>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-management</artifactId>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jms</artifactId>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-management</artifactId>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-jacc</artifactId>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependencies>
<!-- geronimo legacy dependency -->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-management</artifactId>
<version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
</project>
</project>

View File

@ -1,68 +1,109 @@
<project>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq.sandbox</groupId>
<artifactId>activemq-sandbox</artifactId>
<groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-gbean</artifactId>
<name>ActiveMQ :: GBeans</name>
<dependencies>
<!-- activemq -->
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-gbean-management</artifactId>
</dependency>
<dependency> <!-- Used for unit tests -->
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core-test</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activeio-core</artifactId>
</dependency>
<!-- geronimo for legacy repository -->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
<version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-management</artifactId>
<version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*Test.*</include>
</includes>
<excludes>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>activemq-gbean-management</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-management</artifactId>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
</dependency>
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
</dependency>
</dependencies>
</project>
</project>

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2006 The Apache Software Foundation
@ -14,15 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-jaas</artifactId>
@ -51,95 +56,69 @@
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>directory</groupId>
<artifactId>apacheds-core</artifactId>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>directory</groupId>
<artifactId>apacheds-shared</artifactId>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>apache-ldapber-provider</artifactId>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>ldap-common</artifactId>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
<artifactId>asn1-codec</artifactId>
<version>0.3.2</version>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
<artifactId>asn1-ber</artifactId>
<version>0.3.2</version>
<exclusions>
<exclusion>
<groupId>commons-test</groupId>
<artifactId>commons-test</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
<artifactId>asn1-der</artifactId>
<version>0.3.2</version>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>kerberos-common</artifactId>
<version>0.5</version>
</dependency>
<dependency>
<groupId>directory-network</groupId>
<artifactId>mina</artifactId>
<version>0.7.3</version>
</dependency>
<!--
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-kerberos</artifactId>
<version>0.7-SNAPSHOT</version>
</dependency>
-->
<dependency>
<groupId>directory-protocols</groupId>
<artifactId>kerberos-protocol</artifactId>
<version>0.5</version>
</dependency>
<!--
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
<version>1.0-RC1-SNAPSHOT</version>
</dependency>
-->
<dependency>
<groupId>directory-protocols</groupId>
<artifactId>ldap-protocol</artifactId>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>directory</groupId>
<artifactId>apacheds-core</artifactId>
</dependency>
<dependency>
<groupId>directory</groupId>
<artifactId>apacheds-shared</artifactId>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>apache-ldapber-provider</artifactId>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>ldap-common</artifactId>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
<artifactId>asn1-codec</artifactId>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
<artifactId>asn1-der</artifactId>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>kerberos-common</artifactId>
</dependency>
<dependency>
<groupId>directory-network</groupId>
<artifactId>mina</artifactId>
</dependency>
<!--
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-kerberos</artifactId>
<version>0.7-SNAPSHOT</version>
</dependency>
-->
<dependency>
<groupId>directory-protocols</groupId>
<artifactId>kerberos-protocol</artifactId>
</dependency>
<!--
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
<version>1.0-RC1-SNAPSHOT</version>
</dependency>
-->
<dependency>
<groupId>directory-protocols</groupId>
<artifactId>ldap-protocol</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2006 The Apache Software Foundation
@ -14,13 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-optional</artifactId>
@ -28,25 +35,21 @@
<name>ActiveMQ :: Optional</name>
<dependencies>
<!-- activemq -->
<dependency>
<groupId>org.apache.activemq</groupId>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core-test</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activeio-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
@ -88,11 +91,12 @@
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
@ -128,4 +132,4 @@
</plugins>
</build>
</project>
</project>

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2006 The Apache Software Foundation
@ -14,13 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-ra</artifactId>
@ -29,11 +36,13 @@
<description>A JCA Resource Adapter used to integrate ActiveMQ with transactional enterprise containers</description>
<dependencies>
<!-- activemq -->
<dependency>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
@ -46,12 +55,6 @@
<groupId>activemq</groupId>
<artifactId>jmdns</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
@ -67,7 +70,12 @@
<artifactId>cglib-full</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@ -92,4 +100,4 @@
</build>
</project>
</project>

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2006 The Apache Software Foundation
@ -14,13 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-web</artifactId>
@ -29,14 +36,25 @@
<description>Web Connector for REST API and Streamlets support</description>
<dependencies>
<!-- activemq -->
<dependency>
<groupId>incubator-activemq</groupId>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core-test</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.0_spec</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@ -54,13 +72,18 @@
<groupId>jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
<!-- used for testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2006 The Apache Software Foundation
@ -14,13 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-assembly</artifactId>
@ -29,44 +36,96 @@
<description>Puts together the ActiveMQ distribution</description>
<dependencies>
<!-- activemq -->
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core-test</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>${pom.groupId}</groupId>
<artifactId>activeio-core</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-console</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-optional</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-ra</artifactId>
<type>rar</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-jaas</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-web</artifactId>
<type>war</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activecluster</artifactId>
<optional>true</optional>
</dependency>
<!-- commons -->
<dependency>
<groupId>commons-httpclient</groupId>
<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>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>activesoap</groupId>
<artifactId>jaxp-api</artifactId>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>jmdns</artifactId>
</dependency>
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
<dependency>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
</dependency>
<dependency>
@ -85,15 +144,23 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.0_spec</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<optional>true</optional>
</dependency>
<dependency>
@ -104,18 +171,45 @@
<groupId>jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!-- dependencies specific to this module -->
<dependency>
<groupId>jrms</groupId>
<artifactId>jrms</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.6.2</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
<version>2.6.2</version>
</dependency>
</dependencies>
<build>
<plugins>
<!-- Configure which tests are included/excuded -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@ -149,7 +243,7 @@
<descriptors>
<descriptor>src/main/descriptors/bin.xml</descriptor>
</descriptors>
<finalName>activemq-${project.version}</finalName>
<finalName>activemq-${pom.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
@ -163,7 +257,7 @@
<descriptors>
<descriptor>src/main/descriptors/all-jar.xml</descriptor>
</descriptors>
<finalName>activemq-full-${project.version}</finalName>
<finalName>activemq-full-${pom.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
@ -173,4 +267,4 @@
</plugins>
</build>
</project>
</project>

197
pom.xml
View File

@ -1,8 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
<!--
Copyright 2005-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
@ -52,6 +72,12 @@
<name>maven-csharp</name>
<url>http://maven-csharp.javaforge.com/repo</url>
</repository>
<repository>
<id>apache-maven1-snapshot</id>
<name>Activemq Maven1 Repo</name>
<url>http://cvs.apache.org/repository</url>
<layout>legacy</layout>
</repository>
</repositories>
<pluginRepositories>
@ -94,20 +120,22 @@
</distributionManagement>
<modules>
<module>activecluster</module>
<module>activemq-jaas</module>
<module>activemq-core</module>
<module>activemq-console</module>
<module>activemq-ra</module>
<module>activemq-jaas</module>
<!-- module>activemq-web</module -->
<module>activemq-optional</module>
<module>activemq-web</module>
<module>activemq-systest</module>
<module>activemq-gbean</module>
<module>activemq-gbean-management</module>
<!--module>activemq-systest</module -->
<module>assembly</module>
<!--
<module>activeio</module>
-->
<module>activecluster</module>
<!-- module>activecluster</module -->
</modules>
@ -132,7 +160,62 @@
<dependencyManagement>
<dependencies>
<!-- =============================== -->
<!-- ActiveMQ Dependencies -->
<!-- =============================== -->
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core-test</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-jaas</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-gbean-management</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activecluster</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-console</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-optional</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-ra</artifactId>
<version>${pom.version}</version>
<type>rar</type>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-web</artifactId>
<version>${pom.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activeio-core</artifactId>
<version>3.0-SNAPSHOT</version>
</dependency>
<!-- =============================== -->
<!-- Required dependencies -->
<!-- =============================== -->
@ -205,21 +288,19 @@
</dependency>
<!-- used to support optional transport configuration via URI query strings -->
<!--
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
</dependency>
-->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>2.1</version>
<optional>true</optional>
</dependency>
<!-- Optional Spring Support -->
<dependency>
<groupId>org.springframework</groupId>
@ -243,6 +324,12 @@
<version>10.1.1.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
<version>10.1.1.0</version>
<optional>true</optional>
</dependency>
<!-- Optional Axion support -->
<dependency>
@ -274,14 +361,15 @@
<version>1.7.2.2</version>
<optional>true</optional>
</dependency>
-->
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2</version>
<optional>true</optional>
</dependency>
-->
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
@ -469,6 +557,85 @@
<artifactId>ant</artifactId>
<version>1.6.2</version>
</dependency>
<!-- Reused Dependencies -->
<!-- ACTIVEMQ-CORE DEPENDENCIES -->
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>2.1</version>
</dependency>
<!-- ActiveMQ-Jaas Dependencies -->
<dependency>
<groupId>directory</groupId>
<artifactId>apacheds-core</artifactId>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>directory</groupId>
<artifactId>apacheds-shared</artifactId>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>apache-ldapber-provider</artifactId>
<version>0.9.2</version>
<exclusions>
<exclusion>
<groupId>commons-test</groupId>
<artifactId>commons-test</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>ldap-common</artifactId>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
<artifactId>asn1-codec</artifactId>
<version>0.3.2</version>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
<artifactId>asn1-der</artifactId>
<version>0.3.2</version>
<exclusions>
<exclusion>
<groupId>commons-test</groupId>
<artifactId>commons-test</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
<artifactId>kerberos-common</artifactId>
<version>0.5</version>
</dependency>
<dependency>
<groupId>directory-network</groupId>
<artifactId>mina</artifactId>
<version>0.7.3</version>
</dependency>
<dependency>
<groupId>directory-protocols</groupId>
<artifactId>kerberos-protocol</artifactId>
<version>0.5</version>
</dependency>
<dependency>
<groupId>directory-protocols</groupId>
<artifactId>ldap-protocol</artifactId>
<version>0.9.2</version>
</dependency>
</dependencies>
</dependencyManagement>
@ -556,4 +723,4 @@
</plugins>
</reporting>
</project>
</project>