Try to enable embedded server test without cleanWorkarea

scottkurz · Dec 4, 2020 · 748a813 · 748a813
1 parent 45d6bcc
commit 748a813
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -20,11 +20,11 @@ jobs:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         os: [ubuntu-18.04, windows-latest]
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [20.0.0.12, 20.0.0.6]
+        RUNTIME_VERSION: [20.0.0.12, 20.0.0.9]
         java: [11, 8]
         exclude:
         - java: 8
-          RUNTIME_VERSION: 20.0.0.6
+          RUNTIME_VERSION: 20.0.0.9
 
     name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, ${{ matrix.os }}
     steps:

diff --git a/liberty-maven-plugin/src/it/basic-it/pom.xml b/liberty-maven-plugin/src/it/basic-it/pom.xml
@@ -61,8 +61,8 @@
                 <artifactId>liberty-maven-plugin</artifactId>
                 <version>@pom.version@</version>
                 <configuration>
-                    <!-- Set to false TEMPORARILY due to ci.ant issue 131 -->
-                    <embedded>false</embedded>
+                    <!-- Test embedded server -->
+                    <embedded>true</embedded>
                     <assemblyArtifact>
                         <groupId>${project.groupId}</groupId>
                         <artifactId>assembly-server</artifactId>
@@ -152,6 +152,8 @@
                         <configuration>
                             <cleanDropins>true</cleanDropins>
                             <cleanApps>true</cleanApps>
+                            <!-- Temporarily set this to false due to ci.ant issue 131 -->
+                            <cleanWorkarea>false</cleanWorkarea>
                         </configuration>
                     </execution>
                     <execution>