Merge pull request #147 from OpenLiberty/staging

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

Author: gkwan-ibm

README.adoc

@@ -94,7 +94,7 @@ cd start
 mvn clean package
 ```
 
-include::{common-includes}/ol-full-docker-pull.adoc[]
+include::{common-includes}/ol-icr-full-docker-pull.adoc[]
 
 Next, run the `docker build` commands to build container images for your application:
 [role='command']

finish/inventory/Dockerfile

@@ -1,4 +1,4 @@
-FROM openliberty/open-liberty:full-java11-openj9-ubi
+FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
 
 ARG VERSION=1.0
 ARG REVISION=SNAPSHOT

finish/inventory/pom.xml

@@ -34,7 +34,7 @@
         <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>
@@ -48,19 +48,19 @@
         <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>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.4.3</version>
+            <version>3.4.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.4.3</version>
+            <version>3.4.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -77,13 +77,13 @@
             <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 unit tests -->
             <plugin>

finish/inventory/src/main/webapp/index.html

@@ -34,7 +34,7 @@ <h2>Eclipse MicroProfile</h2>
         <div id="technologies">
             <p>For more information about the features used in the application, see the Open Liberty documentation:</p>
             <ul>
-                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.0.html">MicroProfile 4.0</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.1.html">MicroProfile 4.1</a></li>
                 <li><a href="https://openliberty.io/docs/ref/feature/#jaxrs-2.1.html">Java RESTful Services 2.1</a></li>
                 <li><a href="https://openliberty.io/docs/ref/feature/#cdi-2.0.html">Contexts and Dependency Injection 2.0</a></li>
                 <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-2.0.html">MicroProfile Config 2.0</a></li>

finish/system/Dockerfile

@@ -1,4 +1,4 @@
-FROM openliberty/open-liberty:full-java11-openj9-ubi
+FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
 
 ARG VERSION=1.0
 ARG REVISION=SNAPSHOT

finish/system/pom.xml

@@ -33,27 +33,27 @@
         <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>
         <!-- For tests -->
         <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>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.4.3</version>
+            <version>3.4.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.4.3</version>
+            <version>3.4.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -64,13 +64,13 @@
             <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 unit tests -->
             <plugin>

finish/system/src/main/webapp/index.html

@@ -34,7 +34,7 @@ <h2>Eclipse MicroProfile</h2>
         <div id="technologies">
             <p>For more information about the features used in the application, see the Open Liberty documentation:</p>
             <ul>
-                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.0.html">MicroProfile 4.0</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.1.html">MicroProfile 4.1</a></li>
                 <li><a href="https://openliberty.io/docs/ref/feature/#jaxrs-2.1.html">Java RESTful Services 2.1</a></li>
                 <li><a href="https://openliberty.io/docs/ref/feature/#cdi-2.0.html">Contexts and Dependency Injection 2.0</a></li>
                 <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-2.0.html">MicroProfile Config 2.0</a></li>

scripts/dailyBuild.sh

@@ -14,7 +14,7 @@ echo "Testing daily build 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>" inventory/pom.xml system/pom.xml
 cat inventory/pom.xml system/pom.xml
 
-sed -i "s;FROM openliberty/open-liberty:full-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" inventory/Dockerfile system/Dockerfile
+sed -i "s;FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" inventory/Dockerfile system/Dockerfile
 cat inventory/Dockerfile system/Dockerfile
 
 sudo ../scripts/testApp.sh

scripts/dockerImageTest.sh

@@ -12,7 +12,7 @@ echo "Testing latest OpenLiberty Docker 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>" inventory/pom.xml system/pom.xml
 cat inventory/pom.xml system/pom.xml
 
-sed -i "s;FROM openliberty/open-liberty:full-java11-openj9-ubi;FROM openliberty/daily:latest;g" inventory/Dockerfile system/Dockerfile
+sed -i "s;FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi;FROM openliberty/daily:latest;g" inventory/Dockerfile system/Dockerfile
 cat inventory/Dockerfile system/Dockerfile
 
 docker pull "openliberty/daily:latest"

scripts/testApp.sh

@@ -19,7 +19,7 @@ mvn -Dhttp.keepAlive=false \
     -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
     -q package
 
-docker pull openliberty/open-liberty:full-java11-openj9-ubi
+docker pull icr.io/appcafe/open-liberty:full-java11-openj9-ubi
 
 docker build -t system:1.0-SNAPSHOT system/.
 docker build -t inventory:1.0-SNAPSHOT inventory/.