Merge pull request #146 from OpenLiberty/build-fix

Build failures fix

Author: halim-lee

.one-pipeline.yaml

@@ -32,7 +32,7 @@ setup:
 
 test:
   abort_on_failure: true
-  image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.12@sha256:ff4053b0bca784d6d105fee1d008cfb20db206011453071e86b69ca3fde706a4
+  image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:3.12
   script: |
     #!/usr/bin/env bash
     SKIP_UNIT_TESTS=$(get_env SKIP_UNIT_TESTS)
@@ -72,7 +72,7 @@ static-scan:
 containerize:
   abort_on_failure: true
   dind: true
-  image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.12@sha256:ff4053b0bca784d6d105fee1d008cfb20db206011453071e86b69ca3fde706a4
+  image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:3.12
   script: |
     #!/usr/bin/env bash
 
@@ -82,20 +82,11 @@ containerize:
       set -x
     fi
 
-    apt-get update
-    apt-get -qq -y install build-essential software-properties-common uidmap
+    yum -y -q update
 
-    # Download and install skopeo
-    if ! command -v skopeo &> /dev/null; then
-      if [ ! -f "/apt/sources.list.d/devel:kubic:libcontainers:stable.list" ]; then
-        sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list"
-        wget --no-check-certificate -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_18.04/Release.key -O- | sudo apt-key add -
-        sudo apt-get update -qq
-      fi
-      sudo apt-get -y install skopeo
-    else
-      skopeo --version
-    fi
+    # Check skopeo version
+    echo "skopeo version"
+    skopeo --version || exit 1
 
     # Build images
     export PIPELINE_USERNAME=$(get_env ibmcloud-api-user)

pom.xml

@@ -44,13 +44,13 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-client</artifactId>
-      <version>6.2.3.Final</version>
+      <version>6.2.12.Final</version>
       <scope>test</scope>
     </dependency>
     <dependency>
         <groupId>org.jboss.resteasy</groupId>
         <artifactId>resteasy-json-binding-provider</artifactId>
-        <version>6.2.3.Final</version>
+        <version>6.2.12.Final</version>
         <scope>test</scope>
     </dependency>
     <dependency>
@@ -97,6 +97,11 @@
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.4.0</version>
+      </plugin>
     </plugins>
   </build>
 </project>