From ca58d137018dc0d10d518f878223c1767022e871 Mon Sep 17 00:00:00 2001
From: Prithvi singh <prithvi.singh@1mg.com>
Date: Mon, 22 May 2023 11:23:15 +0530
Subject: [PATCH 1/2] Upgrade to Maven Resolver 1.9.7 and Maven Resolver
 Provider 3.9.1

See gh-1415
---
 initializr-parent/pom.xml                              |  4 ++--
 ...venResolverDependencyManagementVersionResolver.java | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/initializr-parent/pom.xml b/initializr-parent/pom.xml
index 25f1e8ce..0eefa6d0 100644
--- a/initializr-parent/pom.xml
+++ b/initializr-parent/pom.xml
@@ -17,8 +17,8 @@
 		<java.version>17</java.version>
 		<commons-compress.version>1.23.0</commons-compress.version>
 		<commons-text.version>1.10.0</commons-text.version>
-		<maven-resolver.version>1.7.3</maven-resolver.version>
-		<maven-resolver-provider.version>3.8.7</maven-resolver-provider.version>
+		<maven-resolver.version>1.9.7</maven-resolver.version>
+		<maven-resolver-provider.version>3.9.1</maven-resolver-provider.version>
 		<spring-boot.version>3.1.0</spring-boot.version>
 		<spring-cloud-contract.version>4.0.2</spring-cloud-contract.version>
 	</properties>
diff --git a/initializr-version-resolver/src/main/java/io/spring/initializr/versionresolver/MavenResolverDependencyManagementVersionResolver.java b/initializr-version-resolver/src/main/java/io/spring/initializr/versionresolver/MavenResolverDependencyManagementVersionResolver.java
index a59bc521..f5441336 100644
--- a/initializr-version-resolver/src/main/java/io/spring/initializr/versionresolver/MavenResolverDependencyManagementVersionResolver.java
+++ b/initializr-version-resolver/src/main/java/io/spring/initializr/versionresolver/MavenResolverDependencyManagementVersionResolver.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
 import org.eclipse.aether.DefaultRepositorySystemSession;
@@ -81,6 +82,15 @@ class MavenResolverDependencyManagementVersionResolver implements DependencyMana
 		LocalRepository localRepository = new LocalRepository(cacheLocation.toFile());
 		this.repositorySystem = serviceLocator.getService(RepositorySystem.class);
 		session.setLocalRepositoryManager(this.repositorySystem.newLocalRepositoryManager(session, localRepository));
+		final Properties systemProperties = new Properties();
+
+		Properties sysProp = System.getProperties();
+		synchronized (sysProp) {
+			systemProperties.putAll(sysProp);
+		}
+
+		session.setSystemProperties(systemProperties);
+		session.setConfigProperties(systemProperties);
 		session.setReadOnly();
 		this.repositorySystemSession = session;
 	}

From d79670c72ad8421a04c6fd0e33fa23fa3c688361 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 24 May 2023 13:45:50 +0200
Subject: [PATCH 2/2] Polish contribution

See gh-1415
---
 ...enResolverDependencyManagementVersionResolver.java | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/initializr-version-resolver/src/main/java/io/spring/initializr/versionresolver/MavenResolverDependencyManagementVersionResolver.java b/initializr-version-resolver/src/main/java/io/spring/initializr/versionresolver/MavenResolverDependencyManagementVersionResolver.java
index f5441336..562863c0 100644
--- a/initializr-version-resolver/src/main/java/io/spring/initializr/versionresolver/MavenResolverDependencyManagementVersionResolver.java
+++ b/initializr-version-resolver/src/main/java/io/spring/initializr/versionresolver/MavenResolverDependencyManagementVersionResolver.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
 import org.eclipse.aether.DefaultRepositorySystemSession;
@@ -82,15 +81,7 @@ class MavenResolverDependencyManagementVersionResolver implements DependencyMana
 		LocalRepository localRepository = new LocalRepository(cacheLocation.toFile());
 		this.repositorySystem = serviceLocator.getService(RepositorySystem.class);
 		session.setLocalRepositoryManager(this.repositorySystem.newLocalRepositoryManager(session, localRepository));
-		final Properties systemProperties = new Properties();
-
-		Properties sysProp = System.getProperties();
-		synchronized (sysProp) {
-			systemProperties.putAll(sysProp);
-		}
-
-		session.setSystemProperties(systemProperties);
-		session.setConfigProperties(systemProperties);
+		session.setUserProperties(System.getProperties());
 		session.setReadOnly();
 		this.repositorySystemSession = session;
 	}