From fd8727b3308f08a9728e10595d3c918a854bd5b9 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Mon, 31 May 2021 17:25:58 -0400 Subject: [PATCH] Version update (#107) * update versions * Update dailyBuild.sh * Update dailyBuild.sh * Update dailyBuild.sh * Update dockerImageTest.sh * Update testApp.sh * Update testApp.sh --- README.adoc | 4 ++-- finish/inventory/Dockerfile | 2 +- finish/inventory/pom.xml | 12 ++++++------ .../inventory/src/main/liberty/config/server.xml | 4 ++-- finish/inventory/src/main/webapp/index.html | 8 ++++---- finish/system/Dockerfile | 2 +- finish/system/pom.xml | 12 ++++++------ finish/system/src/main/webapp/index.html | 4 ++-- scripts/dailyBuild.sh | 7 ++++--- scripts/dockerImageTest.sh | 5 +++-- scripts/testApp.sh | 14 +++++++------- start/inventory/Dockerfile | 2 +- start/inventory/pom.xml | 12 ++++++------ start/inventory/src/main/liberty/config/server.xml | 4 ++-- start/inventory/src/main/webapp/index.html | 8 ++++---- start/system/Dockerfile | 2 +- start/system/pom.xml | 12 ++++++------ start/system/src/main/webapp/index.html | 4 ++-- 18 files changed, 60 insertions(+), 58 deletions(-) diff --git a/README.adoc b/README.adoc index 6d3b700..8e2a068 100644 --- a/README.adoc +++ b/README.adoc @@ -236,7 +236,7 @@ To build these microservices, navigate to the `start` directory and run the foll mvn package ``` -include::{common-includes}/ol-kernel-docker-pull.adoc[] +include::{common-includes}/ol-full-docker-pull.adoc[] Next, run the `docker build` commands to build the container images for your application: [role='command'] @@ -263,7 +263,7 @@ Verify that the `system:1.0-SNAPSHOT` and `inventory:1.0-SNAPSHOT` images are li REPOSITORY TAG system 1.0-SNAPSHOT inventory 1.0-SNAPSHOT -openliberty/open-liberty kernel-java8-openj9-ubi +openliberty/open-liberty full-java11-openj9-ubi ---- If you don't see the `system:1.0-SNAPSHOT` and `inventory:1.0-SNAPSHOT` images, then check the Maven diff --git a/finish/inventory/Dockerfile b/finish/inventory/Dockerfile index 5d81330..71b0f4a 100644 --- a/finish/inventory/Dockerfile +++ b/finish/inventory/Dockerfile @@ -1,4 +1,4 @@ -FROM openliberty/open-liberty:kernel-java8-openj9-ubi +FROM openliberty/open-liberty:full-java11-openj9-ubi ARG VERSION=1.0 ARG REVISION=SNAPSHOT diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml index 2c75f1a..7a907cc 100644 --- a/finish/inventory/pom.xml +++ b/finish/inventory/pom.xml @@ -45,7 +45,7 @@ org.eclipse.microprofile microprofile - 3.3 + 4.0.1 pom provided @@ -53,19 +53,19 @@ org.junit.jupiter junit-jupiter - 5.6.2 + 5.7.1 test org.apache.cxf cxf-rt-rs-extension-providers - 3.3.6 + 3.4.3 test org.apache.cxf cxf-rt-rs-client - 3.3.6 + 3.4.3 test @@ -82,13 +82,13 @@ org.apache.maven.plugins maven-war-plugin - 3.2.3 + 3.3.1 io.openliberty.tools liberty-maven-plugin - 3.2 + 3.3.4 diff --git a/finish/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml index e357ec4..614e006 100755 --- a/finish/inventory/src/main/liberty/config/server.xml +++ b/finish/inventory/src/main/liberty/config/server.xml @@ -3,8 +3,8 @@ jaxrs-2.1 cdi-2.0 - mpRestClient-1.4 - mpConfig-1.4 + mpRestClient-2.0 + mpConfig-2.0 jsonp-1.1 diff --git a/finish/inventory/src/main/webapp/index.html b/finish/inventory/src/main/webapp/index.html index 20acf36..a273d25 100755 --- a/finish/inventory/src/main/webapp/index.html +++ b/finish/inventory/src/main/webapp/index.html @@ -1,5 +1,5 @@ io.openliberty.tools liberty-maven-plugin - 3.2 + 3.3.4 diff --git a/finish/system/src/main/webapp/index.html b/finish/system/src/main/webapp/index.html index a0c6361..a104adb 100755 --- a/finish/system/src/main/webapp/index.html +++ b/finish/system/src/main/webapp/index.html @@ -1,5 +1,5 @@ io.openliberty.tools liberty-maven-plugin - 3.2 + 3.3.4 diff --git a/start/inventory/src/main/liberty/config/server.xml b/start/inventory/src/main/liberty/config/server.xml index e357ec4..614e006 100755 --- a/start/inventory/src/main/liberty/config/server.xml +++ b/start/inventory/src/main/liberty/config/server.xml @@ -3,8 +3,8 @@ jaxrs-2.1 cdi-2.0 - mpRestClient-1.4 - mpConfig-1.4 + mpRestClient-2.0 + mpConfig-2.0 jsonp-1.1 diff --git a/start/inventory/src/main/webapp/index.html b/start/inventory/src/main/webapp/index.html index 20acf36..a273d25 100755 --- a/start/inventory/src/main/webapp/index.html +++ b/start/inventory/src/main/webapp/index.html @@ -1,5 +1,5 @@ io.openliberty.tools liberty-maven-plugin - 3.2 + 3.3.4 diff --git a/start/system/src/main/webapp/index.html b/start/system/src/main/webapp/index.html index a0c6361..a104adb 100755 --- a/start/system/src/main/webapp/index.html +++ b/start/system/src/main/webapp/index.html @@ -1,5 +1,5 @@