From 3fd0350a90a743c738d6f4cf0ff84628c1652b25 Mon Sep 17 00:00:00 2001
From: Richard Richter <richard.richter@evolveum.com>
Date: Tue, 2 Jun 2020 23:25:57 +0200
Subject: [PATCH] Upgrade to Spring Boot 2.3.0 and fixes of bouncycastle
 dep-convergence

---
 gui/admin-gui/pom.xml           |  2 --
 pom.xml                         | 13 ++++++++++++-
 testing/schrodingertest/pom.xml | 20 +++++---------------
 tools/schrodinger/pom.xml       | 12 ------------
 4 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
index dbd5995b3dc..d17bdf22952 100644
--- a/gui/admin-gui/pom.xml
+++ b/gui/admin-gui/pom.xml
@@ -615,11 +615,9 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.64</version>
         </dependency>
 
         <!-- TEST -->
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/pom.xml b/pom.xml
index c4e90d75152..940498f073c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>2.2.7.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
 
     <groupId>com.evolveum.midpoint</groupId>
@@ -205,6 +205,7 @@
         <xerces.version>2.12.0</xerces.version>
         <commons.csv.version>1.8</commons.csv.version>
         <j2html.version>1.4.0</j2html.version>
+        <bouncycastle.version>1.64</bouncycastle.version>
 
         <!--
         Coming in different versions from org.glassfish.jaxb:xsom and from
@@ -1371,6 +1372,16 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk15on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+           <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+               <version>${bouncycastle.version}</version>
+            </dependency>
 
             <!-- webjars -->
             <dependency>
diff --git a/testing/schrodingertest/pom.xml b/testing/schrodingertest/pom.xml
index 4f94c30b177..089a3a8d066 100644
--- a/testing/schrodingertest/pom.xml
+++ b/testing/schrodingertest/pom.xml
@@ -97,10 +97,6 @@
                     <groupId>org.apache.commons</groupId>
                     <artifactId>commons-exec</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk15on</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.hibernate</groupId>
                     <artifactId>hibernate-core</artifactId>
@@ -130,22 +126,16 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>repo-sql-impl</artifactId>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>repo-sql-impl</artifactId>
-            <version>${project.version}</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
-            <!--<exclusions>-->
-            <!--    <exclusion>-->
-            <!--        <groupId>org.hibernate</groupId>-->
-            <!--        <artifactId>hibernate-core</artifactId>-->
-            <!--    </exclusion>-->
-            <!--</exclusions>-->
         </dependency>
     </dependencies>
 
diff --git a/tools/schrodinger/pom.xml b/tools/schrodinger/pom.xml
index 00bec63fa0e..c496df9539b 100644
--- a/tools/schrodinger/pom.xml
+++ b/tools/schrodinger/pom.xml
@@ -70,17 +70,5 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>