Prep war for deployment to Tomcat 9

Author: Evaldas

WebApp/pom.xml

@@ -7,6 +7,7 @@
         <groupId>ev.projects</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
+    <packaging>war</packaging>
     <artifactId>WebApp</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>WebApp</name>
@@ -15,6 +16,11 @@
         <java.version>11</java.version>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -60,11 +66,18 @@
     </dependencies>
 
     <build>
+        <finalName>DataStorageSimulator</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

WebApp/src/main/java/ev/projects/webapp/WebAppApplication.java

@@ -2,11 +2,19 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
-public class WebAppApplication {
+public class WebAppApplication extends SpringBootServletInitializer {
 
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
+    {
+        return application.sources(WebAppApplication.class);
+    }
     public static void main(String[] args) {
         SpringApplication.run(WebAppApplication.class, args);
     }

WebApp/src/main/java/ev/projects/webapp/config/WebConfig.java

@@ -3,11 +3,13 @@
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @Configuration
 @ComponentScan({"ev.projects.services", "ev.projects.webapp"})
 @EntityScan({"ev.projects.models"})
 @EnableScheduling
+@PropertySource(value = { "classpath:application.properties" })
 public class WebConfig {
 }