From 09e07869ac8cea1d08bd62802d5e0dad97827b87 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Thu, 29 Apr 2021 07:11:20 +0100
Subject: [PATCH 1/4] Update Spring Boot to 2.4.5

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index cdd6c4522..a9fc1eca4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.samples</groupId>
   <artifactId>spring-petclinic</artifactId>
-  <version>2.4.2</version>
+  <version>2.4.5</version>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.4.2</version>
+    <version>2.4.5</version>
   </parent>
   <name>petclinic</name>
 

From 39d60e276108e605d6aebc89058de9081af61a09 Mon Sep 17 00:00:00 2001
From: Jinbo Wang <jinbwan@microsoft.com>
Date: Tue, 27 Apr 2021 10:46:28 +0800
Subject: [PATCH 2/4] Configure an inline m2e lifecycle mapping for
 wro4j-maven-plugin

Signed-off-by: Jinbo Wang <jinbwan@microsoft.com>
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index a9fc1eca4..6737a2391 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,6 +241,7 @@
         <executions>
           <execution>
             <phase>generate-resources</phase>
+            <?m2e execute onConfiguration,onIncremental?>
             <goals>
               <goal>run</goal>
             </goals>

From af1857cda1753022ee887cc6a4b204095649da14 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Tue, 4 May 2021 11:37:26 +0100
Subject: [PATCH 3/4] Add javaformat plugin to Eclipse workaround

---
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index 6737a2391..628c88461 100644
--- a/pom.xml
+++ b/pom.xml
@@ -361,6 +361,19 @@
                         <ignore/>
                       </action>
                     </pluginExecution>
+                    <pluginExecution>
+                      <pluginExecutionFilter>
+                        <groupId>io.spring.javaformat</groupId>
+                        <artifactId>spring-javaformat-maven-plugin</artifactId>
+                        <versionRange>[0,)</versionRange>
+                        <goals>
+                          <goal>validate</goal>
+                        </goals>
+                      </pluginExecutionFilter>
+                      <action>
+                        <ignore/>
+                      </action>
+                    </pluginExecution>
                   </pluginExecutions>
                 </lifecycleMappingMetadata>
               </configuration>

From 5e972895c52169cb7ac4fd62a96ef3c4d0030232 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Mon, 10 May 2021 17:45:23 +0100
Subject: [PATCH 4/4] Only attempt to login to docker on main

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6557f3076..2293336c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,6 @@ jdk: oraclejdk8
 services:
   - docker
 before_script:
-  - docker login -u springbuildmaster -p "$DOCKERHUB_PASSWORD"
+  - '[ "${TRAVIS_BRANCH}" = "main" ] && docker login -u springbuildmaster -p "$DOCKERHUB_PASSWORD"'
 script:
   - ./mvnw spring-boot:build-image -D spring-boot.build-image.imageName=springio/petclinic && [ "${TRAVIS_BRANCH}" = "main" ] && docker push springio/petclinic