From 3766e7160ba763342e1b0cf864ca6677f1f4ed99 Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Tue, 25 May 2021 14:41:26 -0400
Subject: [PATCH 1/2] Version update (#170)

* update versions

* Update testApp.sh
---
 README.adoc                       |  2 +-
 finish/pom.xml                    | 14 +++++++-------
 finish/src/main/webapp/index.html |  4 ++--
 scripts/dailyBuild.sh             |  5 +++--
 scripts/testApp.sh                |  5 ++++-
 start/pom.xml                     | 14 +++++++-------
 start/src/main/webapp/index.html  |  4 ++--
 7 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/README.adoc b/README.adoc
index 08ecf3d..a991a77 100644
--- a/README.adoc
+++ b/README.adoc
@@ -75,7 +75,7 @@ include::{common-includes}/twyb-end.adoc[]
 Navigate to the `start` directory to begin.
 
 [role='command']
-include::{common-includes}/devmode-start.adoc[]
+include::{common-includes}/devmode-lmp33-start.adoc[]
 
 JAX-RS has two key concepts for creating REST APIs. The most obvious one is the resource itself, which is
 modelled as a class. The second is a JAX-RS application, which groups all exposed resources under a
diff --git a/finish/pom.xml b/finish/pom.xml
index 45968c8..ac7fd68 100644
--- a/finish/pom.xml
+++ b/finish/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>3.3</version>
+            <version>4.0.1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
@@ -43,25 +43,25 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.6.2</version>
+            <version>5.7.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.3.6</version>
+            <version>3.4.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.3.6</version>
+            <version>3.4.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>yasson</artifactId>
-            <version>1.0.7</version>
+            <version>1.0.9</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -73,7 +73,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.3.4</version>
             </plugin>
             <!-- Plugin to run functional tests -->
             <plugin>
@@ -92,7 +92,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.3.1</version>
             </plugin>
             <!-- Plugin to run unit tests -->
             <plugin>
diff --git a/finish/src/main/webapp/index.html b/finish/src/main/webapp/index.html
index 165b059..a35532c 100644
--- a/finish/src/main/webapp/index.html
+++ b/finish/src/main/webapp/index.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016, 2020 IBM Corp.
+  Copyright (c) 2016, 2021 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ <h2>Eclipse MicroProfile</h2>
     <p>
         For more information about the features used in this application, see the Open Liberty documentation:
         <ul>
-            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-3.3.html" target="_blank" rel="noopener noreferrer">MicroProfile 3.3</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.0</a></li>
             <li><a href="https://openliberty.io/docs/ref/feature/#jaxrs-2.1.html" target="_blank" rel="noopener noreferrer">Java RESTful Services 2.1</a></li>
         </ul>
     </p>
diff --git a/scripts/dailyBuild.sh b/scripts/dailyBuild.sh
index 00bb40d..2fe9ef5 100644
--- a/scripts/dailyBuild.sh
+++ b/scripts/dailyBuild.sh
@@ -5,13 +5,14 @@ while getopts t:d:b:u: flag; do
     d) DRIVER="${OPTARG}" ;;
     b) BUILD="${OPTARG}" ;;
     u) DOCKER_USERNAME="${OPTARG}" ;;
+    *) echo "Invalid option";;
     esac
 done
 
-sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#a<configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/"$DATE"/"$DRIVER"</runtimeUrl></install></configuration>" pom.xml
+sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#a<configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER</runtimeUrl></install></configuration>" pom.xml
 cat pom.xml
 
-sed -i "s;FROM openliberty/open-liberty:kernel-java8-openj9-ubi;FROM "$DOCKER_USERNAME"/olguides:"$BUILD";g" Dockerfile
+sed -i "s;FROM openliberty/open-liberty:full-java8-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" Dockerfile
 cat Dockerfile
 
 ../scripts/testApp.sh
diff --git a/scripts/testApp.sh b/scripts/testApp.sh
index 33d4080..f0f89d5 100755
--- a/scripts/testApp.sh
+++ b/scripts/testApp.sh
@@ -14,7 +14,10 @@ set -euxo pipefail
 #       liberty:create            - Create a Liberty server.
 #       liberty:install-feature   - Install a feature packaged as a Subsystem Archive (esa) to the Liberty runtime.
 #       liberty:deploy            - Copy applications to the Liberty server's dropins or apps directory.
-mvn -q clean package liberty:create liberty:install-feature liberty:deploy
+mvn -Dhttp.keepAlive=false \
+    -Dmaven.wagon.http.pool=false \
+    -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
+    -q clean package liberty:create liberty:install-feature liberty:deploy
 
 ## Run the tests
 # These commands are separated because if one of the commands fail, the test script will fail and exit.
diff --git a/start/pom.xml b/start/pom.xml
index 83f9963..e717004 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>3.3</version>
+            <version>4.0.1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
@@ -37,25 +37,25 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.6.2</version>
+            <version>5.7.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.3.6</version>
+            <version>3.4.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.3.6</version>
+            <version>3.4.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>yasson</artifactId>
-            <version>1.0.7</version>
+            <version>1.0.9</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -67,7 +67,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.3.4</version>
             </plugin>
             <!-- Plugin to run functional tests -->
             <plugin>
@@ -84,7 +84,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.3.1</version>
             </plugin>
             <!-- Plugin to run unit tests -->
             <plugin>
diff --git a/start/src/main/webapp/index.html b/start/src/main/webapp/index.html
index 165b059..a35532c 100644
--- a/start/src/main/webapp/index.html
+++ b/start/src/main/webapp/index.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016, 2020 IBM Corp.
+  Copyright (c) 2016, 2021 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ <h2>Eclipse MicroProfile</h2>
     <p>
         For more information about the features used in this application, see the Open Liberty documentation:
         <ul>
-            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-3.3.html" target="_blank" rel="noopener noreferrer">MicroProfile 3.3</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.0</a></li>
             <li><a href="https://openliberty.io/docs/ref/feature/#jaxrs-2.1.html" target="_blank" rel="noopener noreferrer">Java RESTful Services 2.1</a></li>
         </ul>
     </p>

From 0ce91767017105a0d9330303a4576c01dbf69cda Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Fri, 25 Jun 2021 17:08:21 -0400
Subject: [PATCH 2/2] Update the common-includes (#174)

* Version update (#170) (#173)

* update versions

* Update testApp.sh

* update versions
---
 README.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.adoc b/README.adoc
index a991a77..8d55ac6 100644
--- a/README.adoc
+++ b/README.adoc
@@ -20,7 +20,7 @@
 :page-permalink: /guides/{projectid}
 :page-seo-title: Building a simple RESTful Java microservice using JAX-RS and JSON-B
 :page-seo-description: A getting started tutorial with examples of how to create a RESTful Java microservice in Open Liberty using the Java API for RESTful Web Services (JAX-RS) and JSON Binding (JSON-B).
-:common-includes: https://raw.githubusercontent.com/OpenLiberty/guides-common/master
+:common-includes: https://raw.githubusercontent.com/OpenLiberty/guides-common/prod
 = Creating a RESTful web service
 
 [.hidden]