From 40d2f3e088726d9ef97e6845177ff6d90f5fc592 Mon Sep 17 00:00:00 2001
From: Anton Kitov <kitov@soramitsu.co.jp>
Date: Thu, 22 Jul 2021 17:27:20 +0300
Subject: [PATCH] 55 - Upgrade to bouncycastle lib

---
 client/build.gradle                                       | 8 +++++---
 .../src/main/java/jp/co/soramitsu/iroha/java/Utils.java   | 2 +-
 .../java/jp/co/soramitsu/iroha/java/detail/Hashable.java  | 2 +-
 testcontainers/build.gradle                               | 4 +++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/client/build.gradle b/client/build.gradle
index 286a26059..3f8f6ed98 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 final def spockVersion = '1.2-groovy-2.4'
-final def edSha3Version = '2.0.1'
+final def edSha3Version = '2.1.0'
 final def edDsaVersion = '0.3.0'
 final def spockGenesisVersion = '0.6.0'
 final def lombokVersion = '1.18.4'
@@ -23,7 +23,7 @@ final def objgenesisVersion = '3.0.1'
 
 dependencies {
     compile "io.reactivex.rxjava2:rxjava:${rxjavaVersion}"
-    compile "com.github.warchant:ed25519-sha3-java:${edSha3Version}"
+    compile "com.github.soramitsu:ed25519-sha3-java:${edSha3Version}"
     compile "net.i2p.crypto:eddsa:${edDsaVersion}"
 
     compileOnly("org.projectlombok:lombok:$lombokVersion")
@@ -46,7 +46,9 @@ dependencies {
 }
 
 apply from: 'proto.gradle'
-
+tasks.withType(JavaCompile) {
+    options.incremental = false
+}
 sonarqube {
     properties {
         property "sonar.projectKey", "${project.group}:${rootProject.name}.${project.name}"
diff --git a/client/src/main/java/jp/co/soramitsu/iroha/java/Utils.java b/client/src/main/java/jp/co/soramitsu/iroha/java/Utils.java
index 7d18fe0fb..a739c9a60 100644
--- a/client/src/main/java/jp/co/soramitsu/iroha/java/Utils.java
+++ b/client/src/main/java/jp/co/soramitsu/iroha/java/Utils.java
@@ -16,7 +16,7 @@
 import java.util.stream.StreamSupport;
 import javax.xml.bind.DatatypeConverter;
 import lombok.val;
-import org.spongycastle.jcajce.provider.digest.SHA3;
+import org.bouncycastle.jcajce.provider.digest.SHA3;
 
 public class Utils {
 
diff --git a/client/src/main/java/jp/co/soramitsu/iroha/java/detail/Hashable.java b/client/src/main/java/jp/co/soramitsu/iroha/java/detail/Hashable.java
index aa35b25fc..468d7cd0b 100644
--- a/client/src/main/java/jp/co/soramitsu/iroha/java/detail/Hashable.java
+++ b/client/src/main/java/jp/co/soramitsu/iroha/java/detail/Hashable.java
@@ -1,7 +1,7 @@
 package jp.co.soramitsu.iroha.java.detail;
 
 import com.google.protobuf.GeneratedMessageV3.Builder;
-import org.spongycastle.jcajce.provider.digest.SHA3;
+import org.bouncycastle.jcajce.provider.digest.SHA3;
 
 public abstract class Hashable<T extends Builder<T>> {
 
diff --git a/testcontainers/build.gradle b/testcontainers/build.gradle
index 2e1549d8e..6cc7ad926 100644
--- a/testcontainers/build.gradle
+++ b/testcontainers/build.gradle
@@ -49,7 +49,9 @@ dependencies {
 
     testCompile group: 'junit', name: 'junit', version: "${junitVersion}"
 }
-
+tasks.withType(JavaCompile) {
+    options.incremental = false
+}
 sonarqube {
     properties {
         property "sonar.projectKey", "${project.group}:${rootProject.name}.${project.name}"