From fbc35a2a6f9e2d770b7d769bb90666a69b51388a Mon Sep 17 00:00:00 2001
From: Mike Welsh <mike@ritual.co>
Date: Thu, 2 Jun 2022 10:36:45 -0600
Subject: [PATCH] [BUG] Use https URL for Spring milestone repository (#12512)

- Also set version for spring maven plugin as it does _not_ work with the milestone version
---
 .../JavaSpring/libraries/spring-boot/pom-sb3.mustache         | 4 +++-
 .../JavaSpring/libraries/spring-cloud/pom-sb3.mustache        | 2 +-
 samples/openapi3/client/petstore/spring-cloud-3/pom.xml       | 2 +-
 samples/openapi3/server/petstore/springboot-3/pom.xml         | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache
index 8d297379924..52d1067c6ef 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom-sb3.mustache
@@ -42,7 +42,7 @@
         <repository>
             <id>repository.spring.milestone</id>
             <name>Spring Milestone Repository</name>
-            <url>http://repo.spring.io/milestone</url>
+            <url>https://repo.spring.io/milestone</url>
         </repository>
     </repositories>
 
@@ -53,6 +53,8 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <!-- the maven plugin doesn't necessarily match the parent if using a milestone release. -->
+                <version>2.7.0</version>
                 {{#classifier}}
                 <configuration>
                   <classifier>{{{classifier}}}</classifier>
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache
index 1d35db88d8a..18a58ba9ad5 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache
@@ -39,7 +39,7 @@
         <repository>
             <id>repository.spring.milestone</id>
             <name>Spring Milestone Repository</name>
-            <url>http://repo.spring.io/milestone</url>
+            <url>https://repo.spring.io/milestone</url>
         </repository>
     </repositories>
 
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/pom.xml b/samples/openapi3/client/petstore/spring-cloud-3/pom.xml
index 921000f10fa..f5ad2f64698 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/pom.xml
+++ b/samples/openapi3/client/petstore/spring-cloud-3/pom.xml
@@ -23,7 +23,7 @@
         <repository>
             <id>repository.spring.milestone</id>
             <name>Spring Milestone Repository</name>
-            <url>http://repo.spring.io/milestone</url>
+            <url>https://repo.spring.io/milestone</url>
         </repository>
     </repositories>
 
diff --git a/samples/openapi3/server/petstore/springboot-3/pom.xml b/samples/openapi3/server/petstore/springboot-3/pom.xml
index 09dcd5a651e..d5e81b95274 100644
--- a/samples/openapi3/server/petstore/springboot-3/pom.xml
+++ b/samples/openapi3/server/petstore/springboot-3/pom.xml
@@ -24,7 +24,7 @@
         <repository>
             <id>repository.spring.milestone</id>
             <name>Spring Milestone Repository</name>
-            <url>http://repo.spring.io/milestone</url>
+            <url>https://repo.spring.io/milestone</url>
         </repository>
     </repositories>
 
@@ -34,6 +34,8 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <!-- the maven plugin doesn't necessarily match the parent if using a milestone release. -->
+                <version>2.7.0</version>
             </plugin>
         </plugins>
     </build>