You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/12/20 20:59:14 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1546 Changing version
check from 1.4.0 to latest 1.5.5
Repository: activemq-artemis
Updated Branches:
refs/heads/master 17c2c8fc5 -> 3bd0b7532
ARTEMIS-1546 Changing version check from 1.4.0 to latest 1.5.5
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/bccf18fa
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/bccf18fa
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/bccf18fa
Branch: refs/heads/master
Commit: bccf18fa6f85930a5b402a71408b4e302dc8ac97
Parents: 17c2c8f
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Dec 20 12:27:59 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Dec 20 15:42:39 2017 -0500
----------------------------------------------------------------------
.../core/protocol/core/impl/PacketImpl.java | 1 +
.../jms/client/ActiveMQConnectionFactory.java | 2 +-
.../maven/ArtemisDependencyScanPlugin.java | 23 +++++++++++++---
tests/compatibility-tests/pom.xml | 29 +++++++++++++++++++-
.../artemis/tests/compatibility/GroovyRun.java | 1 +
.../main/resources/servers/artemisServer.groovy | 4 +--
.../artemis/tests/compatibility/MeshTest.java | 12 ++++----
.../tests/compatibility/SendAckTest.java | 10 ++++---
.../tests/compatibility/SerializationTest.java | 8 +++---
9 files changed, 69 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bccf18fa/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
index 925d089..684ca5c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
@@ -29,6 +29,7 @@ public class PacketImpl implements Packet {
// Constants -------------------------------------------------------------------------
+ // 2.0.0
public static final int ADDRESSING_CHANGE_VERSION = 129;
public static final SimpleString OLD_QUEUE_PREFIX = new SimpleString("jms.queue.");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bccf18fa/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
index bb729f6..31f39f2 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
@@ -64,7 +64,7 @@ import org.apache.activemq.artemis.utils.uri.BeanSupport;
*/
public class ActiveMQConnectionFactory extends JNDIStorable implements ConnectionFactoryOptions, Externalizable, ConnectionFactory, XAConnectionFactory, AutoCloseable {
- private static final long serialVersionUID = -7554006056207377105L;
+ private static final long serialVersionUID = 6730844785641767519L;
private ServerLocator serverLocator;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bccf18fa/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyScanPlugin.java
----------------------------------------------------------------------
diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyScanPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyScanPlugin.java
index 4f1d1d8..2c653fa 100644
--- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyScanPlugin.java
+++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyScanPlugin.java
@@ -63,6 +63,11 @@ public class ArtemisDependencyScanPlugin extends ArtemisAbstractPlugin {
@Parameter
private File targetFolder;
+ private MavenProject project;
+
+ @Parameter
+ private boolean optional = false;
+
@Override
protected boolean isIgnore() {
return false;
@@ -81,7 +86,7 @@ public class ArtemisDependencyScanPlugin extends ArtemisAbstractPlugin {
}
}
getLog().info("Local " + localRepository);
- MavenProject project = (MavenProject) getPluginContext().get("project");
+ project = (MavenProject) getPluginContext().get("project");
Map properties = getPluginContext();
@@ -105,8 +110,7 @@ public class ArtemisDependencyScanPlugin extends ArtemisAbstractPlugin {
}
String classPathGenerated = buffer.toString();
- project.getProperties().setProperty(variableName, classPathGenerated);
- getLog().info("dependency-scan setting: " + variableName + "=" + classPathGenerated);
+ setVariable(classPathGenerated);
}
if (targetFolder != null) {
@@ -117,7 +121,11 @@ public class ArtemisDependencyScanPlugin extends ArtemisAbstractPlugin {
}
} catch (Throwable e) {
getLog().error(e);
- throw new MojoFailureException(e.getMessage());
+ if (optional) {
+ setVariable("");
+ } else {
+ throw new MojoFailureException(e.getMessage());
+ }
} finally {
for (RemoteRepository repository : listRepo) {
remoteRepos.remove(repository);
@@ -127,4 +135,11 @@ public class ArtemisDependencyScanPlugin extends ArtemisAbstractPlugin {
}
+ private void setVariable(String classPathGenerated) {
+ if (variableName != null) {
+ project.getProperties().setProperty(variableName, classPathGenerated);
+ getLog().info("dependency-scan setting: " + variableName + "=" + classPathGenerated);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bccf18fa/tests/compatibility-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml
index 443b0ed..def806e 100644
--- a/tests/compatibility-tests/pom.xml
+++ b/tests/compatibility-tests/pom.xml
@@ -366,19 +366,41 @@
</configuration>
</execution>
<execution>
+ <id>155-check</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>dependency-scan</goal>
+ </goals>
+ <configuration>
+ <libListWithDeps>
+ <arg>org.apache.activemq:artemis-jms-server:1.5.5</arg>
+ <arg>org.apache.activemq:artemis-jms-client:1.5.5</arg>
+ <arg>org.apache.activemq:artemis-hornetq-protocol:1.5.5</arg>
+ <arg>org.apache.activemq:artemis-amqp-protocol:1.5.5</arg>
+ <arg>org.apache.activemq:artemis-hornetq-protocol:1.5.5</arg>
+ <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
+ </libListWithDeps>
+ <libList>
+ <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
+ </libList>
+ <variableName>ARTEMIS-155</variableName>
+ </configuration>
+ </execution>
+ <execution>
<id>hornetq-235</id>
<phase>compile</phase>
<goals>
<goal>dependency-scan</goal>
</goals>
<configuration>
+ <optional>true</optional>
<extraRepositories>
<!-- some of the dependencies are not on maven central,
and the artemis maven plugin has the capability of using this extra repo -->
<arg>https://repository.jboss.org/nexus/content/groups/public</arg>
</extraRepositories>
<libListWithDeps>
- <arg>org.hornetq:hornetq-jms-server:2.4.7.Final</arg>
+ <arg>org.hornetq:hornetq-jms-server:2.3.5.Final</arg>
<arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
</libListWithDeps>
<libList>
@@ -394,6 +416,7 @@
<goal>dependency-scan</goal>
</goals>
<configuration>
+ <optional>true</optional>
<extraRepositories>
<!-- some of the dependencies are not on maven central,
and the artemis maven plugin has the capability of using this extra repo -->
@@ -426,6 +449,10 @@
<value>${ARTEMIS-240}</value>
</property>
<property>
+ <name>ARTEMIS-155</name>
+ <value>${ARTEMIS-155}</value>
+ </property>
+ <property>
<name>ARTEMIS-140</name>
<value>${ARTEMIS-140}</value>
</property>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bccf18fa/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java
----------------------------------------------------------------------
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 08e6c34..80c4756 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
@@ -24,6 +24,7 @@ import groovy.lang.GroovyShell;
public class GroovyRun {
public static final String SNAPSHOT = "ARTEMIS-SNAPSHOT";
+ public static final String ONE_FIVE = "ARTEMIS-155";
public static final String ONE_FOUR = "ARTEMIS-140";
public static final String TWO_FOUR = "ARTEMIS-240";
public static final String HORNETQ_235 = "HORNETQ-235";
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bccf18fa/tests/compatibility-tests/src/main/resources/servers/artemisServer.groovy
----------------------------------------------------------------------
diff --git a/tests/compatibility-tests/src/main/resources/servers/artemisServer.groovy b/tests/compatibility-tests/src/main/resources/servers/artemisServer.groovy
index 1357986..eb6383d 100644
--- a/tests/compatibility-tests/src/main/resources/servers/artemisServer.groovy
+++ b/tests/compatibility-tests/src/main/resources/servers/artemisServer.groovy
@@ -38,7 +38,7 @@ configuration.addAcceptorConfiguration("artemis", "tcp://0.0.0.0:61616");
configuration.setSecurityEnabled(false);
configuration.setPersistenceEnabled(false);
try {
- if (!type.equals("ARTEMIS-140")) {
+ if (!type.startsWith("ARTEMIS-1")) {
configuration.addAddressesSetting("#", new AddressSettings().setAutoCreateAddresses(true));
}
} catch (Throwable e) {
@@ -54,7 +54,7 @@ server.setJmsConfiguration(jmsConfiguration);
server.start();
// uncomment this next statements to validate https://issues.apache.org/jira/browse/ARTEMIS-1561
-if (producer.toString().equals("ARTEMIS-140") && type.equals("ARTEMIS-SNAPSHOT") ||
+if (producer.toString().startsWith("ARTEMIS-1") && type.equals("ARTEMIS-SNAPSHOT") ||
producer.toString().startsWith("HORNETQ")) {
server.getJMSServerManager().createQueue(true, "queue", null, true);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bccf18fa/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java
----------------------------------------------------------------------
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 ed7851c..0c78255 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
@@ -23,6 +23,7 @@ import org.junit.runners.Parameterized;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_235;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_247;
+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;
@@ -55,13 +56,14 @@ public class MeshTest extends VersionedBaseTest {
// during development sometimes is useful to comment out the combinations
// and add the ones you are interested.. example:
*/
- // combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, ONE_FOUR});
- // combinations.add(new Object[]{ONE_FOUR, ONE_FOUR, ONE_FOUR});
+ // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
+ // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
- combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new Object[]{ONE_FOUR, TWO_FOUR, SNAPSHOT, HORNETQ_235}, new Object[]{ONE_FOUR, TWO_FOUR, SNAPSHOT, HORNETQ_235}));
- combinations.addAll(combinatory(new Object[]{ONE_FOUR}, new Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}));
- combinations.addAll(combinatory(new Object[]{HORNETQ_235}, new Object[]{ONE_FOUR, SNAPSHOT, HORNETQ_235}, new Object[]{ONE_FOUR, SNAPSHOT, HORNETQ_235}));
+ combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new Object[]{ONE_FIVE, TWO_FOUR, SNAPSHOT, HORNETQ_235}, new Object[]{ONE_FIVE, TWO_FOUR, SNAPSHOT, HORNETQ_235}));
+ combinations.addAll(combinatory(new Object[]{ONE_FIVE}, new Object[]{ONE_FIVE, SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT}));
+ combinations.addAll(combinatory(new Object[]{HORNETQ_235}, new Object[]{ONE_FIVE, SNAPSHOT, HORNETQ_235}, new Object[]{ONE_FIVE, SNAPSHOT, HORNETQ_235}));
combinations.addAll(combinatory(new Object[]{HORNETQ_247}, new Object[]{SNAPSHOT, HORNETQ_247}, new Object[]{SNAPSHOT, HORNETQ_247}));
+ combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, ONE_FOUR});
return combinations;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bccf18fa/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
----------------------------------------------------------------------
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
index 2f21704..aeec6dc 100644
--- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
@@ -21,9 +21,10 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
+import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_247;
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.ONE_FIVE;
/**
* To run this test on the IDE and debug it, run the compatibility-tests through a command line once:
@@ -53,14 +54,15 @@ public class SendAckTest extends VersionedBaseTest {
// during development sometimes is useful to comment out the combinations
// and add the ones you are interested.. example:
*/
- // combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, ONE_FOUR});
- // combinations.add(new Object[]{ONE_FOUR, ONE_FOUR, ONE_FOUR});
+ // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
+ // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
- combinations.addAll(combinatory(new Object[]{SNAPSHOT, ONE_FOUR}, new Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}));
+ combinations.addAll(combinatory(new Object[]{SNAPSHOT, ONE_FIVE}, new Object[]{ONE_FIVE, SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT}));
// not every combination on two four would make sense.. as there's a compatibility issue between 2.4 and 1.4 when crossing consumers and producers
combinations.add(new Object[]{TWO_FOUR, SNAPSHOT, SNAPSHOT});
combinations.add(new Object[]{SNAPSHOT, TWO_FOUR, TWO_FOUR});
+ combinations.add(new Object[]{HORNETQ_247, SNAPSHOT, SNAPSHOT});
return combinations;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bccf18fa/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
----------------------------------------------------------------------
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
index c99e696..b5a871d 100644
--- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
+import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
/**
@@ -53,10 +53,10 @@ public class SerializationTest extends VersionedBaseTest {
// during development sometimes is useful to comment out the combinations
// and add the ones you are interested.. example:
*/
- // combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, ONE_FOUR});
- // combinations.add(new Object[]{ONE_FOUR, ONE_FOUR, ONE_FOUR});
+ // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
+ // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
- combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}));
+ combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT}));
return combinations;
}
[2/2] activemq-artemis git commit: This closes #1735
Posted by cl...@apache.org.
This closes #1735
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3bd0b753
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3bd0b753
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3bd0b753
Branch: refs/heads/master
Commit: 3bd0b7532e7db748e68800a05a30ba69df59814d
Parents: 17c2c8f bccf18f
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Dec 20 15:59:06 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Dec 20 15:59:06 2017 -0500
----------------------------------------------------------------------
.../core/protocol/core/impl/PacketImpl.java | 1 +
.../jms/client/ActiveMQConnectionFactory.java | 2 +-
.../maven/ArtemisDependencyScanPlugin.java | 23 +++++++++++++---
tests/compatibility-tests/pom.xml | 29 +++++++++++++++++++-
.../artemis/tests/compatibility/GroovyRun.java | 1 +
.../main/resources/servers/artemisServer.groovy | 4 +--
.../artemis/tests/compatibility/MeshTest.java | 12 ++++----
.../tests/compatibility/SendAckTest.java | 10 ++++---
.../tests/compatibility/SerializationTest.java | 8 +++---
9 files changed, 69 insertions(+), 21 deletions(-)
----------------------------------------------------------------------