From 90d08cf0312867410e19514ccec7ea3bd9a0f0d3 Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Wed, 19 May 2021 16:42:23 -0400
Subject: [PATCH 1/2] update versions (#169)

* update versions

* mvn connection timeout fix

* update versions

Co-authored-by: Tien-Thanh Le <tienthanh.le@mail.utoronto.ca>
---
 README.adoc                               |  2 +-
 finish/pom.xml                            | 14 +++++++-------
 finish/src/main/liberty/config/server.xml |  4 ++--
 finish/src/main/webapp/index.html         |  8 ++++----
 scripts/dailyBuild.sh                     | 10 +++-------
 scripts/testApp.sh                        | 10 ++++++++--
 start/pom.xml                             | 14 +++++++-------
 start/src/main/liberty/config/server.xml  |  4 ++--
 start/src/main/webapp/index.html          |  8 ++++----
 9 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/README.adoc b/README.adoc
index a2f5fd1f..be54e15e 100644
--- a/README.adoc
+++ b/README.adoc
@@ -94,7 +94,7 @@ include::{common-includes}/twyb-end.adoc[]
 Now, navigate to the `start` directory to begin.
 
 [role=command]
-include::{common-includes}/devmode-start.adoc[]
+include::{common-includes}/devmode-lmp33-start.adoc[]
 
 The MicroProfile Rest Client API is included in the MicroProfile dependency specified by your [hotspot file=0]`pom.xml` file. Look for the dependency with the [hotspot=microprofile file=0]`microprofile` artifact ID.
 
diff --git a/finish/pom.xml b/finish/pom.xml
index befa1fac..3b9b5008 100755
--- a/finish/pom.xml
+++ b/finish/pom.xml
@@ -31,7 +31,7 @@
             <!-- tag::microprofile[] -->
             <artifactId>microprofile</artifactId>
             <!-- end::microprofile[] -->
-            <version>3.3</version>
+            <version>4.0.1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
@@ -39,25 +39,25 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.10</version>
+            <version>3.12.0</version>
         </dependency>
         <!-- For tests-->
         <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>
@@ -74,7 +74,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>
@@ -86,7 +86,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>
diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml
index c504c6d9..c3775a22 100755
--- a/finish/src/main/liberty/config/server.xml
+++ b/finish/src/main/liberty/config/server.xml
@@ -5,10 +5,10 @@
     <feature>jsonp-1.1</feature>
     <feature>cdi-2.0</feature>
     <!-- tag::mpConfig[] -->
-    <feature>mpConfig-1.4</feature>
+    <feature>mpConfig-2.0</feature>
     <!-- end::mpConfig[] -->
     <!-- tag::mpRestClient[] -->
-    <feature>mpRestClient-1.4</feature>
+    <feature>mpRestClient-2.0</feature>
     <!-- end::mpRestClient[] -->
   </featureManager>
 
diff --git a/finish/src/main/webapp/index.html b/finish/src/main/webapp/index.html
index 0042fcd6..951749b9 100755
--- 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,9 +30,9 @@ <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/#mpRestClient-1.4.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 1.4</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-1.4.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 1.4</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/#mpRestClient-2.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 2.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-2.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 2.0</a></li>
             <li><a href="https://openliberty.io/docs/ref/feature/#cdi-2.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 2.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>
             <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-1.1.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Processing 1.1</a></li>
diff --git a/scripts/dailyBuild.sh b/scripts/dailyBuild.sh
index 00bb40dd..7f209dc0 100644
--- a/scripts/dailyBuild.sh
+++ b/scripts/dailyBuild.sh
@@ -1,17 +1,13 @@
 #!/bin/bash
-while getopts t:d:b:u: flag; do
+while getopts t:d: flag; do
     case "${flag}" in
     t) DATE="${OPTARG}" ;;
     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
-cat Dockerfile
-
 ../scripts/testApp.sh
diff --git a/scripts/testApp.sh b/scripts/testApp.sh
index 33d4080f..4ded5447 100644
--- 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.
@@ -24,5 +27,8 @@ mvn -q clean package liberty:create liberty:install-feature liberty:deploy
 #       liberty:stop              - Stop a Liberty server.
 #       failsafe:verify           - Verifies that the integration tests of an application passed.
 mvn liberty:start
-mvn failsafe:integration-test liberty:stop
+mvn -Dhttp.keepAlive=false \
+    -Dmaven.wagon.http.pool=false \
+    -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
+    failsafe:integration-test liberty:stop
 mvn failsafe:verify
diff --git a/start/pom.xml b/start/pom.xml
index befa1fac..3b9b5008 100755
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -31,7 +31,7 @@
             <!-- tag::microprofile[] -->
             <artifactId>microprofile</artifactId>
             <!-- end::microprofile[] -->
-            <version>3.3</version>
+            <version>4.0.1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
@@ -39,25 +39,25 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.10</version>
+            <version>3.12.0</version>
         </dependency>
         <!-- For tests-->
         <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>
@@ -74,7 +74,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>
@@ -86,7 +86,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>
diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml
index bd175566..7a6b804a 100755
--- a/start/src/main/liberty/config/server.xml
+++ b/start/src/main/liberty/config/server.xml
@@ -4,9 +4,9 @@
     <feature>jaxrs-2.1</feature>
     <feature>jsonp-1.1</feature>
     <feature>cdi-2.0</feature>
-    <feature>mpConfig-1.4</feature>
+    <feature>mpConfig-2.0</feature>
     <!-- tag::mpRestClient[] -->
-    <feature>mpRestClient-1.4</feature>
+    <feature>mpRestClient-2.0</feature>
     <!-- end::mpRestClient[] -->
   </featureManager>
 
diff --git a/start/src/main/webapp/index.html b/start/src/main/webapp/index.html
index 0042fcd6..951749b9 100755
--- 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,9 +30,9 @@ <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/#mpRestClient-1.4.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 1.4</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-1.4.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 1.4</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/#mpRestClient-2.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 2.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-2.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 2.0</a></li>
             <li><a href="https://openliberty.io/docs/ref/feature/#cdi-2.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 2.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>
             <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-1.1.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Processing 1.1</a></li>

From 47e7a41ff14fa0eb1573369d3cfb425fa97e5369 Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Fri, 25 Jun 2021 15:11:37 -0400
Subject: [PATCH 2/2] Update the common-includes (#173)

* update versions (#169) (#172)

* update versions

* mvn connection timeout fix

* update versions

Co-authored-by: Tien-Thanh Le <tienthanh.le@mail.utoronto.ca>

Co-authored-by: Tien-Thanh Le <tienthanh.le@mail.utoronto.ca>

* update versions

Co-authored-by: Tien-Thanh Le <tienthanh.le@mail.utoronto.ca>
---
 README.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.adoc b/README.adoc
index be54e15e..c4fb1a15 100644
--- a/README.adoc
+++ b/README.adoc
@@ -17,7 +17,7 @@
 :page-tags: ['MicroProfile']
 :page-permalink: /guides/{projectid}
 :page-related-guides: ['rest-intro', 'cdi-intro', 'microprofile-config', 'microprofile-rest-client-async']
-:common-includes: https://raw.githubusercontent.com/OpenLiberty/guides-common/master
+:common-includes: https://raw.githubusercontent.com/OpenLiberty/guides-common/prod
 :page-seo-title: Consuming RESTful Java microservices with template interfaces using Eclipse MicroProfile Rest Client
 :page-seo-description: A getting started tutorial and an example on how to consume RESTful Java microservices using template interfaces and Context and Dependency Injection (CDI) or a builder with MicroProfile Rest Client.
 :source-highlighter: prettify