From 021a3e1c18f87cb0c02a2941276855bfd379015c Mon Sep 17 00:00:00 2001
From: Austin Seto <austin.seto@ibm.com>
Date: Mon, 11 May 2020 14:54:57 -0400
Subject: [PATCH 1/2] Removed <failOnMissingWebXml> tag Moved plugin version
 declarations

---
 finish/pom.xml | 8 ++------
 start/pom.xml  | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/finish/pom.xml b/finish/pom.xml
index fb9f3fa..372e23c 100644
--- a/finish/pom.xml
+++ b/finish/pom.xml
@@ -14,10 +14,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <failOnMissingWebXml>false</failOnMissingWebXml>
-        <!-- Plugin versions -->
-        <version.liberty-maven-plugin>3.2</version.liberty-maven-plugin>
-        <version.maven-war-plugin>3.2.3</version.maven-war-plugin>
     </properties>
 
     <dependencies>
@@ -40,13 +36,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>${version.maven-war-plugin}</version>
+                <version>3.2.3</version>
             </plugin>
             <!-- Enable liberty-maven plugin -->
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>${version.liberty-maven-plugin}</version>
+                <version>3.2</version>
             </plugin>
             <plugin>
                 <groupId>com.github.eirslett</groupId>
diff --git a/start/pom.xml b/start/pom.xml
index fb9f3fa..372e23c 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -14,10 +14,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <failOnMissingWebXml>false</failOnMissingWebXml>
-        <!-- Plugin versions -->
-        <version.liberty-maven-plugin>3.2</version.liberty-maven-plugin>
-        <version.maven-war-plugin>3.2.3</version.maven-war-plugin>
     </properties>
 
     <dependencies>
@@ -40,13 +36,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>${version.maven-war-plugin}</version>
+                <version>3.2.3</version>
             </plugin>
             <!-- Enable liberty-maven plugin -->
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>${version.liberty-maven-plugin}</version>
+                <version>3.2</version>
             </plugin>
             <plugin>
                 <groupId>com.github.eirslett</groupId>

From c8aad495f6706d0c1304c884524e12ea61689f0d Mon Sep 17 00:00:00 2001
From: Austin Seto <austin.seto@ibm.com>
Date: Tue, 12 May 2020 15:54:50 -0400
Subject: [PATCH 2/2] Added Jakarta dependency

---
 finish/pom.xml | 6 ++++++
 start/pom.xml  | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/finish/pom.xml b/finish/pom.xml
index 372e23c..f4c3132 100644
--- a/finish/pom.xml
+++ b/finish/pom.xml
@@ -18,6 +18,12 @@
 
     <dependencies>
         <!-- Provided dependencies -->
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>8.0.0</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <!-- tag::microprofile[] -->
diff --git a/start/pom.xml b/start/pom.xml
index 372e23c..f4c3132 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -18,6 +18,12 @@
 
     <dependencies>
         <!-- Provided dependencies -->
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>8.0.0</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <!-- tag::microprofile[] -->