From bfbe9f228f901f9fdcec74492bbe03b279ba9678 Mon Sep 17 00:00:00 2001
From: Scott Kurz <skurz@us.ibm.com>
Date: Wed, 7 Nov 2018 12:54:15 -0500
Subject: [PATCH 1/2] Upgrade to EE 8 for jakarta.batch test

---
 pom.xml                            | 40 ++++++++++++++++++++++++++----
 src/main/liberty/config/server.xml |  2 +-
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7b6da30..3317b24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,24 @@
         </pluginRepository>
     </pluginRepositories>
     
+
+    <!-- Uncomment to use staging repository -->
+   <!--
+    <repositories>
+        <repository>
+            <id>sonatype-nexus-staging</id>
+            <name>Sonatype Nexus staging</name>
+            <url>https://oss.sonatype.org/content/groups/staging</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+-->
+
     <properties>
 
         <!-- EDIT ME (or override on command line) -->
@@ -117,14 +135,26 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- Just add one dependency on all EE 7 APIs -->
+         <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>2.0</version>
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.batch</groupId>
+            <artifactId>jakarta.batch-api</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
         <dependency>
             <groupId>net.sf.expectit</groupId>
             <artifactId>expectit-core</artifactId>
@@ -266,7 +296,7 @@
                 <configuration>
                     <assemblyArtifact>
                         <groupId>com.ibm.websphere.appserver.runtime</groupId>
-                        <artifactId>wlp-javaee7</artifactId>
+                        <artifactId>wlp-javaee8</artifactId>
                         <version>${libertyVersion}</version>
                         <type>zip</type>
                     </assemblyArtifact>
diff --git a/src/main/liberty/config/server.xml b/src/main/liberty/config/server.xml
index 12d2f3f..781309f 100644
--- a/src/main/liberty/config/server.xml
+++ b/src/main/liberty/config/server.xml
@@ -7,7 +7,7 @@
         <feature>appSecurity-2.0</feature>
 
         <!-- This sample can work without CDI configured, but the use of CDI is always strongly encouraged with batch. -->
-        <feature>cdi-1.2</feature>
+        <feature>cdi-2.0</feature>
 
         <!-- Admin Center Java Batch tool, don't download by default  -->
 <!--

From 5d32c53eb1af37998b323e10755e5b4e8203a845 Mon Sep 17 00:00:00 2001
From: Scott Kurz <skurz@us.ibm.com>
Date: Wed, 7 Nov 2018 12:54:42 -0500
Subject: [PATCH 2/2] Allow use of staging repository for test

---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3317b24..3ea98d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,6 @@
     
 
     <!-- Uncomment to use staging repository -->
-   <!--
     <repositories>
         <repository>
             <id>sonatype-nexus-staging</id>
@@ -66,7 +65,6 @@
             </releases>
         </repository>
     </repositories>
--->
 
     <properties>