From e5f1f8a3b6937c3dd4154a3d7669ac7ea2b8fe89 Mon Sep 17 00:00:00 2001
From: Haroon Khan <haroonkhan79@gmail.com>
Date: Mon, 14 Feb 2022 21:15:53 +0000
Subject: [PATCH] [JAVA-9910] Update Cargo plugin to latest version

---
 .../spring-rest-testing/pom.xml               | 46 ++++++++++---------
 .../baeldung/cargo/CargoPluginLiveTest.java   | 13 ++++++
 2 files changed, 38 insertions(+), 21 deletions(-)
 create mode 100644 spring-web-modules/spring-rest-testing/src/test/java/com/baeldung/cargo/CargoPluginLiveTest.java

diff --git a/spring-web-modules/spring-rest-testing/pom.xml b/spring-web-modules/spring-rest-testing/pom.xml
index 1390898bf9..67b3115a6f 100644
--- a/spring-web-modules/spring-rest-testing/pom.xml
+++ b/spring-web-modules/spring-rest-testing/pom.xml
@@ -64,11 +64,6 @@
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-commons</artifactId>
         </dependency>
-        <!-- deployment -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-        </dependency>
         <!-- web -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -154,17 +149,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>jetty8x</containerId>
-                        <type>embedded</type>
-                        <systemProperties>
-                            <!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
-                        </systemProperties>
-                    </container>
                     <configuration>
                         <properties>
                             <cargo.servlet.port>8082</cargo.servlet.port>
@@ -194,15 +181,32 @@
 
     <profiles>
         <profile>
-            <id>live</id>
+            <id>cargo-integration</id>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>none</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*LiveTest.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.codehaus.cargo</groupId>
-                        <artifactId>cargo-maven2-plugin</artifactId>
-                        <configuration>
-                            <wait>false</wait>
-                        </configuration>
+                        <artifactId>cargo-maven3-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start-server</id>
@@ -232,7 +236,7 @@
         <!-- util -->
         <javassist.version>3.25.0-GA</javassist.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>
         <apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
     </properties>
 
diff --git a/spring-web-modules/spring-rest-testing/src/test/java/com/baeldung/cargo/CargoPluginLiveTest.java b/spring-web-modules/spring-rest-testing/src/test/java/com/baeldung/cargo/CargoPluginLiveTest.java
new file mode 100644
index 0000000000..8d6dd6a823
--- /dev/null
+++ b/spring-web-modules/spring-rest-testing/src/test/java/com/baeldung/cargo/CargoPluginLiveTest.java
@@ -0,0 +1,13 @@
+package com.baeldung.cargo;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class CargoPluginLiveTest {
+
+    @Test
+    void givenCargoProfile_expectTestRuns() {
+        assertTrue(true);
+    }
+}