From fe69a3cb56666fb5cccf7eaddd45e720eb49bfdf Mon Sep 17 00:00:00 2001
From: 13400152 <a13400152@MAC13400152.local>
Date: Tue, 16 Feb 2021 23:59:11 +0530
Subject: [PATCH 1/3] JAVA-2395 Fixed compilation issue

---
 .../core-java-jpms/decoupling-pattern2/consumermodule/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml b/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml
index e6b351b1b9..816f5cf9e8 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml
+++ b/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>com.baeldung.servicemodule</groupId>
-            <artifactId>servicemodule</artifactId>
+            <artifactId>servicemodule2</artifactId>
             <version>${servicemodule.version}</version>
         </dependency>
         <dependency>
@@ -41,4 +41,4 @@
         <providermodule.version>1.0</providermodule.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>

From c3e386eb022b76ef5a69d52866f9a18caa513202 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawal.kapil@africa.airtel.com>
Date: Sun, 16 May 2021 16:40:29 +0530
Subject: [PATCH 2/3] JAVA-5550 Removed Spring Milestones/RC dependencies from
 projects and upgraded them to their respective central versions

---
 netflix-modules/mantis/pom.xml                     | 12 +++---------
 spring-boot-modules/spring-boot-properties/pom.xml | 11 +----------
 spring-cloud/spring-cloud-circuit-breaker/pom.xml  | 14 --------------
 spring-mobile/pom.xml                              | 12 +-----------
 spring-roo/pom.xml                                 | 12 ------------
 5 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/netflix-modules/mantis/pom.xml b/netflix-modules/mantis/pom.xml
index 474b8f6dbf..1f8b377b94 100644
--- a/netflix-modules/mantis/pom.xml
+++ b/netflix-modules/mantis/pom.xml
@@ -19,7 +19,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <version>2.1.3.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>io.mantisrx</groupId>
@@ -35,36 +34,31 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.10.2</version>
         </dependency>
         <dependency>
             <groupId>net.andreinc.mockneat</groupId>
             <artifactId>mockneat</artifactId>
-            <version>0.3.8</version>
+            <version>0.4.2</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webflux</artifactId>
-            <version>5.0.9.RELEASE</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.projectreactor.netty</groupId>
             <artifactId>reactor-netty</artifactId>
-            <version>0.9.12.RELEASE</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
     <repositories>
         <repository>
-            <id>SpringLibReleaseRepo</id>
-            <url>https://repo.spring.io/libs-release/</url>
+        	<id>jcenter</id>
+            <url>https://jcenter.bintray.com/</url>
         </repository>
     </repositories>
 
diff --git a/spring-boot-modules/spring-boot-properties/pom.xml b/spring-boot-modules/spring-boot-properties/pom.xml
index adeb41e976..2acc66487c 100644
--- a/spring-boot-modules/spring-boot-properties/pom.xml
+++ b/spring-boot-modules/spring-boot-properties/pom.xml
@@ -121,17 +121,8 @@
             </build>
         </profile>
     </profiles>
-
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-
     <properties>
-        <spring-cloud.version>2020.0.0-M5</spring-cloud.version>
+        <spring-cloud.version>Hoxton.SR11</spring-cloud.version>
         <commons-configuration.version>1.10</commons-configuration.version>
         <guava.version>20.0</guava.version>
         <resource.delimiter>@</resource.delimiter>
diff --git a/spring-cloud/spring-cloud-circuit-breaker/pom.xml b/spring-cloud/spring-cloud-circuit-breaker/pom.xml
index 680d835c19..3cf63f3db1 100644
--- a/spring-cloud/spring-cloud-circuit-breaker/pom.xml
+++ b/spring-cloud/spring-cloud-circuit-breaker/pom.xml
@@ -14,20 +14,6 @@
         <relativePath>..</relativePath>
     </parent>
 
-    <repositories>
-        <repository>
-            <id>spring-release</id>
-            <name>Spring Release</name>
-            <url>https://repo.spring.io/release</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
diff --git a/spring-mobile/pom.xml b/spring-mobile/pom.xml
index 465458ba49..05d1df0d41 100644
--- a/spring-mobile/pom.xml
+++ b/spring-mobile/pom.xml
@@ -30,17 +30,7 @@
             <artifactId>spring-boot-starter-freemarker</artifactId>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/libs-milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
     <properties>
-        <spring-mobile-device.version>2.0.0.M3</spring-mobile-device.version>
+        <spring-mobile-device.version>1.1.5.RELEASE</spring-mobile-device.version>
     </properties>
 </project>
diff --git a/spring-roo/pom.xml b/spring-roo/pom.xml
index a3680ade70..71a1a35957 100644
--- a/spring-roo/pom.xml
+++ b/spring-roo/pom.xml
@@ -397,18 +397,6 @@
     </build>
 
     <repositories>
-        <!-- Maven Snapshots Repository -->
-        <repository>
-            <id>maven-snapshot-repository</id>
-            <name>Maven Snapshot Repository</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
         <!-- Spring Roo repository -->
         <repository>
             <id>spring-roo-repository</id>

From d8e5930766425d9966059e08a5e533d91f58fe9c Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawal.kapil@africa.airtel.com>
Date: Sun, 16 May 2021 16:59:44 +0530
Subject: [PATCH 3/3] JAVA-5550 Reverted changes done in spring-boot-properties
 as spring-cloud hoxton release is not compatible with spring boot 2.4

---
 spring-boot-modules/spring-boot-properties/pom.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/spring-boot-modules/spring-boot-properties/pom.xml b/spring-boot-modules/spring-boot-properties/pom.xml
index 2acc66487c..adeb41e976 100644
--- a/spring-boot-modules/spring-boot-properties/pom.xml
+++ b/spring-boot-modules/spring-boot-properties/pom.xml
@@ -121,8 +121,17 @@
             </build>
         </profile>
     </profiles>
+
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+
     <properties>
-        <spring-cloud.version>Hoxton.SR11</spring-cloud.version>
+        <spring-cloud.version>2020.0.0-M5</spring-cloud.version>
         <commons-configuration.version>1.10</commons-configuration.version>
         <guava.version>20.0</guava.version>
         <resource.delimiter>@</resource.delimiter>