BATM-410

- added dependencySubstitutions.txt file for external contributors - changed some versions in dependency declarations in order to decrease number of conflicts (and thus also number of dependency substitution directives)
aprock · Jan 22, 2018 · 58ec886 · 58ec886
1 parent 4525671
commit 58ec886
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -22,3 +22,7 @@ allprojects {
         }
     }
 }
+
+ext.with {
+    BatmDependencySubstitutionConfig = file('dependencySubstitutions.txt')
+}
diff --git a/dependencySubstitutions.txt b/dependencySubstitutions.txt
@@ -0,0 +1 @@
+substitute from: 'org.slf4j:slf4j-api:1.7.21', toVersion: '1.7.25'
diff --git a/server_extensions_api/build.gradle b/server_extensions_api/build.gradle
@@ -21,7 +21,7 @@ distributions {
 }
 
 dependencies {
-    compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.20')
-    compile(group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.20')
+    compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25')
+    compile(group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25')
     compile(group: 'com.sun.mail', name: 'javax.mail', version: '1.4.7')
 }
diff --git a/server_extensions_extra/build.gradle b/server_extensions_extra/build.gradle
@@ -23,11 +23,11 @@ dependencies {
 
     compile project(':server_extensions_api');
     compile(group: 'com.azazar', name: 'bitcoin-json-rpc-client', version: '1.0')
-    compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.20')
-    compile(group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.20')
+    compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25')
+    compile(group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25')
     compile(group: 'com.github.mmazi', name: 'rescu', version: '1.9.0')
     compile(group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0.1')
-    compile(group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.4.0')
+    compile(group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.8.0')
     compile(group: 'org.knowm.xchange', name: 'xchange-core', version: '4.2.1')
     compile(group: 'com.google.guava', name: 'guava', version: '18.0')
     compile(group: 'com.google.zxing', name: 'core', version: '2.3.0')

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,3 @@
-include ':server_extensions_api', ':server_extensions_extra', ':server_extensions_test'
+include ':server_extensions_api'
+include ':server_extensions_extra'
+include ':server_extensions_test'
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,3 +22,7 @@ allprojects { @@
             }
         }
     }
+    ext.with {
+        BatmDependencySubstitutionConfig = file('dependencySubstitutions.txt')
+    }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		substitute from: 'org.slf4j:slf4j-api:1.7.21', toVersion: '1.7.25'