Fix multi-module jar skip for spring-boot projects

Signed-off-by: Adam Wisniewski <awisniew@Adams-MacBook-Pro.local>

liberty-maven-plugin/src/it/dev-it/resources/springboot-project/pom.xml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>springboot-project</artifactId>
+	<version>1.0.0.Final</version>
+	<packaging>jar</packaging>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.6.7</version>
+		<relativePath /> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+                <dependency>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                    <version>4.13.2</version>
+                    <scope>test</scope>
+                </dependency>	
+ 		<!-- Support for JDK 9 and above-->
+    		<dependency>
+        		<groupId>javax.xml.bind</groupId>
+        		<artifactId>jaxb-api</artifactId>
+        		<version>2.3.1</version>
+        		<scope>provided</scope>
+    		</dependency>        
+		<dependency>
+        		<groupId>com.sun.xml.bind</groupId>
+        		<artifactId>jaxb-core</artifactId>
+        		<version>2.3.0.1</version>
+        		<scope>provided</scope>
+    		</dependency>
+    		<dependency>
+        		<groupId>javax.activation</groupId>
+        		<artifactId>activation</artifactId>
+        		<version>1.1.1</version>
+        		<scope>provided</scope>
+    		</dependency>	
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<!-- Test support for classifier configuration parameter -->
+				<configuration>
+					<classifier>exec</classifier>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>io.openliberty.tools</groupId>
+				<artifactId>liberty-maven-plugin</artifactId>
+				<version>@pom.version@</version>
+
+				<!-- Specify configuration, executions for liberty-maven-plugin -->
+				<configuration>
+					<serverName>test</serverName>
+                                        <serverXmlFile>src/test/resources/server.xml</serverXmlFile>
+                            		<runtimeArtifact>
+                                		<groupId>${runtimeGroupId}</groupId>
+                                		<artifactId>${runtimeArtifactId}</artifactId>
+                                		<version>${runtimeVersion}</version>
+                                		<type>zip</type>
+                            		</runtimeArtifact>
+					<appsDirectory>apps</appsDirectory>
+					<deployPackages>spring-boot-project</deployPackages>
+				</configuration>
+
+				<executions>
+					<execution>
+						<id>stop-server-before-clean</id>
+						<phase>pre-clean</phase>
+						<goals>
+							<goal>stop</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>create-server</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>install-server</goal>
+							<goal>create</goal>
+							<goal>install-feature</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>install-apps</id>
+						<phase>package</phase>
+						<goals>
+							<goal>deploy</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>test-start-server</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>test-start</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>test-stop-server</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>test-stop</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>3.1.2</version>
+				<configuration>
+					<runOrder>alphabetical</runOrder>
+				</configuration>
+				<executions>
+					<execution>
+						<id>default-integration-test</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>integration-test</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>default-verify</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

liberty-maven-plugin/src/it/dev-it/resources/springboot-project/src/main/java/application/SpringBootApp.java

@@ -0,0 +1,35 @@
+/**
+ * (C) Copyright IBM Corporation 2018.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package application;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@SpringBootApplication
+@RestController
+public class SpringBootApp {
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootApp.class, args);
+    }
+
+    @RequestMapping("/spring")
+    public String hello() {
+        return "HELLO SPRING BOOT!!";
+    }
+}

liberty-maven-plugin/src/it/dev-it/resources/springboot-project/src/test/java/application/InstallSpringBoot20AppIT.java

@@ -0,0 +1,37 @@
+/**
+ * (C) Copyright IBM Corporation 2022.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package application;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import org.junit.Test;
+
+public class InstallSpringBoot20AppIT {
+
+    @Test
+    public void testThinApplicationExistsInAppsDirectory() throws Exception {
+
+        File f = new File("target/liberty/wlp/usr/servers/test/apps/thin-springboot-appsdirectory-apps-it-1.0.0.Final-exec.jar");
+        assertTrue(f.getCanonicalFile() + " doesn't exist. Plugin failed to place the file at right destination.", f.exists());
+    }
+
+    @Test
+    public void testLibIndexCacheExists() throws Exception {
+        File f = new File("target/liberty/wlp/usr/shared/resources/lib.index.cache");
+        assertTrue(f.getCanonicalFile()+ " doesn't exist. Plugin failed to place the cache directory at right destination.", f.exists());
+    }
+}

liberty-maven-plugin/src/it/dev-it/resources/springboot-project/src/test/java/application/SpringBoot20RestEndpointIT.java

@@ -0,0 +1,49 @@
+/**
+ * (C) Copyright IBM Corporation 2022.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package application;
+
+import static org.junit.Assert.*;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import org.junit.Test;
+
+public class SpringBoot20RestEndpointIT {
+
+    @Test
+    public void testSpringRestBootEndpoint() throws Exception {
+
+        URL requestUrl = new URL("http://localhost:9080/spring/");
+        HttpURLConnection conn = (HttpURLConnection) requestUrl.openConnection();
+
+        if (conn != null) {
+            assertEquals("Expected response code not found.", 200, conn.getResponseCode());
+        }
+
+        StringBuffer response = new StringBuffer();
+
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()))) {
+            String line;
+            while ((line = in.readLine()) != null) {
+                response.append(line);
+            }
+        }
+        assertEquals("Expected body not found.", "HELLO SPRING BOOT!!", response.toString());
+    }
+}

liberty-maven-plugin/src/it/dev-it/resources/springboot-project/src/test/resources/server.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server description="new server">
+
+	<!-- Enable features -->
+	<featureManager>
+		<feature>springBoot-2.0</feature>
+		<feature>servlet-4.0</feature>
+	</featureManager>
+
+	<!-- To access this server from a remote client add a host attribute to 
+		the following element, e.g. host="*" -->
+	<httpEndpoint httpPort="9080" httpsPort="9443"
+		id="defaultHttpEndpoint" />
+</server>

liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/SpringBootDevTest.java

@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * (c) Copyright IBM Corporation 2019, 2022.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *******************************************************************************/
+package net.wasdev.wlp.test.dev.it;
+
+import static org.junit.Assert.*;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.file.Files;
+import java.util.Scanner;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import static io.openliberty.tools.common.plugins.util.BinaryScannerUtil.*;
+
+public class SpringBootDevTest extends BaseDevTest {
+
+   @BeforeClass
+   public static void setUpBeforeClass() throws Exception {
+      setUpBeforeClass(null, "../resources/springboot-project"););
+   }
+
+   @AfterClass
+   public static void cleanUpAfterClass() throws Exception {
+      BaseDevTest.cleanUpAfterClass();
+   }
+
+   /**
+    * As part of the multi-module validation, dev mode is skipped on projects with a "jar" packaging type.
+    * There is an exception for Spring Boot projects. This test will validate that the spring boot project is not skipped
+    * 
+    * @throws Exception
+    */
+   @Test
+   public void validateDevModeExecutionNotSkipped() throws Exception {
+	   String mavenPluginCommand = "mvn io.openliberty.tools:liberty-maven-plugin:"+System.getProperty("mavenPluginVersion")+":dev";
+
+       StringBuilder command = new StringBuilder(mavenPluginCommand);
+       ProcessBuilder builder = buildProcess(command.toString());
+
+       builder.redirectOutput(logFile);
+       builder.redirectError(logFile);
+       process = builder.start();
+       assertTrue(process.isAlive());
+
+       OutputStream stdin = process.getOutputStream();
+
+       writer = new BufferedWriter(new OutputStreamWriter(stdin));
+
+	   // Make sure we are not skipping the project
+	   assertTrue(getLogTail(), verifyLogMessageDoesNotExist("Skipping module springboot-project which is not included in this invocation of dev mode", 30000))
+
+	   // Check that the server has started
+       assertTrue(getLogTail(), verifyLogMessageExists("CWWKF0011I", 120000));
+   }
+}