Explicitly set versions here too.

Changes to handle MBassador upgrade.

Change-Id: I9e1fe2b0a858c378c4d4340db50ec5ade45cbb10
Reviewed-on: http://gerrit.dmdirc.com/4004
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

.idea/parser.iml

@@ -18,11 +18,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:16.0.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
   </component>
 </module>
 

.idea/plugins.iml

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="plugins" external.linked.project.path="$MODULE_DIR$/modules/plugins" external.root.project.path="$MODULE_DIR$/modules/plugins" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+<module external.linked.project.id=":modules:plugins" external.linked.project.path="$MODULE_DIR$/modules/plugins" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.modules" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/modules/plugins/build/classes/main" />
     <output-test url="file://$MODULE_DIR$/modules/plugins/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/modules/plugins">
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/plugins/test-res" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/modules/plugins/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/modules/plugins/build" />
     </content>
@@ -13,11 +21,11 @@
     <orderEntry type="module" module-name="dmdirc" />
     <orderEntry type="module" module-name="parser" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:16.0.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
   </component>
 </module>
 

.idea/util.iml

@@ -18,11 +18,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:16.0.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
   </component>
 </module>
 

build.gradle

@@ -7,14 +7,14 @@ configurations {
 }
 
 dependencies {
-    compile group: 'com.google.code.findbugs', name: 'jsr305', version: '2.+'
+    compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0'
     compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.1'
     bundle group: 'com.squareup.dagger', name: 'dagger', version: '1.2.1'
-    bundle group: 'com.esotericsoftware.yamlbeans', name: 'yamlbeans', version: '1.+'
+    bundle group: 'com.esotericsoftware.yamlbeans', name: 'yamlbeans', version: '1.08'
     bundle group: 'com.brsanthu', name: 'migbase64', version: '2.2'
-    bundle group: 'net.kencochrane.raven', name: 'raven', version: '4.+'
-    bundle group: 'com.google.guava', name:'guava', version: '17.+'
-    bundle group: 'net.engio', name: 'mbassador', version: '1.1.10'
+    bundle group: 'net.kencochrane.raven', name: 'raven', version: '5.0.1'
+    bundle group: 'com.google.guava', name:'guava', version: '18.0'
+    bundle group: 'net.engio', name: 'mbassador', version: '1.2.0'
     bundle project(':modules:util')
     bundle project(':modules:parser')
 }
@@ -54,8 +54,8 @@ allprojects {
     }
 
     dependencies {
-        testCompile group: 'junit', name: 'junit', version: '4.+'
-        testCompile group: 'org.mockito', name: 'mockito-all', version: '1.+'
+        testCompile group: 'junit', name: 'junit', version: '4.11'
+        testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.5'
         testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.0'
     }
 

dmdirc.iml

@@ -24,18 +24,19 @@
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.brsanthu:migbase64:2.2" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.kencochrane.raven:raven:4.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:17.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.1.10" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:2.0.3" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.7" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.4.2" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: net.kencochrane.raven:raven:5.0.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: javax.el:el-api:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
   </component>
 </module>
 

ivy.xml

@@ -24,23 +24,23 @@
         <dependency org="org.slf4j" name="slf4j-api" rev="1.+" conf="main->default" />
         <dependency org="ch.qos.logback" name="logback-classic" rev="1.+" conf="test->default" />
 
-        <dependency org="com.google.code.findbugs" name="jsr305" rev="2.+" conf="main->default" />
+        <dependency org="com.google.code.findbugs" name="jsr305" rev="3.0.0" conf="main->default" />
 
         <dependency org="com.squareup.dagger" name="dagger" rev="1.2.1" conf="bundled,main->default" />
         <dependency org="com.squareup.dagger" name="dagger-compiler" rev="1.2.1" conf="main->default" />
 
-        <dependency org="com.esotericsoftware.yamlbeans" name="yamlbeans" rev="1.+" conf="bundled,main->default" />
+        <dependency org="com.esotericsoftware.yamlbeans" name="yamlbeans" rev="1.08" conf="bundled,main->default" />
 
         <dependency org="com.brsanthu" name="migbase64" rev="2.2" conf="bundled,main->default" />
 
-        <dependency org="net.kencochrane.raven" name="raven" rev="4.+" conf="bundled,main->default" />
+        <dependency org="net.kencochrane.raven" name="raven" rev="5.0.1" conf="bundled,main->default" />
 
-        <dependency org="com.google.guava" name="guava" rev="17.+" conf="bundled,main->default" />
-        <dependency org="net.engio" name="mbassador" rev="1.1.10" conf="bundled,main->default" />
+        <dependency org="com.google.guava" name="guava" rev="18.0" conf="bundled,main->default" />
+        <dependency org="net.engio" name="mbassador" rev="1.2.0" conf="bundled,main->default" />
         <dependency org="com.dmdirc" name="util" rev="latest.integration" conf="bundled,main->default" />
 
-        <dependency org="junit" name="junit" rev="4.+" conf="test->default" />
-        <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test->default" />
+        <dependency org="junit" name="junit" rev="4.11" conf="test->default" />
+        <dependency org="org.mockito" name="mockito-all" rev="1.9.5" conf="test->default" />
         <dependency org="com.atlassian.clover" name="clover" rev="4.+" conf="test->default" />
 
         <dependency org="com.puppycrawl.tools" name="checkstyle" rev="5.+" conf="analyse->default" />

modules/modules.iml

@@ -18,11 +18,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:16.0.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
   </component>
 </module>
 

src/com/dmdirc/ClientModule.java

@@ -62,7 +62,6 @@ import javax.inject.Singleton;
 import dagger.Module;
 import dagger.ObjectGraph;
 import dagger.Provides;
-import net.engio.mbassy.bus.config.BusConfiguration;
 
 /**
  * Provides dependencies for the client.
@@ -109,7 +108,7 @@ public class ClientModule {
     @Provides
     @Singleton
     public DMDircMBassador getMBassador() {
-        return new DMDircMBassador(BusConfiguration.Default());
+        return new DMDircMBassador();
     }
 
     @Provides

src/com/dmdirc/DMDircMBassador.java

@@ -26,6 +26,7 @@ import com.dmdirc.events.DMDircEvent;
 
 import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.bus.config.BusConfiguration;
+import net.engio.mbassy.bus.config.Feature;
 
 /**
  * Generified MBassador.
@@ -33,7 +34,10 @@ import net.engio.mbassy.bus.config.BusConfiguration;
 public class DMDircMBassador extends MBassador<DMDircEvent> {
 
     public DMDircMBassador() {
-        super(BusConfiguration.Default());
+        super(new BusConfiguration()
+                .addFeature(Feature.SyncPubSub.Default())
+                .addFeature(Feature.AsynchronousHandlerInvocation.Default())
+                .addFeature(Feature.AsynchronousMessageDispatch.Default()));
     }
 
     public DMDircMBassador(final BusConfiguration configuration) {

src/com/dmdirc/util/ChildEventBusManager.java

@@ -25,7 +25,6 @@ package com.dmdirc.util;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.DMDircEvent;
 
-import net.engio.mbassy.bus.config.BusConfiguration;
 import net.engio.mbassy.listener.Handler;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -44,7 +43,7 @@ public class ChildEventBusManager {
 
     public ChildEventBusManager(final DMDircMBassador parent) {
         this.parent = checkNotNull(parent);
-        this.child = new DMDircMBassador(BusConfiguration.Default());
+        this.child = new DMDircMBassador();
         this.propagator = new EventPropagator();
     }