Bumped dependency versions

build.gradle

@@ -1,9 +1,19 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
+    }
+}
+
 subprojects {
     apply plugin: 'java'
     apply plugin: 'maven'
     apply plugin: 'signing'
     apply plugin: 'jacoco'
     apply plugin: 'gitflow-version'
+    apply plugin: 'com.github.ben-manes.versions'
 
     sourceCompatibility = 1.7
     group = 'ch.dissem.jabit'

core/build.gradle

@@ -24,10 +24,10 @@ artifacts {
 }
 
 dependencies {
-    compile 'org.slf4j:slf4j-api:1.7.12'
+    compile 'org.slf4j:slf4j-api:1.7.25'
     compile 'ch.dissem.msgpack:msgpack:1.0.0'
     testCompile 'junit:junit:4.12'
     testCompile 'org.hamcrest:hamcrest-library:1.3'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.mockito:mockito-core:2.7.21'
     testCompile project(':cryptography-bc')
 }

core/src/test/java/ch/dissem/bitmessage/utils/ConversationServiceTest.java

@@ -32,7 +32,7 @@ import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
 import static ch.dissem.bitmessage.utils.TestUtils.RANDOM;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

core/src/test/java/ch/dissem/bitmessage/utils/MessageMatchers.java

@@ -19,38 +19,27 @@ package ch.dissem.bitmessage.utils;
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.ObjectType;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatcher;
+import org.mockito.ArgumentMatchers;
 
 /**
  * @author Christian Basler
  */
 public class MessageMatchers {
     public static Plaintext plaintext(final Plaintext.Type type) {
-        return Matchers.argThat(new BaseMatcher<Plaintext>() {
+        return ArgumentMatchers.argThat(new ArgumentMatcher<Plaintext>() {
             @Override
-            public boolean matches(Object item) {
-                return item instanceof Plaintext && ((Plaintext) item).getType() == type;
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendText("type should be ").appendValue(type);
+            public boolean matches(Plaintext item) {
+                return item != null && item.getType() == type;
             }
         });
     }
 
     public static ObjectMessage object(final ObjectType type) {
-        return Matchers.argThat(new BaseMatcher<ObjectMessage>() {
+        return ArgumentMatchers.argThat(new ArgumentMatcher<ObjectMessage>() {
             @Override
-            public boolean matches(Object item) {
-                return item instanceof ObjectMessage && ((ObjectMessage) item).getPayload().getType() == type;
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendText("payload type should be ").appendValue(type);
+            public boolean matches(ObjectMessage item) {
+                return item != null && item.getPayload().getType() == type;
             }
         });
     }

cryptography-bc/build.gradle

@@ -14,5 +14,5 @@ dependencies {
     compile project(':core')
     compile 'org.bouncycastle:bcprov-jdk15on:1.56'
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.mockito:mockito-core:2.7.21'
 }

cryptography-sc/build.gradle

@@ -12,7 +12,7 @@ uploadArchives {
 
 dependencies {
     compile project(':core')
-    compile 'com.madgag.spongycastle:prov:1.52.0.0'
+    compile 'com.madgag.spongycastle:prov:1.54.0.0'
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.mockito:mockito-core:2.7.21'
 }

demo/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "us.kirchmeier.capsule" version "1.0-rc1"
+    id "us.kirchmeier.capsule" version "1.0.2"
 }
 
 uploadArchives {
@@ -28,10 +28,10 @@ dependencies {
     compile project(':repositories')
     compile project(':cryptography-bc')
     compile project(':wif')
-    compile 'org.slf4j:slf4j-simple:1.7.12'
-    compile 'args4j:args4j:2.32'
-    compile 'com.h2database:h2:1.4.192'
-    compile 'org.apache.commons:commons-lang3:3.4'
+    compile 'org.slf4j:slf4j-simple:1.7.25'
+    compile 'args4j:args4j:2.33'
+    compile 'com.h2database:h2:1.4.194'
+    compile 'org.apache.commons:commons-lang3:3.5'
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.mockito:mockito-core:2.7.21'
 }

demo/src/test/java/ch/dissem/bitmessage/SystemTest.java

@@ -28,7 +28,7 @@ import static ch.dissem.bitmessage.entity.payload.Pubkey.Feature.DOES_ACK;
 import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 
 /**
  * @author Christian Basler

extensions/build.gradle

@@ -29,8 +29,8 @@ uploadArchives {
 dependencies {
     compile project(':core')
     testCompile 'junit:junit:4.12'
-    testCompile 'org.slf4j:slf4j-simple:1.7.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.slf4j:slf4j-simple:1.7.25'
+    testCompile 'org.mockito:mockito-core:2.7.21'
     testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile project(':cryptography-bc')
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Apr 02 23:05:26 CEST 2017
+#Mon Apr 03 17:55:37 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip

networking/build.gradle

@@ -13,8 +13,8 @@ uploadArchives {
 dependencies {
     compile project(':core')
     testCompile 'junit:junit:4.12'
-    testCompile 'org.slf4j:slf4j-simple:1.7.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.slf4j:slf4j-simple:1.7.25'
+    testCompile 'org.mockito:mockito-core:2.7.21'
     testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile project(':cryptography-bc')
-}
+}

repositories/build.gradle

@@ -14,10 +14,10 @@ sourceCompatibility = 1.8
 
 dependencies {
     compile project(':core')
-    compile 'org.flywaydb:flyway-core:4.0.3'
+    compile 'org.flywaydb:flyway-core:4.1.2'
     testCompile 'junit:junit:4.12'
     testCompile 'com.h2database:h2:1.4.194'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.mockito:mockito-core:2.7.21'
     testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile project(':cryptography-bc')
 }

wif/build.gradle

@@ -14,6 +14,6 @@ dependencies {
     compile project(':core')
     compile 'org.ini4j:ini4j:0.5.4'
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.mockito:mockito-core:2.7.21'
     testCompile project(':cryptography-bc')
 }