diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml index 23875716a9..f8583bf455 100644 --- a/tests/compatibility-tests/pom.xml +++ b/tests/compatibility-tests/pom.xml @@ -409,30 +409,53 @@ ${basedir}/target/ARTEMIS-2_17_0.cp - - compile - - dependency-scan - - 2_18_0-check - - true - - org.apache.activemq:artemis-jms-server:2.18.0 - org.apache.activemq:artemis-jms-client:2.18.0 - org.apache.activemq:artemis-cli:2.18.0 - org.apache.activemq:artemis-hornetq-protocol:2.18.0 - org.apache.activemq:artemis-amqp-protocol:2.18.0 - org.apache.activemq:artemis-hornetq-protocol:2.18.0 - org.apache.groovy:groovy-all:pom:${groovy.version} - org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final - - - org.apache.activemq.tests:compatibility-tests:${project.version} - - ${basedir}/target/ARTEMIS-2_18_0.cp - - + + + compile + + dependency-scan + + 2_18_0-check + + true + + org.apache.activemq:artemis-jms-server:2.18.0 + org.apache.activemq:artemis-jms-client:2.18.0 + org.apache.activemq:artemis-cli:2.18.0 + org.apache.activemq:artemis-hornetq-protocol:2.18.0 + org.apache.activemq:artemis-amqp-protocol:2.18.0 + org.apache.activemq:artemis-hornetq-protocol:2.18.0 + org.apache.groovy:groovy-all:pom:${groovy.version} + org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final + + + org.apache.activemq.tests:compatibility-tests:${project.version} + + ${basedir}/target/ARTEMIS-2_18_0.cp + + + + compile + + dependency-scan + + 2_28_0-check + + true + + org.apache.activemq:artemis-jms-server:2.28.0 + org.apache.activemq:artemis-cli:2.28.0 + org.apache.activemq:artemis-jms-client:2.28.0 + org.apache.activemq:artemis-hornetq-protocol:2.28.0 + org.apache.activemq:artemis-amqp-protocol:2.28.0 + org.apache.groovy:groovy-all:pom:${groovy.version} + + + org.apache.activemq.tests:compatibility-tests:${project.version} + + ${basedir}/target/ARTEMIS-2_28_0.cp + + compile diff --git a/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java b/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java index 7ff09f64af..c51e7dff72 100644 --- a/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java +++ b/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java @@ -42,6 +42,7 @@ public class GroovyRun { public static final String TWO_SEVENTEEN_ZERO = "ARTEMIS-2_17_0"; public static final String TWO_EIGHTEEN_ZERO = "ARTEMIS-2_18_0"; public static final String TWO_TWENTYTWO_ZERO = "ARTEMIS-2_22_0"; + public static final String TWO_TWENTYEIGHT_ZERO = "ARTEMIS-2_28_0"; public static final String HORNETQ_235 = "HORNETQ-235"; public static final String HORNETQ_247 = "HORNETQ-247"; public static final String AMQ_5_11 = "AMQ_5_11"; diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java index 6f5bf4dca7..203d30022b 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java @@ -36,6 +36,7 @@ import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_TWENTYEIGHT_ZERO; @RunWith(Parameterized.class) public class MeshTest extends ServerBase { @@ -60,6 +61,8 @@ public class MeshTest extends ServerBase { combinations.addAll(combinatory(SNAPSHOT, new Object[]{HORNETQ_235}, new Object[]{ONE_FIVE, SNAPSHOT, HORNETQ_235}, new Object[]{ONE_FIVE, SNAPSHOT, HORNETQ_235})); combinations.addAll(combinatory(SNAPSHOT, new Object[]{HORNETQ_247}, new Object[]{SNAPSHOT, HORNETQ_247}, new Object[]{SNAPSHOT, HORNETQ_247})); combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, ONE_FOUR}); + combinations.add(new Object[]{SNAPSHOT, TWO_TWENTYEIGHT_ZERO, TWO_TWENTYEIGHT_ZERO}); + combinations.add(new Object[]{TWO_TWENTYEIGHT_ZERO, SNAPSHOT, SNAPSHOT}); return combinations; }