You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2021/08/30 16:27:58 UTC
[activemq-artemis] branch main updated: ARTEMIS-3451: add
dependencyManagement entry for qpid-jms-client,
remove various redundant uses of property
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 587e0f8 ARTEMIS-3451: add dependencyManagement entry for qpid-jms-client, remove various redundant uses of property
587e0f8 is described below
commit 587e0f8252c2f89526755f5a1113d87ca9255e2c
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Aug 30 17:26:28 2021 +0100
ARTEMIS-3451: add dependencyManagement entry for qpid-jms-client, remove various redundant uses of property
---
artemis-cli/pom.xml | 1 -
artemis-distribution/pom.xml | 1 -
examples/features/broker-connection/amqp-receiving-messages/pom.xml | 1 -
examples/features/broker-connection/amqp-sending-messages/pom.xml | 1 -
examples/features/broker-connection/amqp-sending-overssl/pom.xml | 1 -
examples/features/broker-connection/disaster-recovery/pom.xml | 1 -
examples/features/perf/perf/pom.xml | 1 -
examples/features/standard/broker-msg-auth-plugin/pom.xml | 1 -
examples/features/standard/broker-plugin/pom.xml | 1 -
examples/features/standard/interceptor-amqp/pom.xml | 1 -
examples/protocols/amqp/proton-clustered-cpp/pom.xml | 1 -
examples/protocols/amqp/proton-cpp/pom.xml | 1 -
examples/protocols/amqp/queue/pom.xml | 1 -
examples/protocols/amqp/sasl-scram/pom.xml | 1 -
pom.xml | 5 +++++
tests/joram-tests/pom.xml | 1 -
tests/karaf-client-integration-tests/pom.xml | 1 -
tests/smoke-tests/pom.xml | 1 -
18 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml
index 4b55472..d065060 100644
--- a/artemis-cli/pom.xml
+++ b/artemis-cli/pom.xml
@@ -89,7 +89,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index fcf1a13..23a6181 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -187,7 +187,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/examples/features/broker-connection/amqp-receiving-messages/pom.xml b/examples/features/broker-connection/amqp-receiving-messages/pom.xml
index 8400c51..b2668ec 100644
--- a/examples/features/broker-connection/amqp-receiving-messages/pom.xml
+++ b/examples/features/broker-connection/amqp-receiving-messages/pom.xml
@@ -39,7 +39,6 @@ under the License.
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
</dependencies>
diff --git a/examples/features/broker-connection/amqp-sending-messages/pom.xml b/examples/features/broker-connection/amqp-sending-messages/pom.xml
index bb760a7..f25abf1 100644
--- a/examples/features/broker-connection/amqp-sending-messages/pom.xml
+++ b/examples/features/broker-connection/amqp-sending-messages/pom.xml
@@ -39,7 +39,6 @@ under the License.
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
</dependencies>
diff --git a/examples/features/broker-connection/amqp-sending-overssl/pom.xml b/examples/features/broker-connection/amqp-sending-overssl/pom.xml
index 433c143..d2227ae 100644
--- a/examples/features/broker-connection/amqp-sending-overssl/pom.xml
+++ b/examples/features/broker-connection/amqp-sending-overssl/pom.xml
@@ -39,7 +39,6 @@ under the License.
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
</dependencies>
diff --git a/examples/features/broker-connection/disaster-recovery/pom.xml b/examples/features/broker-connection/disaster-recovery/pom.xml
index ed13bbf..5bfba42 100644
--- a/examples/features/broker-connection/disaster-recovery/pom.xml
+++ b/examples/features/broker-connection/disaster-recovery/pom.xml
@@ -39,7 +39,6 @@ under the License.
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
</dependencies>
diff --git a/examples/features/perf/perf/pom.xml b/examples/features/perf/perf/pom.xml
index 06c512a..c0aa46f 100644
--- a/examples/features/perf/perf/pom.xml
+++ b/examples/features/perf/perf/pom.xml
@@ -74,7 +74,6 @@ under the License.
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
</dependencies>
diff --git a/examples/features/standard/broker-msg-auth-plugin/pom.xml b/examples/features/standard/broker-msg-auth-plugin/pom.xml
index 805e279..46c4170 100644
--- a/examples/features/standard/broker-msg-auth-plugin/pom.xml
+++ b/examples/features/standard/broker-msg-auth-plugin/pom.xml
@@ -54,7 +54,6 @@ under the License.
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
</dependencies>
diff --git a/examples/features/standard/broker-plugin/pom.xml b/examples/features/standard/broker-plugin/pom.xml
index 1eac077..6216f68 100644
--- a/examples/features/standard/broker-plugin/pom.xml
+++ b/examples/features/standard/broker-plugin/pom.xml
@@ -54,7 +54,6 @@ under the License.
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
</dependencies>
diff --git a/examples/features/standard/interceptor-amqp/pom.xml b/examples/features/standard/interceptor-amqp/pom.xml
index dc12b18..6597c4c 100644
--- a/examples/features/standard/interceptor-amqp/pom.xml
+++ b/examples/features/standard/interceptor-amqp/pom.xml
@@ -45,7 +45,6 @@ under the License.
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
<dependency>
diff --git a/examples/protocols/amqp/proton-clustered-cpp/pom.xml b/examples/protocols/amqp/proton-clustered-cpp/pom.xml
index 54e6b9a..ffa3532 100644
--- a/examples/protocols/amqp/proton-clustered-cpp/pom.xml
+++ b/examples/protocols/amqp/proton-clustered-cpp/pom.xml
@@ -48,7 +48,6 @@ under the License.
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
</dependencies>
diff --git a/examples/protocols/amqp/proton-cpp/pom.xml b/examples/protocols/amqp/proton-cpp/pom.xml
index ba0ae89..1b7962c 100644
--- a/examples/protocols/amqp/proton-cpp/pom.xml
+++ b/examples/protocols/amqp/proton-cpp/pom.xml
@@ -48,7 +48,6 @@ under the License.
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
</dependencies>
diff --git a/examples/protocols/amqp/queue/pom.xml b/examples/protocols/amqp/queue/pom.xml
index 5cee27c..eb553ed 100644
--- a/examples/protocols/amqp/queue/pom.xml
+++ b/examples/protocols/amqp/queue/pom.xml
@@ -39,7 +39,6 @@ under the License.
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
</dependencies>
diff --git a/examples/protocols/amqp/sasl-scram/pom.xml b/examples/protocols/amqp/sasl-scram/pom.xml
index aa9a397..cc52e11 100644
--- a/examples/protocols/amqp/sasl-scram/pom.xml
+++ b/examples/protocols/amqp/sasl-scram/pom.xml
@@ -38,7 +38,6 @@ under the License.
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index d479ced..2dc512f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -635,6 +635,11 @@
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-jms-client</artifactId>
+ <version>${qpid.jms.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>${activemq5-version}</version>
diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml
index 4e0a68d..d20ea42 100644
--- a/tests/joram-tests/pom.xml
+++ b/tests/joram-tests/pom.xml
@@ -82,7 +82,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/karaf-client-integration-tests/pom.xml b/tests/karaf-client-integration-tests/pom.xml
index 028369d..0fc03d6 100644
--- a/tests/karaf-client-integration-tests/pom.xml
+++ b/tests/karaf-client-integration-tests/pom.xml
@@ -79,7 +79,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/smoke-tests/pom.xml b/tests/smoke-tests/pom.xml
index 541aec0..c1f22b7 100644
--- a/tests/smoke-tests/pom.xml
+++ b/tests/smoke-tests/pom.xml
@@ -93,7 +93,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>