From 6f14de77be4b486e8da5e1f08e681fe3bc817485 Mon Sep 17 00:00:00 2001 From: Robbie Gemmell Date: Tue, 14 Nov 2023 16:48:15 +0000 Subject: [PATCH] ARTEMIS-4504: add a stop goal that runs the cli script, update examples to use it --- .../artemis/maven/ArtemisAbstractPlugin.java | 17 ++++ .../artemis/maven/ArtemisCLIPlugin.java | 13 +-- .../artemis/maven/ArtemisCreatePlugin.java | 13 +-- .../artemis/maven/ArtemisStopPlugin.java | 92 +++++++++++++++++++ .../artemis/maven/ArtemisUpgradePlugin.java | 13 +-- docs/user-manual/maven-plugin.adoc | 5 +- .../broker-connection/amqp-federation/pom.xml | 10 +- .../amqp-receiving-messages/pom.xml | 10 +- .../amqp-sending-messages-multicast/pom.xml | 10 +- .../amqp-sending-messages/pom.xml | 10 +- .../amqp-sending-overssl/pom.xml | 10 +- .../disaster-recovery/pom.xml | 10 +- .../client-side-load-balancing/pom.xml | 15 +-- .../clustered-durable-subscription/pom.xml | 10 +- .../clustered/clustered-grouping/pom.xml | 15 +-- .../clustered/clustered-jgroups/pom.xml | 10 +- .../clustered/clustered-queue/pom.xml | 10 +- .../clustered-static-discovery-uri/pom.xml | 20 +--- .../clustered-static-discovery/pom.xml | 20 +--- .../clustered/clustered-static-oneway/pom.xml | 15 +-- .../clustered/clustered-topic-uri/pom.xml | 10 +- .../clustered/clustered-topic/pom.xml | 10 +- .../queue-message-redistribution/pom.xml | 10 +- .../clustered/symmetric-cluster/pom.xml | 30 ++---- .../connection-router/evenly-redirect/pom.xml | 15 +-- .../symmetric-redirect/pom.xml | 10 +- .../symmetric-simple/pom.xml | 10 +- .../federated-address-divert/pom.xml | 10 +- .../pom.xml | 15 +-- .../federated-address-downstream/pom.xml | 15 +-- .../federation/federated-address/pom.xml | 15 +-- .../pom.xml | 15 +-- .../federated-queue-downstream/pom.xml | 15 +-- .../federation/federated-queue/pom.xml | 15 +-- .../features/ha/stop-server-failover/pom.xml | 10 +- .../features/standard/auto-closeable/pom.xml | 5 +- .../standard/broker-msg-auth-plugin/pom.xml | 5 +- .../features/standard/broker-plugin/pom.xml | 5 +- examples/features/standard/browser/pom.xml | 5 +- .../standard/camel/camel-broker/pom.xml | 5 +- examples/features/standard/cdi/pom.xml | 5 +- .../features/standard/client-kickoff/pom.xml | 5 +- .../standard/completion-listener/pom.xml | 5 +- .../standard/consumer-rate-limit/pom.xml | 5 +- examples/features/standard/context/pom.xml | 5 +- .../features/standard/core-bridge/pom.xml | 10 +- examples/features/standard/database/pom.xml | 5 +- .../features/standard/dead-letter/pom.xml | 5 +- .../standard/delayed-redelivery/pom.xml | 5 +- examples/features/standard/divert/pom.xml | 10 +- .../standard/durable-subscription/pom.xml | 5 +- .../features/standard/exclusive-queue/pom.xml | 5 +- examples/features/standard/expiry/pom.xml | 5 +- .../features/standard/http-transport/pom.xml | 5 +- .../instantiate-connection-factory/pom.xml | 5 +- .../standard/interceptor-amqp/pom.xml | 5 +- .../standard/interceptor-client/pom.xml | 5 +- .../standard/interceptor-mqtt/pom.xml | 5 +- .../features/standard/interceptor/pom.xml | 5 +- examples/features/standard/jms-bridge/pom.xml | 10 +- examples/features/standard/jmx-ssl/pom.xml | 5 +- examples/features/standard/jmx/pom.xml | 5 +- .../standard/last-value-queue/pom.xml | 5 +- .../standard/management-notifications/pom.xml | 5 +- examples/features/standard/management/pom.xml | 5 +- .../standard/message-counters/pom.xml | 5 +- .../features/standard/message-group/pom.xml | 5 +- .../features/standard/message-group2/pom.xml | 5 +- .../standard/message-priority/pom.xml | 5 +- .../features/standard/netty-openssl/pom.xml | 5 +- .../standard/no-consumer-buffering/pom.xml | 5 +- .../features/standard/opentelemetry/pom.xml | 5 +- examples/features/standard/paging/pom.xml | 5 +- .../features/standard/pre-acknowledge/pom.xml | 5 +- .../standard/producer-rate-limit/pom.xml | 5 +- .../features/standard/queue-jakarta/pom.xml | 5 +- .../features/standard/queue-requestor/pom.xml | 5 +- .../features/standard/queue-selector/pom.xml | 5 +- examples/features/standard/queue/pom.xml | 5 +- .../features/standard/reattach-node/pom.xml | 5 +- .../features/standard/request-reply/pom.xml | 5 +- .../standard/scheduled-message/pom.xml | 5 +- .../standard/security-keycloak/pom.xml | 5 +- .../features/standard/security-ldap/pom.xml | 5 +- .../standard/security-manager/pom.xml | 5 +- examples/features/standard/security/pom.xml | 5 +- .../standard/send-acknowledgements/pom.xml | 5 +- .../features/standard/shared-consumer/pom.xml | 5 +- .../features/standard/slow-consumer/pom.xml | 5 +- .../standard/ssl-enabled-crl-mqtt/pom.xml | 5 +- .../ssl-enabled-dual-authentication/pom.xml | 5 +- .../features/standard/ssl-enabled/pom.xml | 5 +- .../features/standard/static-selector/pom.xml | 5 +- examples/features/standard/temp-queue/pom.xml | 5 +- .../standard/topic-hierarchies/pom.xml | 5 +- .../features/standard/topic-selector1/pom.xml | 5 +- .../features/standard/topic-selector2/pom.xml | 5 +- examples/features/standard/topic/pom.xml | 5 +- .../features/standard/transactional/pom.xml | 5 +- .../features/standard/xa-heuristic/pom.xml | 5 +- examples/features/standard/xa-receive/pom.xml | 5 +- examples/features/standard/xa-send/pom.xml | 5 +- .../amqp/proton-clustered-cpp/pom.xml | 10 +- examples/protocols/amqp/proton-cpp/pom.xml | 5 +- examples/protocols/amqp/queue/pom.xml | 5 +- examples/protocols/amqp/sasl-scram/pom.xml | 5 +- .../mqtt/clustered-queue-mqtt/pom.xml | 10 +- .../protocols/mqtt/publish-subscribe/pom.xml | 5 +- .../openwire/message-listener/pom.xml | 5 +- examples/protocols/openwire/queue/pom.xml | 5 +- .../openwire/virtual-topic-mapping/pom.xml | 5 +- .../stomp/stomp-dual-authentication/pom.xml | 5 +- .../stomp/stomp-embedded-interceptor/pom.xml | 5 +- examples/protocols/stomp/stomp-jms/pom.xml | 5 +- .../protocols/stomp/stomp-websockets/pom.xml | 5 +- examples/protocols/stomp/stomp/pom.xml | 5 +- examples/protocols/stomp/stomp1.1/pom.xml | 5 +- examples/protocols/stomp/stomp1.2/pom.xml | 5 +- tests/karaf-client-integration-tests/pom.xml | 5 +- 119 files changed, 278 insertions(+), 700 deletions(-) create mode 100644 artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisStopPlugin.java diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java index 9b9ea0b664..7ecbeefc17 100644 --- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java @@ -94,6 +94,23 @@ public abstract class ArtemisAbstractPlugin extends AbstractMojo { return Files.exists(artemisScript, LinkOption.NOFOLLOW_LINKS); } + protected File findArtemisHome(final File home, final File alternateHome) throws MojoExecutionException { + if (isArtemisHome(home.toPath())) { + return home; + } + + if (isArtemisHome(alternateHome.toPath())) { + return alternateHome; + } + + getLog().error("********************************************************************************************"); + getLog().error("Could not locate suitable Artemis.home on either " + home + " or " + alternateHome); + getLog().error("Use the binary distribution or build the distribution before running the examples"); + getLog().error("********************************************************************************************"); + + throw new MojoExecutionException("Couldn't find artemis.home"); + } + protected abstract boolean isIgnore(); protected Artifact newArtifact(String artifactID) throws MojoFailureException { diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java index 2e9156f139..402025c5d7 100644 --- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java @@ -89,18 +89,7 @@ public class ArtemisCLIPlugin extends ArtemisAbstractPlugin { MavenProject project = (MavenProject) getPluginContext().get("project"); - if (!isArtemisHome(home.toPath())) { - if (isArtemisHome(alternateHome.toPath())) { - home = alternateHome; - } else { - getLog().error("********************************************************************************************"); - getLog().error("Could not locate suitable Artemis.home on either " + home + " or " + alternateHome); - getLog().error("Use the binary distribution or build the distribution before running the examples"); - getLog().error("********************************************************************************************"); - - throw new MojoExecutionException("Couldn't find artemis.home"); - } - } + home = findArtemisHome(home, alternateHome); try { if (spawn) { diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java index 30e7ef0088..b0f66b98d6 100644 --- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java @@ -169,18 +169,7 @@ public class ArtemisCreatePlugin extends ArtemisAbstractPlugin { getLog().debug("Local " + localRepository); MavenProject project = (MavenProject) getPluginContext().get("project"); - if (!isArtemisHome(home.toPath())) { - if (isArtemisHome(alternateHome.toPath())) { - home = alternateHome; - } else { - getLog().error("********************************************************************************************"); - getLog().error("Could not locate suitable Artemis.home on either " + home + " or " + alternateHome); - getLog().error("Use the binary distribution or build the distribution before running the examples"); - getLog().error("********************************************************************************************"); - - throw new MojoExecutionException("Couldn't find artemis.home"); - } - } + home = findArtemisHome(home, alternateHome); Map properties = getPluginContext(); diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisStopPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisStopPlugin.java new file mode 100644 index 0000000000..0df21144dd --- /dev/null +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisStopPlugin.java @@ -0,0 +1,92 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.artemis.maven; + +import java.io.File; +import java.util.concurrent.TimeUnit; + +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugin.descriptor.PluginDescriptor; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.project.MavenProject; + +@Mojo(name = "stop", defaultPhase = LifecyclePhase.VERIFY, threadSafe = true) +public class ArtemisStopPlugin extends ArtemisAbstractPlugin { + + private static final String STOP = "stop"; + + private PluginDescriptor descriptor; + + @Parameter(defaultValue = "${noServer}") + boolean ignore; + + @Parameter(defaultValue = "server") + String name; + + @Parameter(defaultValue = "${activemq.basedir}", required = true) + private File home; + + @Parameter(defaultValue = "${activemq.basedir}/artemis-distribution/target/apache-artemis-${project.version}-bin/apache-artemis-${project.version}/", required = true) + private File alternateHome; + + @Parameter(defaultValue = "${basedir}/target/server0", required = true) + private File location; + + @Parameter(defaultValue = "30000") + private long spawnTimeout; + + @Parameter + boolean useSystemOutput = getLog().isDebugEnabled(); + + @Override + protected boolean isIgnore() { + return ignore; + } + + @Override + protected void doExecute() throws MojoExecutionException, MojoFailureException { + MavenProject project = (MavenProject) getPluginContext().get("project"); + + home = findArtemisHome(home, alternateHome); + + try { + final Process process = org.apache.activemq.artemis.cli.process.ProcessBuilder.build(name, location, true, new String[] {STOP}); + Runtime.getRuntime().addShutdownHook(new Thread() { + @Override + public void run() { + process.destroy(); + } + }); + + boolean complete = process.waitFor(spawnTimeout, TimeUnit.MILLISECONDS); + if (!complete) { + getLog().error("Stop process did not exit within the spawnTimeout of " + spawnTimeout); + + throw new MojoExecutionException("Stop process did not exit within the spawnTimeout of " + spawnTimeout); + } + + Thread.sleep(600); + } catch (Throwable e) { + throw new MojoExecutionException(e.getMessage(), e); + } finally { + org.apache.activemq.artemis.cli.process.ProcessBuilder.cleanupProcess(); + } + } +} diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisUpgradePlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisUpgradePlugin.java index a95c88a729..fc36da7172 100644 --- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisUpgradePlugin.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisUpgradePlugin.java @@ -73,18 +73,7 @@ public class ArtemisUpgradePlugin extends ArtemisAbstractPlugin { getLog().debug("Local " + localRepository); MavenProject project = (MavenProject) getPluginContext().get("project"); - if (!isArtemisHome(home.toPath())) { - if (isArtemisHome(alternateHome.toPath())) { - home = alternateHome; - } else { - getLog().error("********************************************************************************************"); - getLog().error("Could not locate suitable Artemis.home on either " + home + " or " + alternateHome); - getLog().error("Use the binary distribution or build the distribution before running the examples"); - getLog().error("********************************************************************************************"); - - throw new MojoExecutionException("Couldn't find artemis.home"); - } - } + home = findArtemisHome(home, alternateHome); Map properties = getPluginContext(); diff --git a/docs/user-manual/maven-plugin.adoc b/docs/user-manual/maven-plugin.adoc index 37df280ba4..ca6418ba68 100644 --- a/docs/user-manual/maven-plugin.adoc +++ b/docs/user-manual/maven-plugin.adoc @@ -236,13 +236,10 @@ You may refer to it directly under the examples directory tree. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/broker-connection/amqp-federation/pom.xml b/examples/features/broker-connection/amqp-federation/pom.xml index fa64ff431d..56aabb9dd3 100644 --- a/examples/features/broker-connection/amqp-federation/pom.xml +++ b/examples/features/broker-connection/amqp-federation/pom.xml @@ -123,27 +123,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/broker-connection/amqp-receiving-messages/pom.xml b/examples/features/broker-connection/amqp-receiving-messages/pom.xml index e30d93ef87..db39af6422 100644 --- a/examples/features/broker-connection/amqp-receiving-messages/pom.xml +++ b/examples/features/broker-connection/amqp-receiving-messages/pom.xml @@ -123,27 +123,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - 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 31bdf12d01..779b38292e 100644 --- a/examples/features/broker-connection/amqp-sending-messages-multicast/pom.xml +++ b/examples/features/broker-connection/amqp-sending-messages-multicast/pom.xml @@ -123,27 +123,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/broker-connection/amqp-sending-messages/pom.xml b/examples/features/broker-connection/amqp-sending-messages/pom.xml index 9b113bb1b2..20a383eb85 100644 --- a/examples/features/broker-connection/amqp-sending-messages/pom.xml +++ b/examples/features/broker-connection/amqp-sending-messages/pom.xml @@ -123,27 +123,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/broker-connection/amqp-sending-overssl/pom.xml b/examples/features/broker-connection/amqp-sending-overssl/pom.xml index 7d021583bf..da8f25ea3b 100644 --- a/examples/features/broker-connection/amqp-sending-overssl/pom.xml +++ b/examples/features/broker-connection/amqp-sending-overssl/pom.xml @@ -122,27 +122,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/broker-connection/disaster-recovery/pom.xml b/examples/features/broker-connection/disaster-recovery/pom.xml index ec6a3f8f24..c2999b6d7f 100644 --- a/examples/features/broker-connection/disaster-recovery/pom.xml +++ b/examples/features/broker-connection/disaster-recovery/pom.xml @@ -122,27 +122,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/clustered/client-side-load-balancing/pom.xml b/examples/features/clustered/client-side-load-balancing/pom.xml index a5239d514c..5c68367ed5 100644 --- a/examples/features/clustered/client-side-load-balancing/pom.xml +++ b/examples/features/clustered/client-side-load-balancing/pom.xml @@ -164,40 +164,31 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - diff --git a/examples/features/clustered/clustered-durable-subscription/pom.xml b/examples/features/clustered/clustered-durable-subscription/pom.xml index 637f28217c..cbb7fc3c13 100644 --- a/examples/features/clustered/clustered-durable-subscription/pom.xml +++ b/examples/features/clustered/clustered-durable-subscription/pom.xml @@ -123,27 +123,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/clustered/clustered-grouping/pom.xml b/examples/features/clustered/clustered-grouping/pom.xml index fc48771072..bc5c2e56ff 100644 --- a/examples/features/clustered/clustered-grouping/pom.xml +++ b/examples/features/clustered/clustered-grouping/pom.xml @@ -148,40 +148,31 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - diff --git a/examples/features/clustered/clustered-jgroups/pom.xml b/examples/features/clustered/clustered-jgroups/pom.xml index ac3478131e..5591c2cdf6 100644 --- a/examples/features/clustered/clustered-jgroups/pom.xml +++ b/examples/features/clustered/clustered-jgroups/pom.xml @@ -119,26 +119,20 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${basedir}/target/server1 - - stop - diff --git a/examples/features/clustered/clustered-queue/pom.xml b/examples/features/clustered/clustered-queue/pom.xml index 8c930383e1..9f89b2f4ad 100644 --- a/examples/features/clustered/clustered-queue/pom.xml +++ b/examples/features/clustered/clustered-queue/pom.xml @@ -119,27 +119,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/clustered/clustered-static-discovery-uri/pom.xml b/examples/features/clustered/clustered-static-discovery-uri/pom.xml index a8ad6fd7e4..d150a43a49 100644 --- a/examples/features/clustered/clustered-static-discovery-uri/pom.xml +++ b/examples/features/clustered/clustered-static-discovery-uri/pom.xml @@ -180,53 +180,41 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - stop3 - cli + stop ${noServer} ${basedir}/target/server3 - - stop - diff --git a/examples/features/clustered/clustered-static-discovery/pom.xml b/examples/features/clustered/clustered-static-discovery/pom.xml index 26fc422dc0..a87b61b3c7 100644 --- a/examples/features/clustered/clustered-static-discovery/pom.xml +++ b/examples/features/clustered/clustered-static-discovery/pom.xml @@ -180,53 +180,41 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - stop3 - cli + stop ${noServer} ${basedir}/target/server3 - - stop - diff --git a/examples/features/clustered/clustered-static-oneway/pom.xml b/examples/features/clustered/clustered-static-oneway/pom.xml index b03da7868e..0a6b410927 100644 --- a/examples/features/clustered/clustered-static-oneway/pom.xml +++ b/examples/features/clustered/clustered-static-oneway/pom.xml @@ -153,40 +153,31 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - diff --git a/examples/features/clustered/clustered-topic-uri/pom.xml b/examples/features/clustered/clustered-topic-uri/pom.xml index 07a53e5e33..2c2b91f8bd 100644 --- a/examples/features/clustered/clustered-topic-uri/pom.xml +++ b/examples/features/clustered/clustered-topic-uri/pom.xml @@ -119,27 +119,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/clustered/clustered-topic/pom.xml b/examples/features/clustered/clustered-topic/pom.xml index 88ba44c0b0..81ebae9dff 100644 --- a/examples/features/clustered/clustered-topic/pom.xml +++ b/examples/features/clustered/clustered-topic/pom.xml @@ -119,27 +119,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/clustered/queue-message-redistribution/pom.xml b/examples/features/clustered/queue-message-redistribution/pom.xml index e51ed45728..6467900c6a 100644 --- a/examples/features/clustered/queue-message-redistribution/pom.xml +++ b/examples/features/clustered/queue-message-redistribution/pom.xml @@ -120,27 +120,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/clustered/symmetric-cluster/pom.xml b/examples/features/clustered/symmetric-cluster/pom.xml index 0a7ba2fd65..aa2fcc172b 100644 --- a/examples/features/clustered/symmetric-cluster/pom.xml +++ b/examples/features/clustered/symmetric-cluster/pom.xml @@ -229,79 +229,61 @@ under the License. stop0 - cli + stop ${noSever} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noSever} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noSever} ${basedir}/target/server2 - - stop - stop3 - cli + stop ${noSever} ${basedir}/target/server3 - - stop - stop4 - cli + stop ${noSever} ${basedir}/target/server4 - - stop - stop5 - cli + stop ${noSever} ${basedir}/target/server5 - - stop - diff --git a/examples/features/connection-router/evenly-redirect/pom.xml b/examples/features/connection-router/evenly-redirect/pom.xml index e3cb668438..d2990be032 100644 --- a/examples/features/connection-router/evenly-redirect/pom.xml +++ b/examples/features/connection-router/evenly-redirect/pom.xml @@ -154,40 +154,31 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - diff --git a/examples/features/connection-router/symmetric-redirect/pom.xml b/examples/features/connection-router/symmetric-redirect/pom.xml index 7524ad9e83..500e950d24 100644 --- a/examples/features/connection-router/symmetric-redirect/pom.xml +++ b/examples/features/connection-router/symmetric-redirect/pom.xml @@ -125,27 +125,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/connection-router/symmetric-simple/pom.xml b/examples/features/connection-router/symmetric-simple/pom.xml index aab79367e5..7b81c09462 100644 --- a/examples/features/connection-router/symmetric-simple/pom.xml +++ b/examples/features/connection-router/symmetric-simple/pom.xml @@ -120,27 +120,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/federation/federated-address-divert/pom.xml b/examples/features/federation/federated-address-divert/pom.xml index 90e75afc62..b7fc360db6 100644 --- a/examples/features/federation/federated-address-divert/pom.xml +++ b/examples/features/federation/federated-address-divert/pom.xml @@ -119,27 +119,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/federation/federated-address-downstream-upstream/pom.xml b/examples/features/federation/federated-address-downstream-upstream/pom.xml index d81db4a085..68cba135ef 100644 --- a/examples/features/federation/federated-address-downstream-upstream/pom.xml +++ b/examples/features/federation/federated-address-downstream-upstream/pom.xml @@ -148,40 +148,31 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - diff --git a/examples/features/federation/federated-address-downstream/pom.xml b/examples/features/federation/federated-address-downstream/pom.xml index 8ee43489f2..3f75f4648f 100644 --- a/examples/features/federation/federated-address-downstream/pom.xml +++ b/examples/features/federation/federated-address-downstream/pom.xml @@ -148,40 +148,31 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - diff --git a/examples/features/federation/federated-address/pom.xml b/examples/features/federation/federated-address/pom.xml index 6c96b4db7e..294881c286 100644 --- a/examples/features/federation/federated-address/pom.xml +++ b/examples/features/federation/federated-address/pom.xml @@ -148,40 +148,31 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - diff --git a/examples/features/federation/federated-queue-downstream-upstream/pom.xml b/examples/features/federation/federated-queue-downstream-upstream/pom.xml index 8e9ca3a0dc..419fe5cec0 100644 --- a/examples/features/federation/federated-queue-downstream-upstream/pom.xml +++ b/examples/features/federation/federated-queue-downstream-upstream/pom.xml @@ -148,40 +148,31 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - diff --git a/examples/features/federation/federated-queue-downstream/pom.xml b/examples/features/federation/federated-queue-downstream/pom.xml index 15a3fb73cb..6286385432 100644 --- a/examples/features/federation/federated-queue-downstream/pom.xml +++ b/examples/features/federation/federated-queue-downstream/pom.xml @@ -148,40 +148,31 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - diff --git a/examples/features/federation/federated-queue/pom.xml b/examples/features/federation/federated-queue/pom.xml index bb967db288..d52df92e32 100644 --- a/examples/features/federation/federated-queue/pom.xml +++ b/examples/features/federation/federated-queue/pom.xml @@ -148,40 +148,31 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - diff --git a/examples/features/ha/stop-server-failover/pom.xml b/examples/features/ha/stop-server-failover/pom.xml index 12e95d32d0..dbeca969d7 100644 --- a/examples/features/ha/stop-server-failover/pom.xml +++ b/examples/features/ha/stop-server-failover/pom.xml @@ -123,27 +123,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/standard/auto-closeable/pom.xml b/examples/features/standard/auto-closeable/pom.xml index 58143b77a0..4278e9a50f 100644 --- a/examples/features/standard/auto-closeable/pom.xml +++ b/examples/features/standard/auto-closeable/pom.xml @@ -81,13 +81,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/broker-msg-auth-plugin/pom.xml b/examples/features/standard/broker-msg-auth-plugin/pom.xml index 206efe6d69..88cee6c75f 100644 --- a/examples/features/standard/broker-msg-auth-plugin/pom.xml +++ b/examples/features/standard/broker-msg-auth-plugin/pom.xml @@ -101,13 +101,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/broker-plugin/pom.xml b/examples/features/standard/broker-plugin/pom.xml index 7d78576fe8..898cf53b0e 100644 --- a/examples/features/standard/broker-plugin/pom.xml +++ b/examples/features/standard/broker-plugin/pom.xml @@ -101,13 +101,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/browser/pom.xml b/examples/features/standard/browser/pom.xml index 95b62e85e5..8c107ba16a 100644 --- a/examples/features/standard/browser/pom.xml +++ b/examples/features/standard/browser/pom.xml @@ -85,13 +85,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/camel/camel-broker/pom.xml b/examples/features/standard/camel/camel-broker/pom.xml index ea09da29b5..71972e43c9 100644 --- a/examples/features/standard/camel/camel-broker/pom.xml +++ b/examples/features/standard/camel/camel-broker/pom.xml @@ -108,14 +108,11 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - diff --git a/examples/features/standard/cdi/pom.xml b/examples/features/standard/cdi/pom.xml index 5603ac2353..82fd9d06ac 100644 --- a/examples/features/standard/cdi/pom.xml +++ b/examples/features/standard/cdi/pom.xml @@ -134,13 +134,10 @@ stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/client-kickoff/pom.xml b/examples/features/standard/client-kickoff/pom.xml index 6ba183f17b..644e3bdd51 100644 --- a/examples/features/standard/client-kickoff/pom.xml +++ b/examples/features/standard/client-kickoff/pom.xml @@ -85,13 +85,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/completion-listener/pom.xml b/examples/features/standard/completion-listener/pom.xml index 8b3bfbb006..5ea730ad67 100644 --- a/examples/features/standard/completion-listener/pom.xml +++ b/examples/features/standard/completion-listener/pom.xml @@ -85,13 +85,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/consumer-rate-limit/pom.xml b/examples/features/standard/consumer-rate-limit/pom.xml index 062d6d3cbb..e36e47aefc 100644 --- a/examples/features/standard/consumer-rate-limit/pom.xml +++ b/examples/features/standard/consumer-rate-limit/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/context/pom.xml b/examples/features/standard/context/pom.xml index a01e9fcc1a..b38cdd86f4 100644 --- a/examples/features/standard/context/pom.xml +++ b/examples/features/standard/context/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/core-bridge/pom.xml b/examples/features/standard/core-bridge/pom.xml index ea48f825da..807fbfebdb 100644 --- a/examples/features/standard/core-bridge/pom.xml +++ b/examples/features/standard/core-bridge/pom.xml @@ -128,27 +128,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/standard/database/pom.xml b/examples/features/standard/database/pom.xml index 983e4f5dfc..cc5e29a6e2 100644 --- a/examples/features/standard/database/pom.xml +++ b/examples/features/standard/database/pom.xml @@ -91,13 +91,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/dead-letter/pom.xml b/examples/features/standard/dead-letter/pom.xml index 8dd5c0960b..e657ede65f 100644 --- a/examples/features/standard/dead-letter/pom.xml +++ b/examples/features/standard/dead-letter/pom.xml @@ -85,13 +85,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/delayed-redelivery/pom.xml b/examples/features/standard/delayed-redelivery/pom.xml index 1ffda74768..49ac8528bf 100644 --- a/examples/features/standard/delayed-redelivery/pom.xml +++ b/examples/features/standard/delayed-redelivery/pom.xml @@ -85,13 +85,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/divert/pom.xml b/examples/features/standard/divert/pom.xml index 4743b4b1de..be60ae6176 100644 --- a/examples/features/standard/divert/pom.xml +++ b/examples/features/standard/divert/pom.xml @@ -120,27 +120,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/standard/durable-subscription/pom.xml b/examples/features/standard/durable-subscription/pom.xml index a89a7d64d9..d07a9a75eb 100644 --- a/examples/features/standard/durable-subscription/pom.xml +++ b/examples/features/standard/durable-subscription/pom.xml @@ -85,13 +85,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/exclusive-queue/pom.xml b/examples/features/standard/exclusive-queue/pom.xml index f41484a530..414110a045 100644 --- a/examples/features/standard/exclusive-queue/pom.xml +++ b/examples/features/standard/exclusive-queue/pom.xml @@ -94,13 +94,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/expiry/pom.xml b/examples/features/standard/expiry/pom.xml index b532869b69..4cc31e579e 100644 --- a/examples/features/standard/expiry/pom.xml +++ b/examples/features/standard/expiry/pom.xml @@ -85,13 +85,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/http-transport/pom.xml b/examples/features/standard/http-transport/pom.xml index 803ed6f392..dea6a80e45 100644 --- a/examples/features/standard/http-transport/pom.xml +++ b/examples/features/standard/http-transport/pom.xml @@ -85,13 +85,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/instantiate-connection-factory/pom.xml b/examples/features/standard/instantiate-connection-factory/pom.xml index 08905767cd..eb5987ae31 100644 --- a/examples/features/standard/instantiate-connection-factory/pom.xml +++ b/examples/features/standard/instantiate-connection-factory/pom.xml @@ -86,13 +86,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/interceptor-amqp/pom.xml b/examples/features/standard/interceptor-amqp/pom.xml index 8df6b6b6b4..b419c11d4e 100644 --- a/examples/features/standard/interceptor-amqp/pom.xml +++ b/examples/features/standard/interceptor-amqp/pom.xml @@ -91,13 +91,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/interceptor-client/pom.xml b/examples/features/standard/interceptor-client/pom.xml index 89595f679f..922ac5ec7c 100644 --- a/examples/features/standard/interceptor-client/pom.xml +++ b/examples/features/standard/interceptor-client/pom.xml @@ -91,13 +91,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/interceptor-mqtt/pom.xml b/examples/features/standard/interceptor-mqtt/pom.xml index 51a61442ce..797e531357 100644 --- a/examples/features/standard/interceptor-mqtt/pom.xml +++ b/examples/features/standard/interceptor-mqtt/pom.xml @@ -91,13 +91,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/interceptor/pom.xml b/examples/features/standard/interceptor/pom.xml index 074fc52c66..d5c6e81e77 100644 --- a/examples/features/standard/interceptor/pom.xml +++ b/examples/features/standard/interceptor/pom.xml @@ -86,13 +86,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/jms-bridge/pom.xml b/examples/features/standard/jms-bridge/pom.xml index be4dde1d88..3e92bc372c 100644 --- a/examples/features/standard/jms-bridge/pom.xml +++ b/examples/features/standard/jms-bridge/pom.xml @@ -120,27 +120,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/features/standard/jmx-ssl/pom.xml b/examples/features/standard/jmx-ssl/pom.xml index a64091eb6c..8475cc0bbc 100644 --- a/examples/features/standard/jmx-ssl/pom.xml +++ b/examples/features/standard/jmx-ssl/pom.xml @@ -93,13 +93,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/jmx/pom.xml b/examples/features/standard/jmx/pom.xml index 3a1e4e741b..cd6cefaf11 100644 --- a/examples/features/standard/jmx/pom.xml +++ b/examples/features/standard/jmx/pom.xml @@ -90,13 +90,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/last-value-queue/pom.xml b/examples/features/standard/last-value-queue/pom.xml index 7bca0e029e..e993624a55 100644 --- a/examples/features/standard/last-value-queue/pom.xml +++ b/examples/features/standard/last-value-queue/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/management-notifications/pom.xml b/examples/features/standard/management-notifications/pom.xml index cd0168818f..815fa00cef 100644 --- a/examples/features/standard/management-notifications/pom.xml +++ b/examples/features/standard/management-notifications/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/management/pom.xml b/examples/features/standard/management/pom.xml index 8d36b78a16..4ecabbf80f 100644 --- a/examples/features/standard/management/pom.xml +++ b/examples/features/standard/management/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/message-counters/pom.xml b/examples/features/standard/message-counters/pom.xml index 637e4b9527..ab964296c2 100644 --- a/examples/features/standard/message-counters/pom.xml +++ b/examples/features/standard/message-counters/pom.xml @@ -90,13 +90,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/message-group/pom.xml b/examples/features/standard/message-group/pom.xml index 4c98a29231..d8c96a728d 100644 --- a/examples/features/standard/message-group/pom.xml +++ b/examples/features/standard/message-group/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/message-group2/pom.xml b/examples/features/standard/message-group2/pom.xml index 55acac7785..a3b7cba387 100644 --- a/examples/features/standard/message-group2/pom.xml +++ b/examples/features/standard/message-group2/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/message-priority/pom.xml b/examples/features/standard/message-priority/pom.xml index 352f527560..e3296f5c68 100644 --- a/examples/features/standard/message-priority/pom.xml +++ b/examples/features/standard/message-priority/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/netty-openssl/pom.xml b/examples/features/standard/netty-openssl/pom.xml index 7350580205..7f6a4ff519 100644 --- a/examples/features/standard/netty-openssl/pom.xml +++ b/examples/features/standard/netty-openssl/pom.xml @@ -91,13 +91,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/no-consumer-buffering/pom.xml b/examples/features/standard/no-consumer-buffering/pom.xml index f1b2d104fc..17a5511e3a 100644 --- a/examples/features/standard/no-consumer-buffering/pom.xml +++ b/examples/features/standard/no-consumer-buffering/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/opentelemetry/pom.xml b/examples/features/standard/opentelemetry/pom.xml index 1fcc0764fa..21f118a225 100644 --- a/examples/features/standard/opentelemetry/pom.xml +++ b/examples/features/standard/opentelemetry/pom.xml @@ -173,13 +173,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/paging/pom.xml b/examples/features/standard/paging/pom.xml index 500d70f65d..ffebbe7fa2 100644 --- a/examples/features/standard/paging/pom.xml +++ b/examples/features/standard/paging/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/pre-acknowledge/pom.xml b/examples/features/standard/pre-acknowledge/pom.xml index 1255c3e43d..1623a3b141 100644 --- a/examples/features/standard/pre-acknowledge/pom.xml +++ b/examples/features/standard/pre-acknowledge/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/producer-rate-limit/pom.xml b/examples/features/standard/producer-rate-limit/pom.xml index 3b7784ca6f..983cafd651 100644 --- a/examples/features/standard/producer-rate-limit/pom.xml +++ b/examples/features/standard/producer-rate-limit/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/queue-jakarta/pom.xml b/examples/features/standard/queue-jakarta/pom.xml index 9361089ae6..70be71fe8e 100644 --- a/examples/features/standard/queue-jakarta/pom.xml +++ b/examples/features/standard/queue-jakarta/pom.xml @@ -99,13 +99,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/queue-requestor/pom.xml b/examples/features/standard/queue-requestor/pom.xml index acee1baf1a..6d4f3e4644 100644 --- a/examples/features/standard/queue-requestor/pom.xml +++ b/examples/features/standard/queue-requestor/pom.xml @@ -80,12 +80,9 @@ under the License. stop - cli + stop - - stop - diff --git a/examples/features/standard/queue-selector/pom.xml b/examples/features/standard/queue-selector/pom.xml index c310438985..56ec265f4e 100644 --- a/examples/features/standard/queue-selector/pom.xml +++ b/examples/features/standard/queue-selector/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/queue/pom.xml b/examples/features/standard/queue/pom.xml index 6642a4135d..49e690542f 100644 --- a/examples/features/standard/queue/pom.xml +++ b/examples/features/standard/queue/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/reattach-node/pom.xml b/examples/features/standard/reattach-node/pom.xml index f3474fdb08..d2389fb701 100644 --- a/examples/features/standard/reattach-node/pom.xml +++ b/examples/features/standard/reattach-node/pom.xml @@ -86,13 +86,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/request-reply/pom.xml b/examples/features/standard/request-reply/pom.xml index 68d5cf6e53..faaa3a3569 100644 --- a/examples/features/standard/request-reply/pom.xml +++ b/examples/features/standard/request-reply/pom.xml @@ -88,13 +88,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/scheduled-message/pom.xml b/examples/features/standard/scheduled-message/pom.xml index d9ec1bcdd6..7c941a26a6 100644 --- a/examples/features/standard/scheduled-message/pom.xml +++ b/examples/features/standard/scheduled-message/pom.xml @@ -89,13 +89,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/security-keycloak/pom.xml b/examples/features/standard/security-keycloak/pom.xml index 7f9a6ba70b..a2a2641c63 100644 --- a/examples/features/standard/security-keycloak/pom.xml +++ b/examples/features/standard/security-keycloak/pom.xml @@ -117,13 +117,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/security-ldap/pom.xml b/examples/features/standard/security-ldap/pom.xml index 9140c3fb35..e97af15ddc 100644 --- a/examples/features/standard/security-ldap/pom.xml +++ b/examples/features/standard/security-ldap/pom.xml @@ -126,13 +126,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/security-manager/pom.xml b/examples/features/standard/security-manager/pom.xml index 5c386c572c..9106c6aa51 100644 --- a/examples/features/standard/security-manager/pom.xml +++ b/examples/features/standard/security-manager/pom.xml @@ -97,13 +97,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/security/pom.xml b/examples/features/standard/security/pom.xml index 6b3cbd4892..228f1b018a 100644 --- a/examples/features/standard/security/pom.xml +++ b/examples/features/standard/security/pom.xml @@ -87,13 +87,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/send-acknowledgements/pom.xml b/examples/features/standard/send-acknowledgements/pom.xml index 45fb45b35a..8c5b071c8d 100644 --- a/examples/features/standard/send-acknowledgements/pom.xml +++ b/examples/features/standard/send-acknowledgements/pom.xml @@ -80,12 +80,9 @@ under the License. stop - cli + stop - - stop - diff --git a/examples/features/standard/shared-consumer/pom.xml b/examples/features/standard/shared-consumer/pom.xml index c5571a854a..54260b59ca 100644 --- a/examples/features/standard/shared-consumer/pom.xml +++ b/examples/features/standard/shared-consumer/pom.xml @@ -86,13 +86,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/slow-consumer/pom.xml b/examples/features/standard/slow-consumer/pom.xml index 98d391d6b2..ef98e1b4eb 100644 --- a/examples/features/standard/slow-consumer/pom.xml +++ b/examples/features/standard/slow-consumer/pom.xml @@ -93,13 +93,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/ssl-enabled-crl-mqtt/pom.xml b/examples/features/standard/ssl-enabled-crl-mqtt/pom.xml index 90104f2bfa..85bea95a2f 100644 --- a/examples/features/standard/ssl-enabled-crl-mqtt/pom.xml +++ b/examples/features/standard/ssl-enabled-crl-mqtt/pom.xml @@ -90,13 +90,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/ssl-enabled-dual-authentication/pom.xml b/examples/features/standard/ssl-enabled-dual-authentication/pom.xml index 859664a140..3322850b71 100644 --- a/examples/features/standard/ssl-enabled-dual-authentication/pom.xml +++ b/examples/features/standard/ssl-enabled-dual-authentication/pom.xml @@ -86,13 +86,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/ssl-enabled/pom.xml b/examples/features/standard/ssl-enabled/pom.xml index 7123d40fe9..3216bcc224 100644 --- a/examples/features/standard/ssl-enabled/pom.xml +++ b/examples/features/standard/ssl-enabled/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/static-selector/pom.xml b/examples/features/standard/static-selector/pom.xml index 11d61c56d7..01399d5398 100644 --- a/examples/features/standard/static-selector/pom.xml +++ b/examples/features/standard/static-selector/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/temp-queue/pom.xml b/examples/features/standard/temp-queue/pom.xml index 071ae75877..fa7f1fcc30 100644 --- a/examples/features/standard/temp-queue/pom.xml +++ b/examples/features/standard/temp-queue/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/topic-hierarchies/pom.xml b/examples/features/standard/topic-hierarchies/pom.xml index b3c66f4aa7..3c72611349 100644 --- a/examples/features/standard/topic-hierarchies/pom.xml +++ b/examples/features/standard/topic-hierarchies/pom.xml @@ -88,13 +88,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/topic-selector1/pom.xml b/examples/features/standard/topic-selector1/pom.xml index f4527950bd..063e7fd663 100644 --- a/examples/features/standard/topic-selector1/pom.xml +++ b/examples/features/standard/topic-selector1/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/topic-selector2/pom.xml b/examples/features/standard/topic-selector2/pom.xml index bfb465028e..a21b3501f0 100644 --- a/examples/features/standard/topic-selector2/pom.xml +++ b/examples/features/standard/topic-selector2/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/topic/pom.xml b/examples/features/standard/topic/pom.xml index 4de2bed1be..55229eed9b 100644 --- a/examples/features/standard/topic/pom.xml +++ b/examples/features/standard/topic/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/transactional/pom.xml b/examples/features/standard/transactional/pom.xml index f442a4ff58..4befa38fd0 100644 --- a/examples/features/standard/transactional/pom.xml +++ b/examples/features/standard/transactional/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/xa-heuristic/pom.xml b/examples/features/standard/xa-heuristic/pom.xml index 49b1bfa47d..5d5e6f8e59 100644 --- a/examples/features/standard/xa-heuristic/pom.xml +++ b/examples/features/standard/xa-heuristic/pom.xml @@ -85,13 +85,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/xa-receive/pom.xml b/examples/features/standard/xa-receive/pom.xml index 0e72e66f81..061930b4a8 100644 --- a/examples/features/standard/xa-receive/pom.xml +++ b/examples/features/standard/xa-receive/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/features/standard/xa-send/pom.xml b/examples/features/standard/xa-send/pom.xml index b94a8d23ab..21649782c9 100644 --- a/examples/features/standard/xa-send/pom.xml +++ b/examples/features/standard/xa-send/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/amqp/proton-clustered-cpp/pom.xml b/examples/protocols/amqp/proton-clustered-cpp/pom.xml index 650323095d..d4f0b6470b 100644 --- a/examples/protocols/amqp/proton-clustered-cpp/pom.xml +++ b/examples/protocols/amqp/proton-clustered-cpp/pom.xml @@ -127,27 +127,21 @@ under the License. stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - stop2 - cli + stop ${noServer} ${basedir}/target/server2 - - stop - diff --git a/examples/protocols/amqp/proton-cpp/pom.xml b/examples/protocols/amqp/proton-cpp/pom.xml index 4792fef4c2..b89c48522f 100644 --- a/examples/protocols/amqp/proton-cpp/pom.xml +++ b/examples/protocols/amqp/proton-cpp/pom.xml @@ -92,13 +92,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/amqp/queue/pom.xml b/examples/protocols/amqp/queue/pom.xml index b97fb6a6b2..d39e2cd908 100644 --- a/examples/protocols/amqp/queue/pom.xml +++ b/examples/protocols/amqp/queue/pom.xml @@ -83,13 +83,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/amqp/sasl-scram/pom.xml b/examples/protocols/amqp/sasl-scram/pom.xml index b7a370244b..59aae23c17 100644 --- a/examples/protocols/amqp/sasl-scram/pom.xml +++ b/examples/protocols/amqp/sasl-scram/pom.xml @@ -86,13 +86,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/mqtt/clustered-queue-mqtt/pom.xml b/examples/protocols/mqtt/clustered-queue-mqtt/pom.xml index b6a166a199..2e7e5613d6 100644 --- a/examples/protocols/mqtt/clustered-queue-mqtt/pom.xml +++ b/examples/protocols/mqtt/clustered-queue-mqtt/pom.xml @@ -123,27 +123,21 @@ under the License. stop0 - cli + stop ${noServer} ${basedir}/target/server0 - - stop - stop1 - cli + stop ${noServer} ${basedir}/target/server1 - - stop - diff --git a/examples/protocols/mqtt/publish-subscribe/pom.xml b/examples/protocols/mqtt/publish-subscribe/pom.xml index a8c46226bd..5daa6784c0 100644 --- a/examples/protocols/mqtt/publish-subscribe/pom.xml +++ b/examples/protocols/mqtt/publish-subscribe/pom.xml @@ -80,13 +80,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/openwire/message-listener/pom.xml b/examples/protocols/openwire/message-listener/pom.xml index bbad656cf8..4160e12623 100644 --- a/examples/protocols/openwire/message-listener/pom.xml +++ b/examples/protocols/openwire/message-listener/pom.xml @@ -104,13 +104,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/openwire/queue/pom.xml b/examples/protocols/openwire/queue/pom.xml index 8bcef6b14d..1246423091 100644 --- a/examples/protocols/openwire/queue/pom.xml +++ b/examples/protocols/openwire/queue/pom.xml @@ -107,13 +107,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/openwire/virtual-topic-mapping/pom.xml b/examples/protocols/openwire/virtual-topic-mapping/pom.xml index adc1e70810..cf893d66d0 100644 --- a/examples/protocols/openwire/virtual-topic-mapping/pom.xml +++ b/examples/protocols/openwire/virtual-topic-mapping/pom.xml @@ -107,13 +107,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/stomp/stomp-dual-authentication/pom.xml b/examples/protocols/stomp/stomp-dual-authentication/pom.xml index 1f5d0a57a7..acfb66e74f 100644 --- a/examples/protocols/stomp/stomp-dual-authentication/pom.xml +++ b/examples/protocols/stomp/stomp-dual-authentication/pom.xml @@ -89,13 +89,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/stomp/stomp-embedded-interceptor/pom.xml b/examples/protocols/stomp/stomp-embedded-interceptor/pom.xml index c8805f9c5c..95698527f5 100644 --- a/examples/protocols/stomp/stomp-embedded-interceptor/pom.xml +++ b/examples/protocols/stomp/stomp-embedded-interceptor/pom.xml @@ -102,13 +102,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/stomp/stomp-jms/pom.xml b/examples/protocols/stomp/stomp-jms/pom.xml index e17e63bae3..3aaa3b95aa 100644 --- a/examples/protocols/stomp/stomp-jms/pom.xml +++ b/examples/protocols/stomp/stomp-jms/pom.xml @@ -89,13 +89,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/stomp/stomp-websockets/pom.xml b/examples/protocols/stomp/stomp-websockets/pom.xml index 92dc53407e..bb4f704923 100644 --- a/examples/protocols/stomp/stomp-websockets/pom.xml +++ b/examples/protocols/stomp/stomp-websockets/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/stomp/stomp/pom.xml b/examples/protocols/stomp/stomp/pom.xml index 5697367aca..852dc41bcd 100644 --- a/examples/protocols/stomp/stomp/pom.xml +++ b/examples/protocols/stomp/stomp/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/stomp/stomp1.1/pom.xml b/examples/protocols/stomp/stomp1.1/pom.xml index 471486242d..c537c927c9 100644 --- a/examples/protocols/stomp/stomp1.1/pom.xml +++ b/examples/protocols/stomp/stomp1.1/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/examples/protocols/stomp/stomp1.2/pom.xml b/examples/protocols/stomp/stomp1.2/pom.xml index e9d5469ae0..eeab8102bf 100644 --- a/examples/protocols/stomp/stomp1.2/pom.xml +++ b/examples/protocols/stomp/stomp1.2/pom.xml @@ -84,13 +84,10 @@ under the License. stop - cli + stop ${noServer} - - stop - diff --git a/tests/karaf-client-integration-tests/pom.xml b/tests/karaf-client-integration-tests/pom.xml index f89da716c8..34ed6a0bb6 100644 --- a/tests/karaf-client-integration-tests/pom.xml +++ b/tests/karaf-client-integration-tests/pom.xml @@ -198,13 +198,10 @@ stop post-integration-test - cli + stop ${skipIntegrationTests} - - stop -