Merge pull request #146 from OpenLiberty/staging

Merge staging to prod - Version update mp41 (#145)

Author: gkwan-ibm

README.adoc

@@ -147,7 +147,7 @@ The [hotspot=from file=0]`FROM` instruction initializes a new build stage
 and indicates the parent image from which your image is built.
 If you don't need a parent image, then use `FROM scratch`, which makes your image a base image. 
 
-In this case, you’re using the `openliberty/open-liberty:full-java11-openj9-ubi` image as your parent image, 
+In this case, you’re using the `icr.io/appcafe/open-liberty:full-java11-openj9-ubi` image as your parent image, 
 which comes with the latest Open Liberty runtime.
 
 The [hotspot=copy file=0]`COPY` instructions are structured as `COPY` 

finish/Dockerfile

@@ -1,6 +1,6 @@
 # Start with OL runtime.
 # tag::from[]
-FROM openliberty/open-liberty:full-java11-openj9-ubi
+FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
 # end::from[]
 
 ARG VERSION=1.0

finish/pom.xml

@@ -33,7 +33,7 @@ xsi:schemaLocation=
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>4.0.1</version>
+            <version>4.1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
@@ -42,7 +42,7 @@ xsi:schemaLocation=
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.7.1</version>
+            <version>5.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -77,14 +77,14 @@ xsi:schemaLocation=
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.3.2</version>
             </plugin>
 
             <!-- Enable liberty-maven plugin -->
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.3.4</version>
+                <version>3.5.1</version>
             </plugin>
 
             <!-- Plugin to run functional tests -->

finish/src/main/webapp/index.html

@@ -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-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.1</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>
         </ul>

scripts/dailyBuild.sh

@@ -15,7 +15,7 @@ echo "Testing daily OpenLiberty image"
 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:full-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" Dockerfile
+sed -i "s;FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" Dockerfile
 cat Dockerfile
 
 docker pull "$DOCKER_USERNAME""/olguides:""$BUILD"

start/pom.xml

@@ -33,7 +33,7 @@ xsi:schemaLocation=
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>4.0.1</version>
+            <version>4.1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
@@ -42,7 +42,7 @@ xsi:schemaLocation=
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.7.1</version>
+            <version>5.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -77,14 +77,14 @@ xsi:schemaLocation=
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.3.2</version>
             </plugin>
 
             <!-- Enable liberty-maven plugin -->
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.3.4</version>
+                <version>3.5.1</version>
             </plugin>
 
             <!-- Plugin to run functional tests -->

start/src/main/webapp/index.html

@@ -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-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.1</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>
         </ul>