sauween
diff --git a/‎actuator/build.gradle‎
Lines changed: 1 addition & 1 deletion b/‎actuator/build.gradle‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎common/build.gradle‎
Lines changed: 1 addition & 1 deletion b/‎common/build.gradle‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎consensus/build.gradle‎
Lines changed: 1 addition & 1 deletion b/‎consensus/build.gradle‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎crypto/build.gradle‎
Lines changed: 1 addition & 1 deletion b/‎crypto/build.gradle‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎framework/build.gradle‎
Lines changed: 6 additions & 1 deletion b/‎framework/build.gradle‎
Lines changed: 6 additions & 1 deletion
@@ -19,7 +19,7 @@ dependencies {
     testImplementation "org.testng:testng:$testNgVersion"
 
     compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"
-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.68'
+    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
     compile 'com.github.tronprotocol:zksnark-java-sdk:master-SNAPSHOT'
     compile group: 'commons-codec', name: 'commons-codec', version: '1.11'
     compile 'org.reflections:reflections:0.9.11'
 
@@ -36,7 +36,7 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.68'
+    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10.3'
     compile "com.cedarsoftware:java-util:1.8.0"
     compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.1'
 
@@ -15,7 +15,7 @@ dependencies {
     testImplementation "org.mockito:mockito-core:$mockitoVersion"
     testImplementation "org.testng:testng:$testNgVersion"
     compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"
-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.68'
+    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
     compile 'com.github.tronprotocol:zksnark-java-sdk:master-SNAPSHOT'
     compile group: 'commons-codec', name: 'commons-codec', version: '1.11'
 }
 
@@ -12,6 +12,6 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.68'
+    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
     compile project(":common")
 }
@@ -43,7 +43,7 @@ dependencies {
 
     testCompile group: 'org.testng', name: 'testng', version: '6.14.3'
 
-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.68'
+    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
 
     compile group: 'com.typesafe', name: 'config', version: '1.3.2'
 
@@ -200,6 +200,11 @@ def binaryRelease(taskName, jarName, mainClass) {
             }
         }
 
+        // exclude these files for bouncycastle
+        exclude "META-INF/*.SF"
+        exclude "META-INF/*.DSA"
+        exclude "META-INF/*.RSA"
+
         manifest {
             attributes "Main-Class": "${mainClass}"
         }
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ dependencies {`
`15`	`15`	`testImplementation "org.mockito:mockito-core:$mockitoVersion"`
`16`	`16`	`testImplementation "org.testng:testng:$testNgVersion"`
`17`	`17`	`compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"`
`18`		`- compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.68'`
	`18`	`+ compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'`
`19`	`19`	`compile 'com.github.tronprotocol:zksnark-java-sdk:master-SNAPSHOT'`
`20`	`20`	`compile group: 'commons-codec', name: 'commons-codec', version: '1.11'`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ repositories {`
`12`	`12`
`13`	`13`	`dependencies {`
`14`	`14`	`testCompile group: 'junit', name: 'junit', version: '4.12'`
`15`		`- compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.68'`
	`15`	`+ compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'`
`16`	`16`	`compile project(":common")`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ dependencies {`
`43`	`43`
`44`	`44`	`testCompile group: 'org.testng', name: 'testng', version: '6.14.3'`
`45`	`45`
`46`		`- compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.68'`
	`46`	`+ compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'`
`47`	`47`
`48`	`48`	`compile group: 'com.typesafe', name: 'config', version: '1.3.2'`
`49`	`49`
`@@ -200,6 +200,11 @@ def binaryRelease(taskName, jarName, mainClass) {`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
	`203`	`+ // exclude these files for bouncycastle`
	`204`	`+ exclude "META-INF/*.SF"`
	`205`	`+ exclude "META-INF/*.DSA"`
	`206`	`+ exclude "META-INF/*.RSA"`
	`207`	`+`
`203`	`208`	`manifest {`
`204`	`209`	`attributes "Main-Class": "${mainClass}"`
`205`	`210`	`}`