diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml index d3181466..eef6997b 100644 --- a/artemis-distribution/pom.xml +++ b/artemis-distribution/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples artemis-examples-build - 2.55.0 + 2.56.0-SNAPSHOT artemis-distribution diff --git a/examples/features/broker-connection/amqp-bridge/pom.xml b/examples/features/broker-connection/amqp-bridge/pom.xml index 447497cb..a41ce75f 100644 --- a/examples/features/broker-connection/amqp-bridge/pom.xml +++ b/examples/features/broker-connection/amqp-bridge/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-bridge diff --git a/examples/features/broker-connection/amqp-federation-multicast-fanout/pom.xml b/examples/features/broker-connection/amqp-federation-multicast-fanout/pom.xml index bcbfc040..0de2ede4 100644 --- a/examples/features/broker-connection/amqp-federation-multicast-fanout/pom.xml +++ b/examples/features/broker-connection/amqp-federation-multicast-fanout/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-federation-multicast-fanout diff --git a/examples/features/broker-connection/amqp-federation-multicast-hub-spoke/pom.xml b/examples/features/broker-connection/amqp-federation-multicast-hub-spoke/pom.xml index c0372ef5..dad5a3c1 100644 --- a/examples/features/broker-connection/amqp-federation-multicast-hub-spoke/pom.xml +++ b/examples/features/broker-connection/amqp-federation-multicast-hub-spoke/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-federation-multicast-hub-spoke diff --git a/examples/features/broker-connection/amqp-federation-multicast-ring/pom.xml b/examples/features/broker-connection/amqp-federation-multicast-ring/pom.xml index b02bc5f2..6d7e987a 100644 --- a/examples/features/broker-connection/amqp-federation-multicast-ring/pom.xml +++ b/examples/features/broker-connection/amqp-federation-multicast-ring/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-federation-multicast-ring diff --git a/examples/features/broker-connection/amqp-federation-over-ssl/pom.xml b/examples/features/broker-connection/amqp-federation-over-ssl/pom.xml index b346f416..67259dcd 100644 --- a/examples/features/broker-connection/amqp-federation-over-ssl/pom.xml +++ b/examples/features/broker-connection/amqp-federation-over-ssl/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-federation-over-ssl diff --git a/examples/features/broker-connection/amqp-federation-queue-dual-federation/pom.xml b/examples/features/broker-connection/amqp-federation-queue-dual-federation/pom.xml index e0dfe59d..a780d44c 100644 --- a/examples/features/broker-connection/amqp-federation-queue-dual-federation/pom.xml +++ b/examples/features/broker-connection/amqp-federation-queue-dual-federation/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-federation-queue-dual-federation diff --git a/examples/features/broker-connection/amqp-federation-queue-multiple-brokers/pom.xml b/examples/features/broker-connection/amqp-federation-queue-multiple-brokers/pom.xml index 2ced831e..67c83d25 100644 --- a/examples/features/broker-connection/amqp-federation-queue-multiple-brokers/pom.xml +++ b/examples/features/broker-connection/amqp-federation-queue-multiple-brokers/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-federation-queue-multiple-brokers diff --git a/examples/features/broker-connection/amqp-federation-queue-priority/pom.xml b/examples/features/broker-connection/amqp-federation-queue-priority/pom.xml index 517ac407..90bfff53 100644 --- a/examples/features/broker-connection/amqp-federation-queue-priority/pom.xml +++ b/examples/features/broker-connection/amqp-federation-queue-priority/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-federation-queue-priority diff --git a/examples/features/broker-connection/amqp-federation-queue-pull-messages/pom.xml b/examples/features/broker-connection/amqp-federation-queue-pull-messages/pom.xml index ca766af8..1ba2b6ad 100644 --- a/examples/features/broker-connection/amqp-federation-queue-pull-messages/pom.xml +++ b/examples/features/broker-connection/amqp-federation-queue-pull-messages/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-federation-queue-pull-messages diff --git a/examples/features/broker-connection/amqp-federation/pom.xml b/examples/features/broker-connection/amqp-federation/pom.xml index 68680006..4e656700 100644 --- a/examples/features/broker-connection/amqp-federation/pom.xml +++ b/examples/features/broker-connection/amqp-federation/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-federation diff --git a/examples/features/broker-connection/amqp-receiving-messages/pom.xml b/examples/features/broker-connection/amqp-receiving-messages/pom.xml index 0b01087e..1699eef8 100644 --- a/examples/features/broker-connection/amqp-receiving-messages/pom.xml +++ b/examples/features/broker-connection/amqp-receiving-messages/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-receiving-messages diff --git a/examples/features/broker-connection/amqp-sending-messages-multicast/pom.xml b/examples/features/broker-connection/amqp-sending-messages-multicast/pom.xml index 6f26d611..7f552b39 100644 --- a/examples/features/broker-connection/amqp-sending-messages-multicast/pom.xml +++ b/examples/features/broker-connection/amqp-sending-messages-multicast/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-sending-messages-multicast diff --git a/examples/features/broker-connection/amqp-sending-messages/pom.xml b/examples/features/broker-connection/amqp-sending-messages/pom.xml index b2926950..906946d7 100644 --- a/examples/features/broker-connection/amqp-sending-messages/pom.xml +++ b/examples/features/broker-connection/amqp-sending-messages/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-sending-messages diff --git a/examples/features/broker-connection/amqp-sending-overssl/pom.xml b/examples/features/broker-connection/amqp-sending-overssl/pom.xml index b4ee685a..bf73de74 100644 --- a/examples/features/broker-connection/amqp-sending-overssl/pom.xml +++ b/examples/features/broker-connection/amqp-sending-overssl/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT amqp-ssl-enabled diff --git a/examples/features/broker-connection/disaster-recovery/pom.xml b/examples/features/broker-connection/disaster-recovery/pom.xml index b35d239a..8119a7cf 100644 --- a/examples/features/broker-connection/disaster-recovery/pom.xml +++ b/examples/features/broker-connection/disaster-recovery/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT disaster-recovery diff --git a/examples/features/broker-connection/ha-with-dual-mirror/pom.xml b/examples/features/broker-connection/ha-with-dual-mirror/pom.xml index 44080ad6..87e44e87 100644 --- a/examples/features/broker-connection/ha-with-dual-mirror/pom.xml +++ b/examples/features/broker-connection/ha-with-dual-mirror/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT ha-with-dual-mirror diff --git a/examples/features/broker-connection/ha-with-mesh-mirror/pom.xml b/examples/features/broker-connection/ha-with-mesh-mirror/pom.xml index f9b62095..71c1b0c2 100644 --- a/examples/features/broker-connection/ha-with-mesh-mirror/pom.xml +++ b/examples/features/broker-connection/ha-with-mesh-mirror/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker-connection broker-connections - 2.55.0 + 2.56.0-SNAPSHOT ha-with-mesh-mirror diff --git a/examples/features/broker-connection/pom.xml b/examples/features/broker-connection/pom.xml index dff37879..4a6559ef 100644 --- a/examples/features/broker-connection/pom.xml +++ b/examples/features/broker-connection/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-features - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.broker-connection diff --git a/examples/features/clustered/client-side-load-balancing/pom.xml b/examples/features/clustered/client-side-load-balancing/pom.xml index 48fec8da..f18251c5 100644 --- a/examples/features/clustered/client-side-load-balancing/pom.xml +++ b/examples/features/clustered/client-side-load-balancing/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT client-side-load-balancing @@ -57,7 +57,7 @@ under the License. ${noServer} ${basedir}/target/server0 - true + tcp://localhost:61617,tcp://localhost:61618 --queues exampleQueue @@ -78,7 +78,7 @@ under the License. ${noServer} ${basedir}/target/server1 - true + tcp://localhost:61616,tcp://localhost:61618 1 -Djava.net.preferIPv4Stack=true @@ -100,7 +100,7 @@ under the License. ${noServer} ${basedir}/target/server2 - true + tcp://localhost:61616,tcp://localhost:61618 2 -Djava.net.preferIPv4Stack=true diff --git a/examples/features/clustered/client-side-load-balancing/readme.md b/examples/features/clustered/client-side-load-balancing/readme.md index f8c1427d..dcc1a018 100644 --- a/examples/features/clustered/client-side-load-balancing/readme.md +++ b/examples/features/clustered/client-side-load-balancing/readme.md @@ -8,10 +8,10 @@ This example demonstrates how connections created from a single JMS Connection f The particular load-balancing policy can be chosen to be random, round-robin or user-defined. Please see the user guide for more details of how to configure the specific load-balancing policy. In this example we will use the default round-robin load balancing policy. -The list of servers over which Apache Artemis will round-robin the connections can either be specified explicitly in the connection factory when instantiating it directly, when configuring it on the broker or configured to use UDP discovery to discover the list of servers over which to round-robin. This example will use UDP discovery to obtain the list. +The list of servers over which Apache Artemis will round-robin the connections can either be specified explicitly in the connection factory when instantiating it directly, when configuring it on the broker or configured to use server discovery to discover the list of servers over which to round-robin. This example will specify explicitly the list of servers. -This example starts three servers which all broadcast their location using UDP discovery. The UDP broadcast configuration can be seen in the `broker.xml` file. +This example starts three servers. The configuration can be seen in the `broker.xml` file. -A JMS ConnectionFactory is deployed on each broker specifying the discovery group that will be used by that connection factory. +A JMS ConnectionFactory is deployed on each broker specifying the list of servers. For more information on Apache Artemis load balancing, and clustering in general, please see the clustering section of the user manual. \ No newline at end of file diff --git a/examples/features/clustered/client-side-load-balancing/src/main/resources/jndi.properties b/examples/features/clustered/client-side-load-balancing/src/main/resources/jndi.properties index d3f932c2..e54ca074 100644 --- a/examples/features/clustered/client-side-load-balancing/src/main/resources/jndi.properties +++ b/examples/features/clustered/client-side-load-balancing/src/main/resources/jndi.properties @@ -16,5 +16,5 @@ # under the License. java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory -connectionFactory.ConnectionFactory=udp://231.7.7.7:9876 +connectionFactory.ConnectionFactory=(tcp://localhost:61616,tcp://localhost:61617,tcp://localhost:61618) queue.queue/exampleQueue=exampleQueue diff --git a/examples/features/clustered/clustered-durable-subscription/pom.xml b/examples/features/clustered/clustered-durable-subscription/pom.xml index 42e6aa7a..e1ea9115 100644 --- a/examples/features/clustered/clustered-durable-subscription/pom.xml +++ b/examples/features/clustered/clustered-durable-subscription/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT clustered-durable-subscription @@ -56,17 +56,10 @@ under the License. ${noServer} - true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 -Djava.net.preferIPv4Stack=true - - --cluster-user - my-cluster-user - --cluster-password - my-cluster-password - @@ -76,18 +69,11 @@ under the License. ${noServer} - true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 1 - -Djava.net.preferIPv4Stack=true - - --cluster-user - my-cluster-user - --cluster-password - my-cluster-password - + -Djava.net.preferIPv4Stack=true diff --git a/examples/features/clustered/clustered-durable-subscription/readme.md b/examples/features/clustered/clustered-durable-subscription/readme.md index 4404cdd2..8c286cd8 100644 --- a/examples/features/clustered/clustered-durable-subscription/readme.md +++ b/examples/features/clustered/clustered-durable-subscription/readme.md @@ -21,7 +21,9 @@ The cli create method will define a similar section by default if you use `--clu true STRICT 1 - + + server1-connector + For more information on Apache Artemis load balancing, and clustering in general, please see the "Clusters" chapter of the user manual. \ No newline at end of file diff --git a/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml index 8b899105..939f724a 100644 --- a/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml @@ -32,6 +32,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -40,23 +41,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - my-cluster-user my-cluster-password @@ -67,7 +51,9 @@ under the License. true STRICT 1 - + + server1-connector + diff --git a/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml index 8083ed82..3ea5fef1 100644 --- a/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml @@ -31,6 +31,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -39,23 +40,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - my-cluster-user my-cluster-password @@ -66,7 +50,9 @@ under the License. true STRICT 1 - + + server0-connector + diff --git a/examples/features/clustered/clustered-grouping/pom.xml b/examples/features/clustered/clustered-grouping/pom.xml index edeb2cca..f1fc0f2c 100644 --- a/examples/features/clustered/clustered-grouping/pom.xml +++ b/examples/features/clustered/clustered-grouping/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT clustered-grouping diff --git a/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server0/broker.xml index 2c2f0a6d..a6a69f95 100644 --- a/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server0/broker.xml @@ -33,6 +33,8 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 + tcp://localhost:61618 @@ -41,22 +43,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -68,7 +54,10 @@ under the License. true STRICT 1 - + + server1-connector + server2-connector + diff --git a/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server1/broker.xml index c6f1fc3f..86175a8a 100644 --- a/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server1/broker.xml @@ -32,6 +32,8 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 + tcp://localhost:61618 @@ -40,22 +42,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +53,10 @@ under the License. true STRICT 1 - + + server0-connector + server2-connector + diff --git a/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server2/broker.xml b/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server2/broker.xml index ad565126..e1124b76 100644 --- a/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server2/broker.xml +++ b/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server2/broker.xml @@ -32,6 +32,8 @@ under the License. tcp://localhost:61618 + tcp://localhost:61616 + tcp://localhost:61617 @@ -40,22 +42,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +53,10 @@ under the License. true STRICT 1 - + + server0-connector + server1-connector + diff --git a/examples/features/clustered/clustered-jgroups/pom.xml b/examples/features/clustered/clustered-jgroups/pom.xml index cccc8f2f..5f7853d4 100644 --- a/examples/features/clustered/clustered-jgroups/pom.xml +++ b/examples/features/clustered/clustered-jgroups/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT clustered-jgroups @@ -59,7 +59,7 @@ under the License. ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true -Dartemis.discovery.enabled=true @@ -72,7 +72,7 @@ under the License. ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true -Dartemis.discovery.enabled=true diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/server-ca-truststore.jks b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/server-ca-truststore.jks new file mode 100644 index 00000000..3fe0f29a Binary files /dev/null and b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/server-ca-truststore.jks differ diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/server-keystore.jks b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/server-keystore.jks new file mode 100644 index 00000000..5a7e2c00 Binary files /dev/null and b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/server-keystore.jks differ diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml index 7168aeb1..9edb89d5 100644 --- a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml +++ b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml @@ -21,6 +21,13 @@ bind_port="${jgroups.bind_port:7800}" external_addr="${jgroups.external_addr}" external_port="${jgroups.external_port}" + tls.enabled="true" + tls.client_auth="NEED" + tls.keystore_path="${data.dir}/../etc/server-keystore.jks" + tls.keystore_password="securepass" + tls.keystore_alias="server" + tls.truststore_path="${data.dir}/../etc/server-keystore.jks" + tls.truststore_password="securepass" thread_pool.min_threads="0" thread_pool.max_threads="200" thread_pool.keep_alive_time="30000"/> diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/server-ca-truststore.jks b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/server-ca-truststore.jks new file mode 100644 index 00000000..3fe0f29a Binary files /dev/null and b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/server-ca-truststore.jks differ diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/server-keystore.jks b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/server-keystore.jks new file mode 100644 index 00000000..5a7e2c00 Binary files /dev/null and b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/server-keystore.jks differ diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml index d4693766..cd250c07 100644 --- a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml +++ b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml @@ -21,6 +21,13 @@ bind_port="${jgroups.bind_port:7800}" external_addr="${jgroups.external_addr}" external_port="${jgroups.external_port}" + tls.enabled="true" + tls.client_auth="NEED" + tls.keystore_path="${data.dir}/../etc/server-keystore.jks" + tls.keystore_password="securepass" + tls.keystore_alias="server" + tls.truststore_path="${data.dir}/../etc/server-keystore.jks" + tls.truststore_password="securepass" thread_pool.min_threads="0" thread_pool.max_threads="200" thread_pool.keep_alive_time="30000"/> diff --git a/examples/features/clustered/clustered-queue/pom.xml b/examples/features/clustered/clustered-queue/pom.xml index 7e4e3423..105ac32e 100644 --- a/examples/features/clustered/clustered-queue/pom.xml +++ b/examples/features/clustered/clustered-queue/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT clustered-queue diff --git a/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml index 83d16969..c29b8e71 100644 --- a/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml @@ -31,6 +31,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -39,22 +40,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +51,9 @@ under the License. true STRICT 1 - + + server1-connector + diff --git a/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml index 46b4dda3..44e6ab38 100644 --- a/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml @@ -32,6 +32,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -40,22 +41,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +52,9 @@ under the License. true STRICT 1 - + + server0-connector + diff --git a/examples/features/clustered/clustered-static-discovery-uri/pom.xml b/examples/features/clustered/clustered-static-discovery-uri/pom.xml index 3ab68b78..ada870f3 100644 --- a/examples/features/clustered/clustered-static-discovery-uri/pom.xml +++ b/examples/features/clustered/clustered-static-discovery-uri/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT clustered-static-discovery-uri diff --git a/examples/features/clustered/clustered-static-discovery/pom.xml b/examples/features/clustered/clustered-static-discovery/pom.xml index ec6d2fe0..1cdc02ed 100644 --- a/examples/features/clustered/clustered-static-discovery/pom.xml +++ b/examples/features/clustered/clustered-static-discovery/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT clustered-static-discovery diff --git a/examples/features/clustered/clustered-static-oneway/pom.xml b/examples/features/clustered/clustered-static-oneway/pom.xml index 78ae8dbb..47109b1d 100644 --- a/examples/features/clustered/clustered-static-oneway/pom.xml +++ b/examples/features/clustered/clustered-static-oneway/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT clustered-static-oneway diff --git a/examples/features/clustered/clustered-topic-uri/pom.xml b/examples/features/clustered/clustered-topic-uri/pom.xml index e3dbfbd8..b951927e 100644 --- a/examples/features/clustered/clustered-topic-uri/pom.xml +++ b/examples/features/clustered/clustered-topic-uri/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT clustered-topic-uri diff --git a/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server0/broker.xml index f1ba5472..a64175a8 100644 --- a/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server0/broker.xml @@ -41,28 +41,11 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - my-cluster-user my-cluster-password - + diff --git a/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server1/broker.xml index d7c800c6..5e709726 100644 --- a/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server1/broker.xml @@ -39,28 +39,12 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password - + diff --git a/examples/features/clustered/clustered-topic/pom.xml b/examples/features/clustered/clustered-topic/pom.xml index 7eb215ce..ac61b133 100644 --- a/examples/features/clustered/clustered-topic/pom.xml +++ b/examples/features/clustered/clustered-topic/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT clustered-topic diff --git a/examples/features/clustered/clustered-topic/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-topic/src/main/resources/activemq/server0/broker.xml index caf2556e..e76f3e66 100644 --- a/examples/features/clustered/clustered-topic/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-topic/src/main/resources/activemq/server0/broker.xml @@ -32,6 +32,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -41,23 +42,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - my-cluster-user my-cluster-password @@ -68,7 +52,9 @@ under the License. true STRICT 1 - + + server1-connector + diff --git a/examples/features/clustered/clustered-topic/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-topic/src/main/resources/activemq/server1/broker.xml index 573f83ce..105ccda8 100644 --- a/examples/features/clustered/clustered-topic/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-topic/src/main/resources/activemq/server1/broker.xml @@ -31,6 +31,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -39,22 +40,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +51,9 @@ under the License. true STRICT 1 - + + server0-connector + diff --git a/examples/features/clustered/pom.xml b/examples/features/clustered/pom.xml index e640dc37..8e32b681 100644 --- a/examples/features/clustered/pom.xml +++ b/examples/features/clustered/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-features - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.clustered diff --git a/examples/features/clustered/queue-message-redistribution/pom.xml b/examples/features/clustered/queue-message-redistribution/pom.xml index b1fbd7e4..c8e2ff4b 100644 --- a/examples/features/clustered/queue-message-redistribution/pom.xml +++ b/examples/features/clustered/queue-message-redistribution/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT queue-message-redistribution diff --git a/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml index d75d4a92..cbed6e54 100644 --- a/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml @@ -31,6 +31,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -39,22 +40,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +51,9 @@ under the License. true ON_DEMAND 1 - + + server1-connector + diff --git a/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml index eb05b837..2cc8efb8 100644 --- a/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml @@ -32,6 +32,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -40,22 +41,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +52,9 @@ under the License. true ON_DEMAND 1 - + + server0-connector + diff --git a/examples/features/clustered/shared-storage-static-cluster/pom.xml b/examples/features/clustered/shared-storage-static-cluster/pom.xml index 6718d260..66dfb27d 100644 --- a/examples/features/clustered/shared-storage-static-cluster/pom.xml +++ b/examples/features/clustered/shared-storage-static-cluster/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT shared-storage-static-cluster diff --git a/examples/features/clustered/symmetric-cluster/pom.xml b/examples/features/clustered/symmetric-cluster/pom.xml index bce40350..a738f5fc 100644 --- a/examples/features/clustered/symmetric-cluster/pom.xml +++ b/examples/features/clustered/symmetric-cluster/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-clustered - 2.55.0 + 2.56.0-SNAPSHOT symmetric-cluster @@ -58,7 +58,7 @@ under the License. ${noSever} ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -70,7 +70,7 @@ under the License. ${noSever} ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -82,7 +82,7 @@ under the License. ${noSever} ${basedir}/target/server2 ${basedir}/target/classes/activemq/server2 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -94,7 +94,7 @@ under the License. ${noSever} ${basedir}/target/server3 ${basedir}/target/classes/activemq/server3 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -106,7 +106,7 @@ under the License. ${noSever} ${basedir}/target/server4 ${basedir}/target/classes/activemq/server4 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -118,7 +118,7 @@ under the License. ${noSever} ${basedir}/target/server5 ${basedir}/target/classes/activemq/server5 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true diff --git a/examples/features/clustered/symmetric-cluster/readme.md b/examples/features/clustered/symmetric-cluster/readme.md index bf664042..9ae87e73 100644 --- a/examples/features/clustered/symmetric-cluster/readme.md +++ b/examples/features/clustered/symmetric-cluster/readme.md @@ -18,9 +18,9 @@ The configuration used in this example is very similar to the configuration used To set up Apache Artemis to form a symmetric cluster we simply need to mark each broker as `clustered` and we need to define a `cluster-connection` in `broker.xml`. -The `cluster-connection` tells the nodes what other nodes to make connections to. With a `cluster-connection` each node that we connect to can either be specified indivually, or we can use UDP discovery to find out what other nodes are in the cluster. +The `cluster-connection` tells the nodes what other nodes to make connections to. With a `cluster-connection` each node that we connect to can either be specified indivually, or we can use server discovery to find out what other nodes are in the cluster. -Using UDP discovery makes configuration simpler since we don't have to know what nodes are available at any one time. +Using server discovery makes configuration simpler since we don't have to know what nodes are available at any one time. Here's the relevant snippet from the broker configuration, which tells the broker to form a cluster with the other nodes: @@ -30,6 +30,14 @@ Here's the relevant snippet from the broker configuration, which tells the broke true STRICT 1 + + server1-connector + server2-connector + server3-connector + server4-connector + server5-connector + + diff --git a/examples/features/clustered/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java b/examples/features/clustered/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java index f866b6cd..8b83d0f6 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java +++ b/examples/features/clustered/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java @@ -25,10 +25,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; -import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; -import org.apache.activemq.artemis.api.jms.JMSFactoryType; /** * This example demonstrates a cluster of three nodes set up in a symmetric topology - i.e. each @@ -63,20 +60,13 @@ public static void main(final String[] args) throws Exception { Connection connection5 = null; try { - // Step 1 - We instantiate a connection factory directly, specifying the UDP address and port for discovering - // the list of servers in the cluster. + // Step 1 - We instantiate a connection factory directly, specifying the list of servers in the cluster. // We could use JNDI to look-up a connection factory, but we'd need to know the JNDI server host and port for - // the - // specific server to do that, and that server might not be available at the time. By creating the + // the specific server to do that, and that server might not be available at the time. By creating the // connection factory directly we avoid having to worry about a JNDI look-up. // In an app server environment you could use HA-JNDI to lookup from the clustered JNDI servers without // having to know about a specific one. - UDPBroadcastEndpointFactory udpCfg = new UDPBroadcastEndpointFactory(); - udpCfg.setGroupAddress("231.7.7.7").setGroupPort(9876); - DiscoveryGroupConfiguration groupConfiguration = new DiscoveryGroupConfiguration(); - groupConfiguration.setBroadcastEndpointFactory(udpCfg); - - ConnectionFactory cf = ActiveMQJMSClient.createConnectionFactoryWithHA(groupConfiguration, JMSFactoryType.CF); + ConnectionFactory cf = ActiveMQJMSClient.createConnectionFactory("(tcp://localhost:61616,tcp://localhost:61617,tcp://localhost:61618,tcp://localhost:61619,tcp://localhost:61620,tcp://localhost:61621)", "servers"); // We give a little while for each server to broadcast its whereabouts to the client Thread.sleep(2000); diff --git a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server0/broker.xml index 3223428f..268113aa 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server0/broker.xml @@ -33,7 +33,11 @@ under the License. tcp://localhost:61616 - + tcp://localhost:61617 + tcp://localhost:61618 + tcp://localhost:61619 + tcp://localhost:61620 + tcp://localhost:61621 @@ -42,22 +46,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -69,7 +57,13 @@ under the License. true ON_DEMAND 1 - + + server1-connector + server2-connector + server3-connector + server4-connector + server5-connector + diff --git a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server1/broker.xml index 292e1c6f..254d14bb 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server1/broker.xml @@ -32,6 +32,11 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 + tcp://localhost:61618 + tcp://localhost:61619 + tcp://localhost:61620 + tcp://localhost:61621 @@ -40,22 +45,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +56,13 @@ under the License. true ON_DEMAND 1 - + + server0-connector + server2-connector + server3-connector + server4-connector + server5-connector + diff --git a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server2/broker.xml b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server2/broker.xml index 187827d5..8d15a26d 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server2/broker.xml +++ b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server2/broker.xml @@ -32,6 +32,11 @@ under the License. tcp://localhost:61618 + tcp://localhost:61616 + tcp://localhost:61617 + tcp://localhost:61619 + tcp://localhost:61620 + tcp://localhost:61621 @@ -40,22 +45,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +56,13 @@ under the License. true ON_DEMAND 1 - + + server0-connector + server1-connector + server3-connector + server4-connector + server5-connector + diff --git a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server3/broker.xml b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server3/broker.xml index 0ba73933..859d288a 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server3/broker.xml +++ b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server3/broker.xml @@ -32,6 +32,11 @@ under the License. tcp://localhost:61619 + tcp://localhost:61616 + tcp://localhost:61617 + tcp://localhost:61618 + tcp://localhost:61620 + tcp://localhost:61621 @@ -40,22 +45,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +56,13 @@ under the License. true ON_DEMAND 1 - + + server0-connector + server1-connector + server2-connector + server4-connector + server5-connector + diff --git a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server4/broker.xml b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server4/broker.xml index e657c971..0f8e6a19 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server4/broker.xml +++ b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server4/broker.xml @@ -31,6 +31,11 @@ under the License. tcp://localhost:61620 + tcp://localhost:61616 + tcp://localhost:61617 + tcp://localhost:61618 + tcp://localhost:61619 + tcp://localhost:61621 @@ -39,22 +44,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +55,13 @@ under the License. true ON_DEMAND 1 - + + server0-connector + server1-connector + server2-connector + server3-connector + server5-connector + diff --git a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server5/broker.xml b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server5/broker.xml index 1267ebd4..8696caf1 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server5/broker.xml +++ b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server5/broker.xml @@ -31,6 +31,11 @@ under the License. tcp://localhost:61621 + tcp://localhost:61616 + tcp://localhost:61617 + tcp://localhost:61618 + tcp://localhost:61619 + tcp://localhost:61620 @@ -39,22 +44,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +55,13 @@ under the License. true ON_DEMAND 1 - + + server0-connector + server1-connector + server2-connector + server3-connector + server4-connector + diff --git a/examples/features/connection-router/evenly-redirect/pom.xml b/examples/features/connection-router/evenly-redirect/pom.xml index 9607a0ac..047b017b 100644 --- a/examples/features/connection-router/evenly-redirect/pom.xml +++ b/examples/features/connection-router/evenly-redirect/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples connection-router - 2.55.0 + 2.56.0-SNAPSHOT evenly-redirect diff --git a/examples/features/connection-router/pom.xml b/examples/features/connection-router/pom.xml index 6f620914..46249542 100644 --- a/examples/features/connection-router/pom.xml +++ b/examples/features/connection-router/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-features - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples diff --git a/examples/features/connection-router/symmetric-redirect/pom.xml b/examples/features/connection-router/symmetric-redirect/pom.xml index 12c2315c..b5c80291 100644 --- a/examples/features/connection-router/symmetric-redirect/pom.xml +++ b/examples/features/connection-router/symmetric-redirect/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples connection-router - 2.55.0 + 2.56.0-SNAPSHOT symmetric-redirect diff --git a/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server0/broker.xml b/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server0/broker.xml index 1b7dd363..9f2b870e 100644 --- a/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server0/broker.xml @@ -51,25 +51,9 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - CLIENT_ID @@ -80,7 +64,9 @@ under the License. guest 2 true - + + server1-connector + diff --git a/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server1/broker.xml b/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server1/broker.xml index 9e4c1b13..eab0119f 100644 --- a/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server1/broker.xml @@ -51,25 +51,9 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - CLIENT_ID @@ -80,7 +64,9 @@ under the License. guest 2 true - + + server0-connector + diff --git a/examples/features/connection-router/symmetric-simple/pom.xml b/examples/features/connection-router/symmetric-simple/pom.xml index 88c269eb..727015c5 100644 --- a/examples/features/connection-router/symmetric-simple/pom.xml +++ b/examples/features/connection-router/symmetric-simple/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples connection-router - 2.55.0 + 2.56.0-SNAPSHOT symmetric-simple diff --git a/examples/features/federation/federated-address-divert/pom.xml b/examples/features/federation/federated-address-divert/pom.xml index f799b600..526a88d0 100644 --- a/examples/features/federation/federated-address-divert/pom.xml +++ b/examples/features/federation/federated-address-divert/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.federation broker-federation - 2.55.0 + 2.56.0-SNAPSHOT federated-address-divert diff --git a/examples/features/federation/federated-address-downstream-upstream/pom.xml b/examples/features/federation/federated-address-downstream-upstream/pom.xml index be8fcdd9..a8351ad5 100644 --- a/examples/features/federation/federated-address-downstream-upstream/pom.xml +++ b/examples/features/federation/federated-address-downstream-upstream/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.federation broker-federation - 2.55.0 + 2.56.0-SNAPSHOT federated-address-downstream-upstream diff --git a/examples/features/federation/federated-address-downstream/pom.xml b/examples/features/federation/federated-address-downstream/pom.xml index f00f8c08..ac78316d 100644 --- a/examples/features/federation/federated-address-downstream/pom.xml +++ b/examples/features/federation/federated-address-downstream/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.federation broker-federation - 2.55.0 + 2.56.0-SNAPSHOT federated-address-downstream diff --git a/examples/features/federation/federated-address/pom.xml b/examples/features/federation/federated-address/pom.xml index 93c01a56..68ebc1d9 100644 --- a/examples/features/federation/federated-address/pom.xml +++ b/examples/features/federation/federated-address/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.federation broker-federation - 2.55.0 + 2.56.0-SNAPSHOT federated-address diff --git a/examples/features/federation/federated-queue-downstream-upstream/pom.xml b/examples/features/federation/federated-queue-downstream-upstream/pom.xml index 21f0edc2..dd2e15d5 100644 --- a/examples/features/federation/federated-queue-downstream-upstream/pom.xml +++ b/examples/features/federation/federated-queue-downstream-upstream/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.federation broker-federation - 2.55.0 + 2.56.0-SNAPSHOT federated-queue-downstream-upstream diff --git a/examples/features/federation/federated-queue-downstream/pom.xml b/examples/features/federation/federated-queue-downstream/pom.xml index 0d1cbad4..7ea9ac88 100644 --- a/examples/features/federation/federated-queue-downstream/pom.xml +++ b/examples/features/federation/federated-queue-downstream/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.federation broker-federation - 2.55.0 + 2.56.0-SNAPSHOT federated-queue-downstream diff --git a/examples/features/federation/federated-queue/pom.xml b/examples/features/federation/federated-queue/pom.xml index 630e0e26..3a3a4126 100644 --- a/examples/features/federation/federated-queue/pom.xml +++ b/examples/features/federation/federated-queue/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.federation broker-federation - 2.55.0 + 2.56.0-SNAPSHOT federated-queue diff --git a/examples/features/federation/pom.xml b/examples/features/federation/pom.xml index 393cd8dd..102c8cf7 100644 --- a/examples/features/federation/pom.xml +++ b/examples/features/federation/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-features - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.federation diff --git a/examples/features/ha/application-layer-failover/pom.xml b/examples/features/ha/application-layer-failover/pom.xml index e82c6998..aeb2657b 100644 --- a/examples/features/ha/application-layer-failover/pom.xml +++ b/examples/features/ha/application-layer-failover/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT application-layer-failover diff --git a/examples/features/ha/client-side-failoverlistener/pom.xml b/examples/features/ha/client-side-failoverlistener/pom.xml index 073fdd64..9fc2d7df 100644 --- a/examples/features/ha/client-side-failoverlistener/pom.xml +++ b/examples/features/ha/client-side-failoverlistener/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT client-side-failoverlistener @@ -67,6 +67,7 @@ under the License. true false true + tcp://localhost:61617 --cluster-user my-cluster-user @@ -88,6 +89,7 @@ under the License. true true 1 + tcp://localhost:61616 --cluster-user my-cluster-user diff --git a/examples/features/ha/colocated-failover-scale-down/pom.xml b/examples/features/ha/colocated-failover-scale-down/pom.xml index 74a45fc4..8a526ccb 100644 --- a/examples/features/ha/colocated-failover-scale-down/pom.xml +++ b/examples/features/ha/colocated-failover-scale-down/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT colocated-failover-scale-down @@ -63,6 +63,7 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 + -Dbrokerconfig.HAPolicyConfiguration.excludedConnectors=server0-connector,server0-colocated-backup-connector,server1-connector,server1-colocated-backup-connector @@ -75,6 +76,7 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 + -Dbrokerconfig.HAPolicyConfiguration.excludedConnectors=server0-connector,server0-colocated-backup-connector,server1-connector,server1-colocated-backup-connector diff --git a/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml index caa39a46..2ff02f5b 100644 --- a/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml @@ -32,6 +32,10 @@ under the License. vm://0 tcp://localhost:61616 + tcp://localhost:61616 + tcp://localhost:61716 + tcp://localhost:61617 + tcp://localhost:61717 @@ -41,22 +45,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -70,7 +58,12 @@ under the License. true OFF 1 - + + server0-connector + server0-colocated-backup-connector + server1-connector + server1-colocated-backup-connector + diff --git a/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml index 783d80ec..65e2e0d0 100644 --- a/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml @@ -32,6 +32,10 @@ under the License. vm://0 tcp://localhost:61617 + tcp://localhost:61616 + tcp://localhost:61716 + tcp://localhost:61617 + tcp://localhost:61717 @@ -41,22 +45,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -70,7 +58,12 @@ under the License. true OFF 1 - + + server0-connector + server0-colocated-backup-connector + server1-connector + server1-colocated-backup-connector + diff --git a/examples/features/ha/colocated-failover/pom.xml b/examples/features/ha/colocated-failover/pom.xml index c9383793..2232be10 100644 --- a/examples/features/ha/colocated-failover/pom.xml +++ b/examples/features/ha/colocated-failover/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT colocated-failover @@ -64,6 +64,7 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 + -Dbrokerconfig.HAPolicyConfiguration.excludedConnectors=server0-connector,server0-colocated-backup-connector,server1-connector,server1-colocated-backup-connector @@ -76,6 +77,7 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 + -Dbrokerconfig.HAPolicyConfiguration.excludedConnectors=server0-connector,server0-colocated-backup-connector,server1-connector,server1-colocated-backup-connector diff --git a/examples/features/ha/colocated-failover/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/colocated-failover/src/main/resources/activemq/server0/broker.xml index 30ebc6f7..e61997ea 100644 --- a/examples/features/ha/colocated-failover/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/colocated-failover/src/main/resources/activemq/server0/broker.xml @@ -31,6 +31,10 @@ under the License. tcp://localhost:61616 + tcp://localhost:61616 + tcp://localhost:61716 + tcp://localhost:61617 + tcp://localhost:61717 @@ -39,22 +43,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +54,12 @@ under the License. true STRICT 1 - + + server0-connector + server0-colocated-backup-connector + server1-connector + server1-colocated-backup-connector + diff --git a/examples/features/ha/colocated-failover/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/colocated-failover/src/main/resources/activemq/server1/broker.xml index c1644f75..9f73134f 100644 --- a/examples/features/ha/colocated-failover/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/colocated-failover/src/main/resources/activemq/server1/broker.xml @@ -31,6 +31,10 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 + tcp://localhost:61716 + tcp://localhost:61617 + tcp://localhost:61717 @@ -39,22 +43,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +54,12 @@ under the License. true STRICT 1 - + + server0-connector + server0-colocated-backup-connector + server1-connector + server1-colocated-backup-connector + diff --git a/examples/features/ha/ha-policy-autobackup/pom.xml b/examples/features/ha/ha-policy-autobackup/pom.xml index 9a9ba555..8f41676e 100644 --- a/examples/features/ha/ha-policy-autobackup/pom.xml +++ b/examples/features/ha/ha-policy-autobackup/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT ha-policy-autobackup diff --git a/examples/features/ha/multiple-failover-failback/pom.xml b/examples/features/ha/multiple-failover-failback/pom.xml index 826929fa..94fd9bfd 100644 --- a/examples/features/ha/multiple-failover-failback/pom.xml +++ b/examples/features/ha/multiple-failover-failback/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT multiple-failover-failback @@ -66,6 +66,7 @@ under the License. false ../data true + tcp://localhost:61617,tcp://localhost:61618 --cluster-user my-cluster-user @@ -87,6 +88,7 @@ under the License. true ../data true + tcp://localhost:61616,tcp://localhost:61618 --cluster-user my-cluster-user @@ -106,6 +108,7 @@ under the License. ${basedir}/target/server2 true true + tcp://localhost:61616,tcp://localhost:61617 ../data --cluster-user diff --git a/examples/features/ha/multiple-failover/pom.xml b/examples/features/ha/multiple-failover/pom.xml index e186cdc1..748564e1 100644 --- a/examples/features/ha/multiple-failover/pom.xml +++ b/examples/features/ha/multiple-failover/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT multiple-failover @@ -66,6 +66,7 @@ under the License. false ../data true + tcp://localhost:61617,tcp://localhost:61618 --cluster-user my-cluster-user @@ -87,6 +88,7 @@ under the License. true ../data true + tcp://localhost:61616,tcp://localhost:61618 --cluster-user my-cluster-user @@ -106,6 +108,7 @@ under the License. ${basedir}/target/server2 true true + tcp://localhost:61616,tcp://localhost:61617 ../data --cluster-user diff --git a/examples/features/ha/non-transaction-failover/pom.xml b/examples/features/ha/non-transaction-failover/pom.xml index c455ed2b..061b3bc3 100644 --- a/examples/features/ha/non-transaction-failover/pom.xml +++ b/examples/features/ha/non-transaction-failover/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT non-transaction-failover @@ -67,6 +67,7 @@ under the License. false ../data true + tcp://localhost:61617 --cluster-user my-cluster-user @@ -88,6 +89,7 @@ under the License. true ../data true + tcp://localhost:61616 --cluster-user my-cluster-user diff --git a/examples/features/ha/pom.xml b/examples/features/ha/pom.xml index 6267cdfa..406f29ab 100644 --- a/examples/features/ha/pom.xml +++ b/examples/features/ha/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-features - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.failover diff --git a/examples/features/ha/replicated-failback-static/pom.xml b/examples/features/ha/replicated-failback-static/pom.xml index e42bed21..b855c3b4 100644 --- a/examples/features/ha/replicated-failback-static/pom.xml +++ b/examples/features/ha/replicated-failback-static/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT replicated-failback-static @@ -64,7 +64,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} @@ -77,7 +76,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} diff --git a/examples/features/ha/replicated-failback-static/readme.md b/examples/features/ha/replicated-failback-static/readme.md index 9d577ce1..9257ed56 100644 --- a/examples/features/ha/replicated-failback-static/readme.md +++ b/examples/features/ha/replicated-failback-static/readme.md @@ -4,6 +4,6 @@ If you have not already done so, [prepare the broker distribution](../../../../R To run the example, simply type **mvn verify** from this directory. -This example is the same as the "replicated-failback" example but with a "static" clustering configuration (i.e. not using UDP multicast). +This example is the same as the "replicated-failback" example but with a "static" clustering configuration (i.e. not using server discovery). For more information on Apache Artemis failover and HA, and clustering in general, please see the clustering section of the user manual. \ No newline at end of file diff --git a/examples/features/ha/replicated-failback/pom.xml b/examples/features/ha/replicated-failback/pom.xml index 1a704eb0..874ff281 100644 --- a/examples/features/ha/replicated-failback/pom.xml +++ b/examples/features/ha/replicated-failback/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT replicated-failback @@ -63,7 +63,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} @@ -76,7 +75,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} diff --git a/examples/features/ha/replicated-failback/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/replicated-failback/src/main/resources/activemq/server0/broker.xml index f3c3a097..7021ae2a 100644 --- a/examples/features/ha/replicated-failback/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/replicated-failback/src/main/resources/activemq/server0/broker.xml @@ -43,6 +43,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -50,27 +51,12 @@ under the License. tcp://localhost:61616 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 5000 - - - netty-connector - + + server1-connector + diff --git a/examples/features/ha/replicated-failback/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/replicated-failback/src/main/resources/activemq/server1/broker.xml index dd35ba69..c840ee2f 100644 --- a/examples/features/ha/replicated-failback/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/replicated-failback/src/main/resources/activemq/server1/broker.xml @@ -51,27 +51,12 @@ under the License. tcp://localhost:61617 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 5000 - - - netty-connector - + + netty-live-connector + diff --git a/examples/features/ha/replicated-multiple-failover/pom.xml b/examples/features/ha/replicated-multiple-failover/pom.xml index 5426f248..f5d00a0e 100644 --- a/examples/features/ha/replicated-multiple-failover/pom.xml +++ b/examples/features/ha/replicated-multiple-failover/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT replicated-multiple-failover @@ -64,7 +64,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} @@ -77,7 +76,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} @@ -88,7 +86,6 @@ under the License. ${basedir}/target/server2 ${basedir}/target/classes/activemq/server2 - -Dudp-address=${udp-address} diff --git a/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml index 3bdbbdac..2083ebba 100644 --- a/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml @@ -37,6 +37,8 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 + tcp://localhost:61618 @@ -44,30 +46,16 @@ under the License. tcp://localhost:61616 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server1-connector + server2-connector + diff --git a/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml index e2dcd0b2..028f4d81 100644 --- a/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml @@ -37,6 +37,8 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 + tcp://localhost:61618 @@ -44,30 +46,16 @@ under the License. tcp://localhost:61617 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server0-connector + server2-connector + diff --git a/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml b/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml index 74e1affc..840b0f94 100644 --- a/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml +++ b/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml @@ -37,6 +37,8 @@ under the License. tcp://localhost:61618 + tcp://localhost:61616 + tcp://localhost:61617 @@ -44,30 +46,16 @@ under the License. tcp://localhost:61618 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server0-connector + server1-connector + diff --git a/examples/features/ha/replicated-transaction-failover/pom.xml b/examples/features/ha/replicated-transaction-failover/pom.xml index 535ddb58..84a02566 100644 --- a/examples/features/ha/replicated-transaction-failover/pom.xml +++ b/examples/features/ha/replicated-transaction-failover/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT replicated-transaction-failover @@ -61,7 +61,7 @@ under the License. ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -72,7 +72,7 @@ under the License. ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true diff --git a/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml index a1d2133d..773ebc87 100644 --- a/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml @@ -38,6 +38,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -45,30 +46,15 @@ under the License. tcp://localhost:61616 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server1-connector + diff --git a/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml index e9f44a52..8e3eacf5 100644 --- a/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml @@ -38,6 +38,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -45,30 +46,15 @@ under the License. tcp://localhost:61617 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server0-connector + diff --git a/examples/features/ha/scale-down/pom.xml b/examples/features/ha/scale-down/pom.xml index 7ec4029d..a0d571dd 100644 --- a/examples/features/ha/scale-down/pom.xml +++ b/examples/features/ha/scale-down/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT scale-down @@ -62,7 +62,7 @@ under the License. ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -73,7 +73,7 @@ under the License. ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true diff --git a/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml index 2a582056..ccc32933 100644 --- a/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml @@ -31,6 +31,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -39,22 +40,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +52,9 @@ under the License. true STRICT 1 - + + server1-connector + diff --git a/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml index 6c3b65bd..48ffa659 100644 --- a/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml @@ -40,22 +40,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -68,7 +52,9 @@ under the License. true STRICT 1 - + + server0-connector + diff --git a/examples/features/ha/stop-server-failover/pom.xml b/examples/features/ha/stop-server-failover/pom.xml index 593e7aef..54467cf7 100644 --- a/examples/features/ha/stop-server-failover/pom.xml +++ b/examples/features/ha/stop-server-failover/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT stop-server-failover @@ -36,6 +36,11 @@ under the License. + + org.apache.artemis + artemis-cli + ${project.version} + org.apache.artemis artemis-jms-client @@ -62,6 +67,7 @@ under the License. false ../data true + tcp://localhost:61617 --cluster-user my-cluster-user @@ -83,6 +89,7 @@ under the License. true ../data true + tcp://localhost:61616 --cluster-user my-cluster-user @@ -91,38 +98,6 @@ under the License. - - start0 - - cli - - - ${noServer} - true - ${basedir}/target/server0 - tcp://localhost:61616 - - run - - server0 - - - - start1 - - cli - - - ${noServer} - true - ${basedir}/target/server1 - tcp://localhost:61617 - - run - - server1 - - runClient @@ -130,26 +105,10 @@ under the License. org.apache.activemq.artemis.jms.example.StopServerFailoverExample - - - - stop0 - - stop - - - ${noServer} - ${basedir}/target/server0 - - - - stop1 - - stop - - - ${noServer} - ${basedir}/target/server1 + + ${basedir}/target/server0 + ${basedir}/target/server1 + diff --git a/examples/features/ha/stop-server-failover/src/main/java/org/apache/activemq/artemis/jms/example/StopServerFailoverExample.java b/examples/features/ha/stop-server-failover/src/main/java/org/apache/activemq/artemis/jms/example/StopServerFailoverExample.java index 90c95640..eeb83267 100644 --- a/examples/features/ha/stop-server-failover/src/main/java/org/apache/activemq/artemis/jms/example/StopServerFailoverExample.java +++ b/examples/features/ha/stop-server-failover/src/main/java/org/apache/activemq/artemis/jms/example/StopServerFailoverExample.java @@ -26,6 +26,8 @@ import javax.jms.TextMessage; import javax.naming.InitialContext; +import org.apache.activemq.artemis.util.ServerUtil; + /** * A simple example that demonstrates failover of the JMS connection from one node to another * when the live server crashes using a JMS non-transacted session. @@ -39,7 +41,14 @@ public static void main(final String[] args) throws Exception { InitialContext initialContext = null; + + Process[] servers = new Process[2]; + try { + for (int i = 0; i < args.length; i++) { + servers[i] = ServerUtil.startServer(args[i], StopServerFailoverExample.class.getSimpleName() + i, i, 5000); + } + // Step 1. Get an initial context for looking up JNDI from the server #1 initialContext = new InitialContext(); @@ -110,6 +119,10 @@ public static void main(final String[] args) throws Exception { if (initialContext != null) { initialContext.close(); } + + for (int i = 0; i < args.length; i++) { + ServerUtil.killServer(servers[i]); + } } } } diff --git a/examples/features/ha/transaction-failover/pom.xml b/examples/features/ha/transaction-failover/pom.xml index 86f32e0f..a9a4a834 100644 --- a/examples/features/ha/transaction-failover/pom.xml +++ b/examples/features/ha/transaction-failover/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT transaction-failover @@ -61,7 +61,6 @@ under the License. ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} @@ -72,7 +71,6 @@ under the License. ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} diff --git a/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml index aa80caaf..d5ef7e86 100644 --- a/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml @@ -40,6 +40,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -47,30 +48,15 @@ under the License. tcp://localhost:61616 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server1-connector + diff --git a/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml index eb156265..ed621c85 100644 --- a/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml @@ -39,6 +39,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -46,30 +47,15 @@ under the License. tcp://localhost:61617 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server0-connector + diff --git a/examples/features/ha/zookeeper-single-pair-failback/pom.xml b/examples/features/ha/zookeeper-single-pair-failback/pom.xml index 7e0b2bf5..5e83597e 100644 --- a/examples/features/ha/zookeeper-single-pair-failback/pom.xml +++ b/examples/features/ha/zookeeper-single-pair-failback/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.failover broker-failover - 2.55.0 + 2.56.0-SNAPSHOT zookeeper-single-pair-failback @@ -63,7 +63,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} @@ -76,7 +75,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} diff --git a/examples/features/perf/perf/pom.xml b/examples/features/perf/perf/pom.xml index 6e651b6a..7430bab2 100644 --- a/examples/features/perf/perf/pom.xml +++ b/examples/features/perf/perf/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.soak perf-root - 2.55.0 + 2.56.0-SNAPSHOT openwire-perf diff --git a/examples/features/perf/pom.xml b/examples/features/perf/pom.xml index f7ba6680..ebb62a7c 100644 --- a/examples/features/perf/pom.xml +++ b/examples/features/perf/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-features - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.soak diff --git a/examples/features/perf/soak/pom.xml b/examples/features/perf/soak/pom.xml index 6f543c9b..c5ab517c 100644 --- a/examples/features/perf/soak/pom.xml +++ b/examples/features/perf/soak/pom.xml @@ -28,7 +28,7 @@ under the License. org.apache.artemis.examples.soak perf-root - 2.55.0 + 2.56.0-SNAPSHOT diff --git a/examples/features/pom.xml b/examples/features/pom.xml index 41c88cc0..99fafe16 100644 --- a/examples/features/pom.xml +++ b/examples/features/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples artemis-examples - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.clustered diff --git a/examples/features/standard/auto-closeable/pom.xml b/examples/features/standard/auto-closeable/pom.xml index c247f36c..7f6e4829 100644 --- a/examples/features/standard/auto-closeable/pom.xml +++ b/examples/features/standard/auto-closeable/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT auto-closeable diff --git a/examples/features/standard/broker-msg-auth-plugin/pom.xml b/examples/features/standard/broker-msg-auth-plugin/pom.xml index c325ac4f..293ec25e 100644 --- a/examples/features/standard/broker-msg-auth-plugin/pom.xml +++ b/examples/features/standard/broker-msg-auth-plugin/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT broker-msg-auth-plugin diff --git a/examples/features/standard/broker-plugin/pom.xml b/examples/features/standard/broker-plugin/pom.xml index f8732cfd..1a303159 100644 --- a/examples/features/standard/broker-plugin/pom.xml +++ b/examples/features/standard/broker-plugin/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT broker-plugin diff --git a/examples/features/standard/browser/pom.xml b/examples/features/standard/browser/pom.xml index c0554f06..73c050fb 100644 --- a/examples/features/standard/browser/pom.xml +++ b/examples/features/standard/browser/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT browser diff --git a/examples/features/standard/camel/camel-broker/pom.xml b/examples/features/standard/camel/camel-broker/pom.xml index ed62b5ee..ae0fa732 100644 --- a/examples/features/standard/camel/camel-broker/pom.xml +++ b/examples/features/standard/camel/camel-broker/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker.camel camel - 2.55.0 + 2.56.0-SNAPSHOT camel-broker diff --git a/examples/features/standard/camel/camel-war/pom.xml b/examples/features/standard/camel/camel-war/pom.xml index b3a0df5b..779cfafc 100644 --- a/examples/features/standard/camel/camel-war/pom.xml +++ b/examples/features/standard/camel/camel-war/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker.camel camel - 2.55.0 + 2.56.0-SNAPSHOT camel-war diff --git a/examples/features/standard/camel/pom.xml b/examples/features/standard/camel/pom.xml index d6bee00e..8462f4fc 100644 --- a/examples/features/standard/camel/pom.xml +++ b/examples/features/standard/camel/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.broker.camel diff --git a/examples/features/standard/cdi/pom.xml b/examples/features/standard/cdi/pom.xml index 6f836932..e94576fd 100644 --- a/examples/features/standard/cdi/pom.xml +++ b/examples/features/standard/cdi/pom.xml @@ -24,7 +24,7 @@ org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT cdi diff --git a/examples/features/standard/client-kickoff/pom.xml b/examples/features/standard/client-kickoff/pom.xml index 10d0f8a8..4998be89 100644 --- a/examples/features/standard/client-kickoff/pom.xml +++ b/examples/features/standard/client-kickoff/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT client-kickoff diff --git a/examples/features/standard/completion-listener/pom.xml b/examples/features/standard/completion-listener/pom.xml index 2cd7e271..65ce8fea 100644 --- a/examples/features/standard/completion-listener/pom.xml +++ b/examples/features/standard/completion-listener/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT completion-listener diff --git a/examples/features/standard/consumer-rate-limit/pom.xml b/examples/features/standard/consumer-rate-limit/pom.xml index de035b71..3cb3acac 100644 --- a/examples/features/standard/consumer-rate-limit/pom.xml +++ b/examples/features/standard/consumer-rate-limit/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT consumer-rate-limit diff --git a/examples/features/standard/context/pom.xml b/examples/features/standard/context/pom.xml index 052f9203..22d360f0 100644 --- a/examples/features/standard/context/pom.xml +++ b/examples/features/standard/context/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT context diff --git a/examples/features/standard/core-bridge/pom.xml b/examples/features/standard/core-bridge/pom.xml index 5170ecd0..a3998b30 100644 --- a/examples/features/standard/core-bridge/pom.xml +++ b/examples/features/standard/core-bridge/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT core-bridge diff --git a/examples/features/standard/database/pom.xml b/examples/features/standard/database/pom.xml index 672061d3..c7209a27 100644 --- a/examples/features/standard/database/pom.xml +++ b/examples/features/standard/database/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT database diff --git a/examples/features/standard/dead-letter/pom.xml b/examples/features/standard/dead-letter/pom.xml index 805e2123..10b19a23 100644 --- a/examples/features/standard/dead-letter/pom.xml +++ b/examples/features/standard/dead-letter/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT dead-letter diff --git a/examples/features/standard/delayed-redelivery/pom.xml b/examples/features/standard/delayed-redelivery/pom.xml index 51a44b56..c29305d0 100644 --- a/examples/features/standard/delayed-redelivery/pom.xml +++ b/examples/features/standard/delayed-redelivery/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT delayed-redelivery diff --git a/examples/features/standard/divert/pom.xml b/examples/features/standard/divert/pom.xml index 142aab8a..894315d6 100644 --- a/examples/features/standard/divert/pom.xml +++ b/examples/features/standard/divert/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT divert jar diff --git a/examples/features/standard/durable-subscription/pom.xml b/examples/features/standard/durable-subscription/pom.xml index 1319e2dc..783f63e4 100644 --- a/examples/features/standard/durable-subscription/pom.xml +++ b/examples/features/standard/durable-subscription/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT durable-subscription diff --git a/examples/features/standard/embedded-simple/pom.xml b/examples/features/standard/embedded-simple/pom.xml index b040af10..8ccee4c7 100644 --- a/examples/features/standard/embedded-simple/pom.xml +++ b/examples/features/standard/embedded-simple/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT embedded-simple diff --git a/examples/features/standard/embedded/pom.xml b/examples/features/standard/embedded/pom.xml index f2185bc3..e98fe504 100644 --- a/examples/features/standard/embedded/pom.xml +++ b/examples/features/standard/embedded/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT embedded diff --git a/examples/features/standard/exclusive-queue/pom.xml b/examples/features/standard/exclusive-queue/pom.xml index 15335ba0..02ce3096 100644 --- a/examples/features/standard/exclusive-queue/pom.xml +++ b/examples/features/standard/exclusive-queue/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT exclusive-queue diff --git a/examples/features/standard/expiry/pom.xml b/examples/features/standard/expiry/pom.xml index 72336d68..eb3c9359 100644 --- a/examples/features/standard/expiry/pom.xml +++ b/examples/features/standard/expiry/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT expiry diff --git a/examples/features/standard/http-transport/pom.xml b/examples/features/standard/http-transport/pom.xml index 8167bf9f..614de33f 100644 --- a/examples/features/standard/http-transport/pom.xml +++ b/examples/features/standard/http-transport/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT http-transport diff --git a/examples/features/standard/instantiate-connection-factory/pom.xml b/examples/features/standard/instantiate-connection-factory/pom.xml index 7173b8ed..f494caa6 100644 --- a/examples/features/standard/instantiate-connection-factory/pom.xml +++ b/examples/features/standard/instantiate-connection-factory/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT instantiate-connection-factory diff --git a/examples/features/standard/interceptor-amqp/pom.xml b/examples/features/standard/interceptor-amqp/pom.xml index a173902f..8474a2da 100644 --- a/examples/features/standard/interceptor-amqp/pom.xml +++ b/examples/features/standard/interceptor-amqp/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT interceptor-amqp diff --git a/examples/features/standard/interceptor-client/pom.xml b/examples/features/standard/interceptor-client/pom.xml index f1948e4a..bb30a532 100644 --- a/examples/features/standard/interceptor-client/pom.xml +++ b/examples/features/standard/interceptor-client/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT interceptor-client diff --git a/examples/features/standard/interceptor-mqtt/pom.xml b/examples/features/standard/interceptor-mqtt/pom.xml index f602a6d3..eefc4858 100644 --- a/examples/features/standard/interceptor-mqtt/pom.xml +++ b/examples/features/standard/interceptor-mqtt/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT interceptor-mqtt diff --git a/examples/features/standard/interceptor/pom.xml b/examples/features/standard/interceptor/pom.xml index 43eea305..9a8ecd3b 100644 --- a/examples/features/standard/interceptor/pom.xml +++ b/examples/features/standard/interceptor/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT interceptor diff --git a/examples/features/standard/jms-bridge/pom.xml b/examples/features/standard/jms-bridge/pom.xml index 220bd835..9f0c8068 100644 --- a/examples/features/standard/jms-bridge/pom.xml +++ b/examples/features/standard/jms-bridge/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT jms-bridge diff --git a/examples/features/standard/jmx-ssl/pom.xml b/examples/features/standard/jmx-ssl/pom.xml index aa9f05e0..1421efda 100644 --- a/examples/features/standard/jmx-ssl/pom.xml +++ b/examples/features/standard/jmx-ssl/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT jmx-ssl diff --git a/examples/features/standard/jmx/pom.xml b/examples/features/standard/jmx/pom.xml index b2417767..50fdf9fb 100644 --- a/examples/features/standard/jmx/pom.xml +++ b/examples/features/standard/jmx/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT jmx diff --git a/examples/features/standard/large-message/pom.xml b/examples/features/standard/large-message/pom.xml index decc18c1..ada4a45e 100644 --- a/examples/features/standard/large-message/pom.xml +++ b/examples/features/standard/large-message/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT large-message diff --git a/examples/features/standard/last-value-queue/pom.xml b/examples/features/standard/last-value-queue/pom.xml index d32506c7..d03766f3 100644 --- a/examples/features/standard/last-value-queue/pom.xml +++ b/examples/features/standard/last-value-queue/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT last-value-queue diff --git a/examples/features/standard/management-notifications/pom.xml b/examples/features/standard/management-notifications/pom.xml index e072a1ff..34cfe0d7 100644 --- a/examples/features/standard/management-notifications/pom.xml +++ b/examples/features/standard/management-notifications/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT management-notifications diff --git a/examples/features/standard/management/pom.xml b/examples/features/standard/management/pom.xml index 61535cd0..a15ac30c 100644 --- a/examples/features/standard/management/pom.xml +++ b/examples/features/standard/management/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT management diff --git a/examples/features/standard/message-counters/pom.xml b/examples/features/standard/message-counters/pom.xml index 4527899c..2457b5cf 100644 --- a/examples/features/standard/message-counters/pom.xml +++ b/examples/features/standard/message-counters/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT message-counters diff --git a/examples/features/standard/message-group/pom.xml b/examples/features/standard/message-group/pom.xml index 1ab6cbf8..7b2a9ce4 100644 --- a/examples/features/standard/message-group/pom.xml +++ b/examples/features/standard/message-group/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT message-group diff --git a/examples/features/standard/message-group2/pom.xml b/examples/features/standard/message-group2/pom.xml index 06e38c38..fe89d0f1 100644 --- a/examples/features/standard/message-group2/pom.xml +++ b/examples/features/standard/message-group2/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT message-group2 diff --git a/examples/features/standard/message-priority/pom.xml b/examples/features/standard/message-priority/pom.xml index 28fb6480..76a601c3 100644 --- a/examples/features/standard/message-priority/pom.xml +++ b/examples/features/standard/message-priority/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT message-priority diff --git a/examples/features/standard/netty-openssl/pom.xml b/examples/features/standard/netty-openssl/pom.xml index e2d7b532..9e812498 100644 --- a/examples/features/standard/netty-openssl/pom.xml +++ b/examples/features/standard/netty-openssl/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT netty-openssl diff --git a/examples/features/standard/no-consumer-buffering/pom.xml b/examples/features/standard/no-consumer-buffering/pom.xml index 5f119bb0..b5674636 100644 --- a/examples/features/standard/no-consumer-buffering/pom.xml +++ b/examples/features/standard/no-consumer-buffering/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT no-consumer-buffering diff --git a/examples/features/standard/opentelemetry/pom.xml b/examples/features/standard/opentelemetry/pom.xml index 98bb8465..233a4a97 100644 --- a/examples/features/standard/opentelemetry/pom.xml +++ b/examples/features/standard/opentelemetry/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT opentelemetry diff --git a/examples/features/standard/paging/pom.xml b/examples/features/standard/paging/pom.xml index 9d4cb6ed..5f581ff0 100644 --- a/examples/features/standard/paging/pom.xml +++ b/examples/features/standard/paging/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT paging diff --git a/examples/features/standard/pom.xml b/examples/features/standard/pom.xml index f615be58..e9330dd8 100644 --- a/examples/features/standard/pom.xml +++ b/examples/features/standard/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-features - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.broker @@ -33,7 +33,6 @@ under the License. Apache Artemis Standard Examples - 231.7.7.7 ${project.basedir}/../../.. diff --git a/examples/features/standard/pre-acknowledge/pom.xml b/examples/features/standard/pre-acknowledge/pom.xml index c396453c..845c0e24 100644 --- a/examples/features/standard/pre-acknowledge/pom.xml +++ b/examples/features/standard/pre-acknowledge/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT pre-acknowledge diff --git a/examples/features/standard/producer-rate-limit/pom.xml b/examples/features/standard/producer-rate-limit/pom.xml index 286ceb75..7731b35d 100644 --- a/examples/features/standard/producer-rate-limit/pom.xml +++ b/examples/features/standard/producer-rate-limit/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT producer-rate-limit diff --git a/examples/features/standard/queue-jakarta/pom.xml b/examples/features/standard/queue-jakarta/pom.xml index 4f09ad55..5c5f7e9a 100644 --- a/examples/features/standard/queue-jakarta/pom.xml +++ b/examples/features/standard/queue-jakarta/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT queue-jakarta diff --git a/examples/features/standard/queue-requestor/pom.xml b/examples/features/standard/queue-requestor/pom.xml index a34f7e6c..6534f1f6 100644 --- a/examples/features/standard/queue-requestor/pom.xml +++ b/examples/features/standard/queue-requestor/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT queue-requestor diff --git a/examples/features/standard/queue-selector/pom.xml b/examples/features/standard/queue-selector/pom.xml index a3730334..cd6159b3 100644 --- a/examples/features/standard/queue-selector/pom.xml +++ b/examples/features/standard/queue-selector/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT queue-selector diff --git a/examples/features/standard/queue/pom.xml b/examples/features/standard/queue/pom.xml index 78c879b8..2b799934 100644 --- a/examples/features/standard/queue/pom.xml +++ b/examples/features/standard/queue/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT queue diff --git a/examples/features/standard/reattach-node/pom.xml b/examples/features/standard/reattach-node/pom.xml index 75567353..cfd1719b 100644 --- a/examples/features/standard/reattach-node/pom.xml +++ b/examples/features/standard/reattach-node/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT reattach-node diff --git a/examples/features/standard/request-reply/pom.xml b/examples/features/standard/request-reply/pom.xml index a85ce065..2b6d35dd 100644 --- a/examples/features/standard/request-reply/pom.xml +++ b/examples/features/standard/request-reply/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT request-reply diff --git a/examples/features/standard/scheduled-message/pom.xml b/examples/features/standard/scheduled-message/pom.xml index 30154496..6babbc12 100644 --- a/examples/features/standard/scheduled-message/pom.xml +++ b/examples/features/standard/scheduled-message/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT scheduled-message diff --git a/examples/features/standard/security-keycloak/pom.xml b/examples/features/standard/security-keycloak/pom.xml index 50dfd0bc..4c761a31 100644 --- a/examples/features/standard/security-keycloak/pom.xml +++ b/examples/features/standard/security-keycloak/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT security-keycloak diff --git a/examples/features/standard/security-ldap/pom.xml b/examples/features/standard/security-ldap/pom.xml index 5e820553..638a7fd3 100644 --- a/examples/features/standard/security-ldap/pom.xml +++ b/examples/features/standard/security-ldap/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT security-ldap diff --git a/examples/features/standard/security-manager/pom.xml b/examples/features/standard/security-manager/pom.xml index 1ad78ae6..ced5e080 100644 --- a/examples/features/standard/security-manager/pom.xml +++ b/examples/features/standard/security-manager/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT security-manager diff --git a/examples/features/standard/security-oidc/pom.xml b/examples/features/standard/security-oidc/pom.xml index 85dc5ec9..53d10845 100644 --- a/examples/features/standard/security-oidc/pom.xml +++ b/examples/features/standard/security-oidc/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT security-oidc diff --git a/examples/features/standard/security/pom.xml b/examples/features/standard/security/pom.xml index e5c722ab..9ffa3258 100644 --- a/examples/features/standard/security/pom.xml +++ b/examples/features/standard/security/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT security diff --git a/examples/features/standard/send-acknowledgements/pom.xml b/examples/features/standard/send-acknowledgements/pom.xml index 90be1724..9672968f 100644 --- a/examples/features/standard/send-acknowledgements/pom.xml +++ b/examples/features/standard/send-acknowledgements/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT send-acknowledgements diff --git a/examples/features/standard/shared-consumer/pom.xml b/examples/features/standard/shared-consumer/pom.xml index b92f44e2..829b7258 100644 --- a/examples/features/standard/shared-consumer/pom.xml +++ b/examples/features/standard/shared-consumer/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT shared-consumer diff --git a/examples/features/standard/slow-consumer/pom.xml b/examples/features/standard/slow-consumer/pom.xml index 8ae9e999..5e7dc349 100644 --- a/examples/features/standard/slow-consumer/pom.xml +++ b/examples/features/standard/slow-consumer/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT slow-consumer diff --git a/examples/features/standard/spring-boot-integration/pom.xml b/examples/features/standard/spring-boot-integration/pom.xml index cdcffc3e..06c0300a 100644 --- a/examples/features/standard/spring-boot-integration/pom.xml +++ b/examples/features/standard/spring-boot-integration/pom.xml @@ -18,7 +18,7 @@ org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT spring-boot-integration Apache Artemis JMS Spring Boot Integration Example diff --git a/examples/features/standard/spring-integration/pom.xml b/examples/features/standard/spring-integration/pom.xml index b4d52f5f..65e8fb57 100644 --- a/examples/features/standard/spring-integration/pom.xml +++ b/examples/features/standard/spring-integration/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT spring-integration diff --git a/examples/features/standard/ssl-enabled-crl-mqtt/pom.xml b/examples/features/standard/ssl-enabled-crl-mqtt/pom.xml index 1f5fe12e..75043528 100644 --- a/examples/features/standard/ssl-enabled-crl-mqtt/pom.xml +++ b/examples/features/standard/ssl-enabled-crl-mqtt/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT ssl-enabled-crl-mqtt diff --git a/examples/features/standard/ssl-enabled-dual-authentication/pom.xml b/examples/features/standard/ssl-enabled-dual-authentication/pom.xml index 63a0795b..e0316cb6 100644 --- a/examples/features/standard/ssl-enabled-dual-authentication/pom.xml +++ b/examples/features/standard/ssl-enabled-dual-authentication/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT ssl-enabled-dual-authentication diff --git a/examples/features/standard/ssl-enabled/pom.xml b/examples/features/standard/ssl-enabled/pom.xml index e9d8fbce..1ae30aaa 100644 --- a/examples/features/standard/ssl-enabled/pom.xml +++ b/examples/features/standard/ssl-enabled/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT ssl-enabled diff --git a/examples/features/standard/static-selector/pom.xml b/examples/features/standard/static-selector/pom.xml index b84c14ce..ee59d376 100644 --- a/examples/features/standard/static-selector/pom.xml +++ b/examples/features/standard/static-selector/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT static-selector diff --git a/examples/features/standard/temp-queue/pom.xml b/examples/features/standard/temp-queue/pom.xml index 50c9fb03..40b48406 100644 --- a/examples/features/standard/temp-queue/pom.xml +++ b/examples/features/standard/temp-queue/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT temp-queue diff --git a/examples/features/standard/topic-hierarchies/pom.xml b/examples/features/standard/topic-hierarchies/pom.xml index 264e28ca..5dbf58d9 100644 --- a/examples/features/standard/topic-hierarchies/pom.xml +++ b/examples/features/standard/topic-hierarchies/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT topic-hierarchies diff --git a/examples/features/standard/topic-selector1/pom.xml b/examples/features/standard/topic-selector1/pom.xml index 4e9d7fde..d4dc0879 100644 --- a/examples/features/standard/topic-selector1/pom.xml +++ b/examples/features/standard/topic-selector1/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT topic-selector1 diff --git a/examples/features/standard/topic-selector2/pom.xml b/examples/features/standard/topic-selector2/pom.xml index 9c377b75..6c0023a0 100644 --- a/examples/features/standard/topic-selector2/pom.xml +++ b/examples/features/standard/topic-selector2/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT topic-selector2 diff --git a/examples/features/standard/topic/pom.xml b/examples/features/standard/topic/pom.xml index f5344e9f..908a285f 100644 --- a/examples/features/standard/topic/pom.xml +++ b/examples/features/standard/topic/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT topic diff --git a/examples/features/standard/transactional/pom.xml b/examples/features/standard/transactional/pom.xml index df37f270..37a921c5 100644 --- a/examples/features/standard/transactional/pom.xml +++ b/examples/features/standard/transactional/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT transactional diff --git a/examples/features/standard/xa-heuristic/pom.xml b/examples/features/standard/xa-heuristic/pom.xml index 97903e4b..aadcb655 100644 --- a/examples/features/standard/xa-heuristic/pom.xml +++ b/examples/features/standard/xa-heuristic/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT xa-heuristic diff --git a/examples/features/standard/xa-receive/pom.xml b/examples/features/standard/xa-receive/pom.xml index 374846ed..89c73e98 100644 --- a/examples/features/standard/xa-receive/pom.xml +++ b/examples/features/standard/xa-receive/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT xa-receive diff --git a/examples/features/standard/xa-send/pom.xml b/examples/features/standard/xa-send/pom.xml index 4824ca3e..7aac1f65 100644 --- a/examples/features/standard/xa-send/pom.xml +++ b/examples/features/standard/xa-send/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.broker jms-examples - 2.55.0 + 2.56.0-SNAPSHOT xa-send diff --git a/examples/features/sub-modules/artemis-jakarta-ra-rar/pom.xml b/examples/features/sub-modules/artemis-jakarta-ra-rar/pom.xml index ecbbafac..03f63cde 100644 --- a/examples/features/sub-modules/artemis-jakarta-ra-rar/pom.xml +++ b/examples/features/sub-modules/artemis-jakarta-ra-rar/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.modules broker-modules - 2.55.0 + 2.56.0-SNAPSHOT artemis-jakarta-rar diff --git a/examples/features/sub-modules/artemis-ra-rar/pom.xml b/examples/features/sub-modules/artemis-ra-rar/pom.xml index 90182ea3..fd04517f 100644 --- a/examples/features/sub-modules/artemis-ra-rar/pom.xml +++ b/examples/features/sub-modules/artemis-ra-rar/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.modules broker-modules - 2.55.0 + 2.56.0-SNAPSHOT artemis-rar 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 8561f4cd..28df4bc4 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 @@ -25,7 +25,7 @@ under the License. org.apache.artemis.examples.modules inter-broker-bridge-pom - 2.55.0 + 2.56.0-SNAPSHOT artemis-jms-bridge diff --git a/examples/features/sub-modules/inter-broker-bridge/pom.xml b/examples/features/sub-modules/inter-broker-bridge/pom.xml index 3f1d23b7..cde181b7 100644 --- a/examples/features/sub-modules/inter-broker-bridge/pom.xml +++ b/examples/features/sub-modules/inter-broker-bridge/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.modules broker-modules - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.modules diff --git a/examples/features/sub-modules/pom.xml b/examples/features/sub-modules/pom.xml index 7513b8d9..c88b75e8 100644 --- a/examples/features/sub-modules/pom.xml +++ b/examples/features/sub-modules/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.clustered broker-features - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.modules diff --git a/examples/features/sub-modules/queue-artemis-jakarta-client-all/pom.xml b/examples/features/sub-modules/queue-artemis-jakarta-client-all/pom.xml index 834967dd..5b8bebec 100644 --- a/examples/features/sub-modules/queue-artemis-jakarta-client-all/pom.xml +++ b/examples/features/sub-modules/queue-artemis-jakarta-client-all/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.modules broker-modules - 2.55.0 + 2.56.0-SNAPSHOT queue-artemis-jakarta-client-all diff --git a/examples/features/sub-modules/queue-artemis-jms-client-all/pom.xml b/examples/features/sub-modules/queue-artemis-jms-client-all/pom.xml index 9818b15a..f77dbf0c 100644 --- a/examples/features/sub-modules/queue-artemis-jms-client-all/pom.xml +++ b/examples/features/sub-modules/queue-artemis-jms-client-all/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.modules broker-modules - 2.55.0 + 2.56.0-SNAPSHOT queue-artemis-jms-client-all diff --git a/examples/features/sub-modules/tomcat/pom.xml b/examples/features/sub-modules/tomcat/pom.xml index 13647df4..f5abae36 100644 --- a/examples/features/sub-modules/tomcat/pom.xml +++ b/examples/features/sub-modules/tomcat/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.artemis.examples.modules broker-modules - 2.55.0 + 2.56.0-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 48af236a..fbd46403 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples artemis-examples-build - 2.55.0 + 2.56.0-SNAPSHOT artemis-examples @@ -32,7 +32,6 @@ under the License. Apache Artemis Examples - 231.7.7.7 ${project.basedir}/.. diff --git a/examples/protocols/amqp/pom.xml b/examples/protocols/amqp/pom.xml index ac8f607d..17f595de 100644 --- a/examples/protocols/amqp/pom.xml +++ b/examples/protocols/amqp/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.protocols protocols - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.amqp diff --git a/examples/protocols/amqp/proton-clustered-cpp/pom.xml b/examples/protocols/amqp/proton-clustered-cpp/pom.xml index 71cc8c80..59eb2cf0 100644 --- a/examples/protocols/amqp/proton-clustered-cpp/pom.xml +++ b/examples/protocols/amqp/proton-clustered-cpp/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.amqp amqp - 2.55.0 + 2.56.0-SNAPSHOT proton-clustered-cpp diff --git a/examples/protocols/amqp/proton-cpp/pom.xml b/examples/protocols/amqp/proton-cpp/pom.xml index 5cbca83a..1b694ec9 100644 --- a/examples/protocols/amqp/proton-cpp/pom.xml +++ b/examples/protocols/amqp/proton-cpp/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.amqp amqp - 2.55.0 + 2.56.0-SNAPSHOT protoncpp diff --git a/examples/protocols/amqp/proton-ruby/pom.xml b/examples/protocols/amqp/proton-ruby/pom.xml index 9cdbded4..4fad87a1 100644 --- a/examples/protocols/amqp/proton-ruby/pom.xml +++ b/examples/protocols/amqp/proton-ruby/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.amqp amqp - 2.55.0 + 2.56.0-SNAPSHOT proton-ruby diff --git a/examples/protocols/amqp/queue/pom.xml b/examples/protocols/amqp/queue/pom.xml index 0d103626..8f29f57e 100644 --- a/examples/protocols/amqp/queue/pom.xml +++ b/examples/protocols/amqp/queue/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.amqp amqp - 2.55.0 + 2.56.0-SNAPSHOT queue diff --git a/examples/protocols/amqp/sasl-scram/pom.xml b/examples/protocols/amqp/sasl-scram/pom.xml index 2d9e8093..f081d150 100644 --- a/examples/protocols/amqp/sasl-scram/pom.xml +++ b/examples/protocols/amqp/sasl-scram/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.amqp amqp - 2.55.0 + 2.56.0-SNAPSHOT ${project.basedir}/../../../.. diff --git a/examples/protocols/mqtt/clustered-queue-mqtt/pom.xml b/examples/protocols/mqtt/clustered-queue-mqtt/pom.xml index d05923b8..9737fcb9 100644 --- a/examples/protocols/mqtt/clustered-queue-mqtt/pom.xml +++ b/examples/protocols/mqtt/clustered-queue-mqtt/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.mqtt mqtt-examples - 2.55.0 + 2.56.0-SNAPSHOT clustered-queue-mqtt diff --git a/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server0/broker.xml b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server0/broker.xml index c6436273..1be633b2 100644 --- a/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server0/broker.xml +++ b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server0/broker.xml @@ -32,6 +32,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -41,23 +42,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - netty-connector @@ -65,7 +49,9 @@ under the License. true STRICT 1 - + + server1-connector + diff --git a/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server1/broker.xml b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server1/broker.xml index 9ffcc73d..a90a497c 100644 --- a/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server1/broker.xml +++ b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server1/broker.xml @@ -32,6 +32,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -41,23 +42,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - netty-connector @@ -65,7 +49,9 @@ under the License. true STRICT 1 - + + server0-connector + diff --git a/examples/protocols/mqtt/pom.xml b/examples/protocols/mqtt/pom.xml index 26afd395..7fa57e21 100644 --- a/examples/protocols/mqtt/pom.xml +++ b/examples/protocols/mqtt/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.protocols protocols - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.mqtt diff --git a/examples/protocols/mqtt/publish-subscribe/pom.xml b/examples/protocols/mqtt/publish-subscribe/pom.xml index c25eb801..67cdb227 100644 --- a/examples/protocols/mqtt/publish-subscribe/pom.xml +++ b/examples/protocols/mqtt/publish-subscribe/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.mqtt mqtt-examples - 2.55.0 + 2.56.0-SNAPSHOT publish-subscribe diff --git a/examples/protocols/openwire/chat/pom.xml b/examples/protocols/openwire/chat/pom.xml index 4c88b75e..9d2ef0ae 100644 --- a/examples/protocols/openwire/chat/pom.xml +++ b/examples/protocols/openwire/chat/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.openwire openwire-examples - 2.55.0 + 2.56.0-SNAPSHOT chat-example diff --git a/examples/protocols/openwire/message-listener/pom.xml b/examples/protocols/openwire/message-listener/pom.xml index c135b4b0..e47a67e2 100644 --- a/examples/protocols/openwire/message-listener/pom.xml +++ b/examples/protocols/openwire/message-listener/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.openwire openwire-examples - 2.55.0 + 2.56.0-SNAPSHOT message-listener diff --git a/examples/protocols/openwire/message-recovery/pom.xml b/examples/protocols/openwire/message-recovery/pom.xml index 572b42e0..e3634b23 100644 --- a/examples/protocols/openwire/message-recovery/pom.xml +++ b/examples/protocols/openwire/message-recovery/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.openwire openwire-examples - 2.55.0 + 2.56.0-SNAPSHOT message-recovery diff --git a/examples/protocols/openwire/pom.xml b/examples/protocols/openwire/pom.xml index 8d9e4e1b..52276ed4 100644 --- a/examples/protocols/openwire/pom.xml +++ b/examples/protocols/openwire/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.protocols protocols - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.openwire diff --git a/examples/protocols/openwire/queue/pom.xml b/examples/protocols/openwire/queue/pom.xml index df74c96a..2309606b 100644 --- a/examples/protocols/openwire/queue/pom.xml +++ b/examples/protocols/openwire/queue/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.openwire openwire-examples - 2.55.0 + 2.56.0-SNAPSHOT queue-openwire diff --git a/examples/protocols/openwire/virtual-topic-mapping/pom.xml b/examples/protocols/openwire/virtual-topic-mapping/pom.xml index 50a3e7cb..fa6eb2e4 100644 --- a/examples/protocols/openwire/virtual-topic-mapping/pom.xml +++ b/examples/protocols/openwire/virtual-topic-mapping/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.openwire openwire-examples - 2.55.0 + 2.56.0-SNAPSHOT virtual-topic-mapping diff --git a/examples/protocols/pom.xml b/examples/protocols/pom.xml index d8e51b6a..f6764b01 100644 --- a/examples/protocols/pom.xml +++ b/examples/protocols/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples artemis-examples - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.protocols diff --git a/examples/protocols/stomp/pom.xml b/examples/protocols/stomp/pom.xml index 3c269e42..201b769a 100644 --- a/examples/protocols/stomp/pom.xml +++ b/examples/protocols/stomp/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.protocols protocols - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples.stomp diff --git a/examples/protocols/stomp/stomp-dual-authentication/pom.xml b/examples/protocols/stomp/stomp-dual-authentication/pom.xml index 20141e3e..268fb33d 100644 --- a/examples/protocols/stomp/stomp-dual-authentication/pom.xml +++ b/examples/protocols/stomp/stomp-dual-authentication/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.stomp stomp-examples - 2.55.0 + 2.56.0-SNAPSHOT stomp-dual-authentication diff --git a/examples/protocols/stomp/stomp-embedded-interceptor/pom.xml b/examples/protocols/stomp/stomp-embedded-interceptor/pom.xml index 8a81e91f..179eaad7 100644 --- a/examples/protocols/stomp/stomp-embedded-interceptor/pom.xml +++ b/examples/protocols/stomp/stomp-embedded-interceptor/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.stomp stomp-examples - 2.55.0 + 2.56.0-SNAPSHOT stomp-embedded-interceptor diff --git a/examples/protocols/stomp/stomp-jms/pom.xml b/examples/protocols/stomp/stomp-jms/pom.xml index f01428a6..54d36e10 100644 --- a/examples/protocols/stomp/stomp-jms/pom.xml +++ b/examples/protocols/stomp/stomp-jms/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.stomp stomp-examples - 2.55.0 + 2.56.0-SNAPSHOT stomp-jms diff --git a/examples/protocols/stomp/stomp-websockets/pom.xml b/examples/protocols/stomp/stomp-websockets/pom.xml index 9128ffe5..de79c3d6 100644 --- a/examples/protocols/stomp/stomp-websockets/pom.xml +++ b/examples/protocols/stomp/stomp-websockets/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.stomp stomp-examples - 2.55.0 + 2.56.0-SNAPSHOT stomp-websockets diff --git a/examples/protocols/stomp/stomp/pom.xml b/examples/protocols/stomp/stomp/pom.xml index f58bdb1a..37a9baab 100644 --- a/examples/protocols/stomp/stomp/pom.xml +++ b/examples/protocols/stomp/stomp/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.stomp stomp-examples - 2.55.0 + 2.56.0-SNAPSHOT stomp diff --git a/examples/protocols/stomp/stomp1.1/pom.xml b/examples/protocols/stomp/stomp1.1/pom.xml index 64e21b03..5789eee3 100644 --- a/examples/protocols/stomp/stomp1.1/pom.xml +++ b/examples/protocols/stomp/stomp1.1/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.stomp stomp-examples - 2.55.0 + 2.56.0-SNAPSHOT stomp1.1 diff --git a/examples/protocols/stomp/stomp1.2/pom.xml b/examples/protocols/stomp/stomp1.2/pom.xml index fc36089f..3ef23926 100644 --- a/examples/protocols/stomp/stomp1.2/pom.xml +++ b/examples/protocols/stomp/stomp1.2/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.artemis.examples.stomp stomp-examples - 2.55.0 + 2.56.0-SNAPSHOT stomp1.2 diff --git a/pom.xml b/pom.xml index 2621b847..e858aa89 100644 --- a/pom.xml +++ b/pom.xml @@ -24,12 +24,12 @@ under the License. org.apache.artemis artemis-pom - 2.55.0 + 2.56.0-SNAPSHOT org.apache.artemis.examples artemis-examples-build - 2.55.0 + 2.56.0-SNAPSHOT pom Apache Artemis Examples Build