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 2022/07/04 15:28:56 UTC
[activemq-artemis] branch main updated (8ab792d13c -> 831292e975)
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
from 8ab792d13c NO-JIRA: update stale Travis config
new aa14c6e2c8 ARTEMIS-3883: align version of activemq-client used in tests and examples
new 831292e975 ARTEMIS-3883: use common config property to ensure already-aligned httpclient version remains so
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/features/perf/perf/pom.xml | 1 -
examples/features/standard/security-keycloak/pom.xml | 6 ++----
.../sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml | 3 +--
examples/pom.xml | 1 -
examples/protocols/openwire/chat/pom.xml | 1 -
examples/protocols/openwire/message-listener/pom.xml | 3 +--
examples/protocols/openwire/message-recovery/pom.xml | 3 +--
examples/protocols/openwire/queue/pom.xml | 3 +--
examples/protocols/openwire/virtual-topic-mapping/pom.xml | 3 +--
9 files changed, 7 insertions(+), 17 deletions(-)
[activemq-artemis] 02/02: ARTEMIS-3883: use common config property to ensure already-aligned httpclient version remains so
Posted by ro...@apache.org.
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
commit 831292e975d195c862b4110062885725eec60891
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jul 4 14:51:07 2022 +0100
ARTEMIS-3883: use common config property to ensure already-aligned httpclient version remains so
---
examples/features/standard/security-keycloak/pom.xml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/examples/features/standard/security-keycloak/pom.xml b/examples/features/standard/security-keycloak/pom.xml
index a2a2060682..0458108a45 100644
--- a/examples/features/standard/security-keycloak/pom.xml
+++ b/examples/features/standard/security-keycloak/pom.xml
@@ -34,7 +34,6 @@ under the License.
<properties>
<activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
<version.org.keycloak>12.0.3</version.org.keycloak>
- <version.org.apache.httpcomponents>4.5.13</version.org.apache.httpcomponents>
</properties>
<dependencies>
@@ -86,7 +85,7 @@ under the License.
<!-- allow keycloak login module classloading from the artemis lib dir-->
<arg>org.keycloak:keycloak-adapter-core:jar:${version.org.keycloak}</arg>
<arg>org.keycloak:keycloak-core:jar:${version.org.keycloak}</arg>
- <arg>org.apache.httpcomponents:httpclient:jar:${version.org.apache.httpcomponents}</arg>
+ <arg>org.apache.httpcomponents:httpclient:jar:${apache.httpclient.version}</arg>
</libListWithDeps>
</configuration>
</execution>
@@ -145,14 +144,13 @@ under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${version.org.apache.httpcomponents}</version>
+ <version>${apache.httpclient.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
<id>run-keycloak</id>
[activemq-artemis] 01/02: ARTEMIS-3883: align version of activemq-client used in tests and examples
Posted by ro...@apache.org.
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
commit aa14c6e2c84d02ec54d52a4075135ecad826901a
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jul 4 14:23:19 2022 +0100
ARTEMIS-3883: align version of activemq-client used in tests and examples
---
examples/features/perf/perf/pom.xml | 1 -
.../sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml | 3 +--
examples/pom.xml | 1 -
examples/protocols/openwire/chat/pom.xml | 1 -
examples/protocols/openwire/message-listener/pom.xml | 3 +--
examples/protocols/openwire/message-recovery/pom.xml | 3 +--
examples/protocols/openwire/queue/pom.xml | 3 +--
examples/protocols/openwire/virtual-topic-mapping/pom.xml | 3 +--
8 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/examples/features/perf/perf/pom.xml b/examples/features/perf/perf/pom.xml
index 82de46f3f4..efcd9e7fab 100644
--- a/examples/features/perf/perf/pom.xml
+++ b/examples/features/perf/perf/pom.xml
@@ -49,7 +49,6 @@ under the License.
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>${activemq5-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml b/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml
index 63d079fe36..b4a9e0700b 100644
--- a/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml
+++ b/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml
@@ -50,7 +50,6 @@ under the License.
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>${activemq5-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -109,4 +108,4 @@ under the License.
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/pom.xml b/examples/pom.xml
index 7eb236475f..2922d8122e 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -33,7 +33,6 @@ under the License.
<name>ActiveMQ Artemis Examples</name>
<properties>
- <activemq5-version>5.12.0</activemq5-version>
<udp-address>231.7.7.7</udp-address>
<activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties>
diff --git a/examples/protocols/openwire/chat/pom.xml b/examples/protocols/openwire/chat/pom.xml
index d8646e8f58..1bc2d81e9c 100644
--- a/examples/protocols/openwire/chat/pom.xml
+++ b/examples/protocols/openwire/chat/pom.xml
@@ -54,7 +54,6 @@ under the License.
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>${activemq5-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/examples/protocols/openwire/message-listener/pom.xml b/examples/protocols/openwire/message-listener/pom.xml
index a93dcaaae7..1d0f143774 100644
--- a/examples/protocols/openwire/message-listener/pom.xml
+++ b/examples/protocols/openwire/message-listener/pom.xml
@@ -49,7 +49,6 @@ under the License.
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>${activemq5-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -129,4 +128,4 @@ under the License.
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/protocols/openwire/message-recovery/pom.xml b/examples/protocols/openwire/message-recovery/pom.xml
index 570b770c96..28cc91ef98 100644
--- a/examples/protocols/openwire/message-recovery/pom.xml
+++ b/examples/protocols/openwire/message-recovery/pom.xml
@@ -49,7 +49,6 @@ under the License.
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>${activemq5-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -115,4 +114,4 @@ under the License.
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/protocols/openwire/queue/pom.xml b/examples/protocols/openwire/queue/pom.xml
index 5587bfe199..c4145842fc 100644
--- a/examples/protocols/openwire/queue/pom.xml
+++ b/examples/protocols/openwire/queue/pom.xml
@@ -49,7 +49,6 @@ under the License.
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>${activemq5-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -132,4 +131,4 @@ under the License.
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/protocols/openwire/virtual-topic-mapping/pom.xml b/examples/protocols/openwire/virtual-topic-mapping/pom.xml
index 3036f1286c..2cddf120ea 100644
--- a/examples/protocols/openwire/virtual-topic-mapping/pom.xml
+++ b/examples/protocols/openwire/virtual-topic-mapping/pom.xml
@@ -49,7 +49,6 @@ under the License.
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>${activemq5-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -132,4 +131,4 @@ under the License.
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>