From 360d8ec7ad781b4670082f74e0e30daef6be57f9 Mon Sep 17 00:00:00 2001
From: Mike Hearn <mike@plan99.net>
Date: Fri, 22 Jan 2016 14:19:32 +0100
Subject: [PATCH] Add dependency on Apache Artemis (message queue library) and
 clean up a few no longer necessary overrides and version pins.

---
 build.gradle | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 81f21db0e1..5ab58b5c41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,7 @@ buildscript {
     ext.kotlin_version = '1.0.0-beta-4584'
     ext.quasar_version = '0.7.4'
     ext.asm_version = '0.5.3'
+    ext.artemis_version = '1.2.0'
 
     repositories {
         mavenCentral()
@@ -49,28 +50,30 @@ configurations.all() {
 
 dependencies {
     testCompile 'junit:junit:4.12'
+
+    compile "com.google.code.findbugs:jsr305:3.0.1"
+    compile "org.slf4j:slf4j-jdk14:1.7.13"
+
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    compile "com.google.guava:guava:19.0"
-    compile("com.esotericsoftware:kryo:3.0.3") {
-        force = true
-    }
-    compile "de.javakaffee:kryo-serializers:0.37"
-    compile "com.google.code.findbugs:jsr305:3.0.1"
 
-    // Logging
-    compile "org.slf4j:slf4j-jdk14:1.7.13"
+    compile("com.google.guava:guava:19.0") {
+        force = true     // Conflict between Quasar and Artemis
+    }
+
+    compile("com.esotericsoftware:kryo:3.0.3")
+    compile "de.javakaffee:kryo-serializers:0.37"
 
     // Quasar: for the bytecode rewriting for state machines.
-    compile("co.paralleluniverse:quasar-core:${quasar_version}:jdk8") {
-        // Quasar currently depends on an old version of Kryo, but it works fine with the newer version, so exclude it
-        // here so the newer version is picked up.
-        exclude group: "com.esotericsoftware.kryo", module: "kryo"
-    }
-    quasar("co.paralleluniverse:quasar-core:${quasar_version}:jdk8@jar") {
-        exclude group: "com.esotericsoftware.kryo", module: "kryo"
+    compile("co.paralleluniverse:quasar-core:${quasar_version}:jdk8")
+    quasar("co.paralleluniverse:quasar-core:${quasar_version}:jdk8@jar")
+
+    // Artemis: for reliable p2p message queues.
+    compile("org.apache.activemq:artemis-server:${artemis_version}") {
+        exclude group: "com.google.guava", module: "guava"   // Artemis is on Guava 18
     }
+    compile "org.apache.activemq:artemis-core-client:${artemis_version}"
 
     // For visualisation
     compile "org.graphstream:gs-core:1.3"