- Modified the version of the mx4j dependency to use the predefined one.

- Excluded HttpsTransportBrokerTest.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385695 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Adrian T. Co 2006-03-13 23:15:53 +00:00
parent d11ec2baf6
commit f471303cc5
4 changed files with 30 additions and 14 deletions

View File

@ -221,27 +221,27 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>2.1.1</version>
<version>${mx4j_version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
<version>2.1.1</version>
<version>${mx4j_version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
<version>2.1.1</version>
<version>${mx4j_remote_version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
<version>2.1.1</version>
<version>${mx4j_version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-impl</artifactId>
<version>2.1.1</version>
<version>${mx4j_version}</version>
</dependency>
<!-- gram libraries -->

View File

@ -161,6 +161,19 @@
<version>${jmdns_version}</version>
</dependency>
<!-- MX4J Dependency -->
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>${mx4j_version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
<version>${mx4j_remote_version}</version>
</dependency>
<!-- Used for unit tests -->
<dependency>
<groupId>${pom.groupId}</groupId>
@ -192,10 +205,13 @@
<!-- http://jira.activemq.org/jira/browse/AMQ-628 -->
<exclude>**/HttpTransportBrokerTest.*</exclude>
<!-- http://jira.activemq.org/jira/browse/AMQ-629 -->
<exclude>**/SslTransportBrokerTest.*</exclude>
<!-- http://jira.activemq.org/jira/browse/AMQ-631 -->
<exclude>**/HttpsTransportBrokerTest.*</exclude>
</excludes>
</unitTest>

View File

@ -107,27 +107,27 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>2.1.1</version>
<version>${mx4j_version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
<version>2.1.1</version>
<version>${mx4j_version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
<version>2.1.1</version>
<version>${mx4j_remote_version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
<version>2.1.1</version>
<version>${mx4j_version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-impl</artifactId>
<version>2.1.1</version>
<version>${mx4j_version}</version>
</dependency>
<!-- For Spring -->

View File

@ -329,7 +329,7 @@
<!-- https://jira.logicblaze.com/jira/browse/AMQ-472 -->
<exclude>**/TopicClusterTest.*</exclude>
<!-- http://jira.activemq.org/jira/browse/AMQ-562 -->
<!-- http://jira.activemq.org/jira/browse/AMQ-562 -->
<exclude>**/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.*</exclude>
<!-- http://jira.activemq.org/jira/browse/AMQ-540 -->
<exclude>**/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.*</exclude>
@ -354,7 +354,7 @@
<!-- https://jira.logicblaze.com/jira/browse/AMQ-474 -->
<exclude>**/MultiBrokersMultiClientsUsingTcpTest.*</exclude>
<!-- http://jira.activemq.org/jira/browse/AMQ-575 -->
<!-- http://jira.activemq.org/jira/browse/AMQ-575 -->
<exclude>**/QueueClusterTest.*</exclude>
</excludes>