From 01fc804bce3c1cf83447f5582ad784d285f72e42 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 4 Oct 2019 10:21:06 +0200
Subject: [PATCH] Update security-sensitive components.

---
 META-INF/spring/apache.xml       | 10 +++++-----
 META-INF/spring/bouncycastle.xml | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index 0a6d3c2..9c28eaa 100644
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -54,7 +54,7 @@
 	</bean>
 
 	<bean id="org.apache.mina.core"
-		p:sourceCoords="org.apache.mina:mina-core:2.0.20"
+		p:sourceCoords="org.apache.mina:mina-core:2.0.21"
 		parent="template.apacheMaven">
 		<property name="doNotModify" value="true" />
 	</bean>
@@ -66,7 +66,7 @@
 	</bean>
 
 	<flow:flow name="apache/org.apache.sshd" spec="spec.version">
-		<flow:arg name="version" value="2.2.0" />
+		<flow:arg name="version" value="2.3.0" />
 		<bean id="org.apache.sshd.core"
 			p:sourceCoords="org.apache.sshd:sshd-core:@{version}"
 			p:doNotModify="true" parent="template.apacheMaven" />
@@ -267,7 +267,7 @@
 
 	<flow:flow name="apache/org.apache.httpcomponents.httpclient"
 		spec="spec.version">
-		<flow:arg name="version" value="4.5.6" />
+		<flow:arg name="version" value="4.5.9" />
 		<bean parent="template.archiveWrapper">
 			<property name="version" value="@{version}" />
 			<property name="license">
@@ -275,11 +275,11 @@
 					static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 			</property>
 			<property name="uri"
-				value="http://archive.apache.org/dist/httpcomponents/httpclient/binary/httpcomponents-client-@{version}-osgi-bin.zip" />
+				value="http://archive.apache.org/dist/httpcomponents/httpclient/binary/httpcomponents-client-@{version}-bin.zip" />
 			<property name="includes">
 				<map>
 					<entry
-						key="httpcomponents-client-@{version}/org.apache.httpcomponents.httpclient_@{version}.jar"
+						key="httpcomponents-client-@{version}/lib/httpclient-osgi-@{version}.jar"
 						value="org.argeo.tp.apache" />
 				</map>
 			</property>
diff --git a/META-INF/spring/bouncycastle.xml b/META-INF/spring/bouncycastle.xml
index 8cfc632..e9d5721 100644
--- a/META-INF/spring/bouncycastle.xml
+++ b/META-INF/spring/bouncycastle.xml
@@ -11,9 +11,9 @@
 
 	<!-- REGISTER -->
 	<flow:flow name="misc/org.bouncycastle" spec="spec.version">
-		<flow:arg name="version" value="1.61" />
+		<flow:arg name="version" value="1.63" />
 		<bean id="bcprov"
-			p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-161.jar"
+			p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-163.jar"
 			parent="template.bouncycastle">
 			<property name="sourcesProvider">
 				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -24,7 +24,7 @@
 			</property>
 		</bean>
 		<bean id="bcpkix"
-			p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-161.jar"
+			p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-163.jar"
 			parent="template.bouncycastle">
 			<property name="sourcesProvider">
 				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -35,7 +35,7 @@
 			</property>
 		</bean>
 		<bean id="bcmail"
-			p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-161.jar"
+			p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-163.jar"
 			parent="template.bouncycastle">
 			<property name="sourcesProvider">
 				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -46,7 +46,7 @@
 			</property>
 		</bean>
 		<bean id="bcpg"
-			p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-161.jar"
+			p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-163.jar"
 			parent="template.bouncycastle">
 			<property name="sourcesProvider">
 				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-- 
2.30.2