From cd033c210911c6e2ecc9a2ddc8872cab5ce36f8d Mon Sep 17 00:00:00 2001
From: exaucae <chrysexaucet@hotmail.fr>
Date: Fri, 17 Jun 2022 15:14:02 +0000
Subject: [PATCH] fix: upgrade to cargo-maven3

Application couldn't start with previous setup. Plus, maven3 is the preferred way of using cargo now.
See https://codehaus-cargo.github.io/cargo/Maven+3+Plugin.html

Relevant section: Reg. Lifetime of our Maven 2 plugin
" Please be aware that the Maven 2 / Maven 3 plugin of Codehaus Cargo has been retired with our version 1.9.0 and has been superseded by a Maven 3 only plugin. "
---
 spring-web-modules/spring-thymeleaf/pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/spring-web-modules/spring-thymeleaf/pom.xml b/spring-web-modules/spring-thymeleaf/pom.xml
index 8201cb5c5b..94ae05ca11 100644
--- a/spring-web-modules/spring-thymeleaf/pom.xml
+++ b/spring-web-modules/spring-thymeleaf/pom.xml
@@ -115,10 +115,9 @@
             </plugin>
             <plugin>
                 <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven2-plugin</artifactId>
-                <version>${cargo-maven2-plugin.version}</version>
+                <artifactId>cargo-maven3-plugin</artifactId>
+                <version>${cargo-maven3-plugin.version}</version>
                 <configuration>
-                    <wait>true</wait>
                     <container>
                         <containerId>jetty9x</containerId>
                         <type>embedded</type>
@@ -143,7 +142,7 @@
         <javax.validation-version>2.0.1.Final</javax.validation-version>
         <hibernate-validator.version>6.0.11.Final</hibernate-validator.version>
         <!-- Maven plugins -->
-        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+        <cargo-maven3-plugin.version>1.9.9</cargo-maven3-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file