From 5bd562100607af58601b633356f6c57a33041274 Mon Sep 17 00:00:00 2001
From: Thomas Papke <web@thopap.de>
Date: Tue, 12 Apr 2022 21:06:10 +0200
Subject: [PATCH] * Use correct bouncy castle artifact in context of version
 1.71 (BC changed the jdk15on jars to jdk18on) * Bump certain versions to
 latest patch level * Replace spring milestone repo with classic maven central

---
 commons/audit/pom.xml          |  4 ++--
 commons/ihe/hpd/pom.xml        |  2 +-
 dependencies/pom.xml           | 19 ++++++++++++-------
 platform-camel/ihe/hpd/pom.xml |  5 +++++
 pom.xml                        | 21 ++++++++-------------
 5 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/commons/audit/pom.xml b/commons/audit/pom.xml
index 3825e83134..13d8cd0cd1 100644
--- a/commons/audit/pom.xml
+++ b/commons/audit/pom.xml
@@ -88,12 +88,12 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/commons/ihe/hpd/pom.xml b/commons/ihe/hpd/pom.xml
index 9be63dbe18..a84e12c8f8 100644
--- a/commons/ihe/hpd/pom.xml
+++ b/commons/ihe/hpd/pom.xml
@@ -34,7 +34,7 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index a2f7f995ff..90462f17e4 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -10,14 +10,14 @@
     <properties>
         <gpg-plugin-version>1.6</gpg-plugin-version>
         <bouncycastle-version>1.71</bouncycastle-version>
-        <brave-version>5.13.7</brave-version>
+        <brave-version>5.13.8</brave-version>
         <camel-version>3.14.2</camel-version>
-        <cxf-version>3.5.1</cxf-version>
+        <cxf-version>3.5.2</cxf-version>
         <commons-io-version>2.11.0</commons-io-version>
         <gazelle-hl7v3-jar-version>1.3.7</gazelle-hl7v3-jar-version>
         <groovy-version>3.0.10</groovy-version>
         <hapi-version>2.3</hapi-version>
-        <hapi-fhir-version>5.7.1</hapi-fhir-version>
+        <hapi-fhir-version>5.7.2</hapi-fhir-version>
         <herasaf-version>2.0.4</herasaf-version>
         <ipf-gazelle-version>2.0.0</ipf-gazelle-version>
         <ipf-oht-mdht-version>1.2.0.201212201425</ipf-oht-mdht-version>
@@ -423,7 +423,12 @@
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15on</artifactId>
+                <artifactId>bcprov-jdk18on</artifactId>
+                <version>${bouncycastle-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk18on</artifactId>
                 <version>${bouncycastle-version}</version>
             </dependency>
 
@@ -956,9 +961,9 @@
             </snapshots>
         </repository>
         <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
+            <id>central</id>
+            <name>Maven Central</name>
+            <url>https://repo1.maven.org/maven2</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
diff --git a/platform-camel/ihe/hpd/pom.xml b/platform-camel/ihe/hpd/pom.xml
index 73c9be8793..ecab084907 100644
--- a/platform-camel/ihe/hpd/pom.xml
+++ b/platform-camel/ihe/hpd/pom.xml
@@ -37,6 +37,11 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk18on</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!-- Dependencies for tests -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index 17575577fc..7f16e834ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,10 +58,9 @@
         <findbugs-version>3.0.2</findbugs-version>
         <guava-version>31.1-jre</guava-version>
         <jaspic-api-version>1.1.1</jaspic-api-version>
-        <mockserver-version>5.12.0</mockserver-version>
-        <bouncycastle-version>1.70</bouncycastle-version>
+        <mockserver-version>5.13.2</mockserver-version>
         <quickcheck-version>0.6</quickcheck-version>
-        <tomcat-version>9.0.60</tomcat-version>
+        <tomcat-version>9.0.62</tomcat-version>
         <xbean-spring-version>4.20</xbean-spring-version>
         <xmlunit-version>2.9.0</xmlunit-version>
     </properties>
@@ -252,22 +251,18 @@
                 <artifactId>mockserver-netty</artifactId>
                 <version>${mockserver-version}</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.mock-server</groupId>
                 <artifactId>mockserver-client-java</artifactId>
                 <version>${mockserver-version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15on</artifactId>
-                <version>${bouncycastle-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk15on</artifactId>
-                <version>${bouncycastle-version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>