From da2dfbc85ce9f9f206b0246c2cee0c8099bae6f8 Mon Sep 17 00:00:00 2001
From: Olga MaciaszekSharma <omaciaszeksh@vmware.com>
Date: Mon, 20 Nov 2023 15:37:50 +0100
Subject: [PATCH] Fix native image setup. Remove exclusions.

---
 spring-cloud-config-server/pom.xml                          | 6 ------
 .../spring-cloud-config-server/native-image.properties      | 4 +++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml
index 2233083c..d068f4b4 100644
--- a/spring-cloud-config-server/pom.xml
+++ b/spring-cloud-config-server/pom.xml
@@ -87,12 +87,6 @@
 		<dependency>
 			<groupId>org.eclipse.jgit</groupId>
 			<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.sshd</groupId>
-					<artifactId>sshd-sftp</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.yaml</groupId>
diff --git a/spring-cloud-config-server/src/main/resources/META-INF/native-image/org.springframework.cloud/spring-cloud-config-server/native-image.properties b/spring-cloud-config-server/src/main/resources/META-INF/native-image/org.springframework.cloud/spring-cloud-config-server/native-image.properties
index 4cf05fae..a5e6325e 100644
--- a/spring-cloud-config-server/src/main/resources/META-INF/native-image/org.springframework.cloud/spring-cloud-config-server/native-image.properties
+++ b/spring-cloud-config-server/src/main/resources/META-INF/native-image/org.springframework.cloud/spring-cloud-config-server/native-image.properties
@@ -1,4 +1,5 @@
-Args = --initialize-at-build-time=ch.qos.logback.classic.Logger \
+Args = -H:-AddAllFileSystemProviders \
+--initialize-at-build-time=ch.qos.logback.classic.Logger \
 --initialize-at-build-time=ch.qos.logback.core.status.StatusBase \
 --initialize-at-build-time=ch.qos.logback.core.util.StatusPrinter \
 --initialize-at-build-time=org.slf4j.LoggerFactory \
@@ -8,4 +9,5 @@ Args = --initialize-at-build-time=ch.qos.logback.classic.Logger \
 --initialize-at-build-time=org.apache.commons.logging.impl.SLF4JLogFactory \
 --initialize-at-build-time=ch.qos.logback.core.CoreConstants \
 --initialize-at-build-time=org.bouncycastle \
+--initialize-at-build-time=org.apache.sshd \
 --initialize-at-run-time=org.bouncycastle.jcajce.provider.drbg.DRBG$Default,org.bouncycastle.jcajce.provider.drbg.DRBG$NonceAndIV