Revert "Merge staging to prod - Version update (#107)"

OpenLiberty · Jun 4, 2021 · d7fb0e3 · d7fb0e3
1 parent da0440f
commit d7fb0e3
Show file tree

Hide file tree

Showing 18 changed files with 58 additions and 60 deletions.
diff --git 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-full-docker-pull.adoc[]
+include::{common-includes}/ol-kernel-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            full-java11-openj9-ubi        
+openliberty/open-liberty            kernel-java8-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
@@ -1,4 +1,4 @@
-FROM openliberty/open-liberty:full-java11-openj9-ubi
+FROM openliberty/open-liberty:kernel-java8-openj9-ubi
 
 ARG VERSION=1.0
 ARG REVISION=SNAPSHOT

diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml
@@ -45,27 +45,27 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>4.0.1</version>
+            <version>3.3</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.6.2</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.3.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.4.3</version>
+            <version>3.3.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -82,13 +82,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.2.3</version>
             </plugin>
             <!-- Enable Liberty Maven plugin -->
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.3.4</version>
+                <version>3.2</version>
             </plugin>
             <!-- Plugin to run unit tests -->
             <plugin>

diff --git a/finish/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml
@@ -3,8 +3,8 @@
   <featureManager>
     <feature>jaxrs-2.1</feature>
     <feature>cdi-2.0</feature>
-    <feature>mpRestClient-2.0</feature>
-    <feature>mpConfig-2.0</feature>
+    <feature>mpRestClient-1.4</feature>
+    <feature>mpConfig-1.4</feature>
     <feature>jsonp-1.1</feature>
   </featureManager>
 

diff --git a/finish/inventory/src/main/webapp/index.html b/finish/inventory/src/main/webapp/index.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016, 2021 IBM Corp.
+  Copyright (c) 2016, 2020 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,11 +30,11 @@ <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-3.3.html" target="_blank" rel="noopener noreferrer">MicroProfile 3.3</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/#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/#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/#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/#jsonp-1.1.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Processing 1.1</a></li>
         </ul>
     </p>

diff --git a/finish/system/Dockerfile b/finish/system/Dockerfile
@@ -1,4 +1,4 @@
-FROM openliberty/open-liberty:full-java11-openj9-ubi
+FROM openliberty/open-liberty:kernel-java8-openj9-ubi
 
 ARG VERSION=1.0
 ARG REVISION=SNAPSHOT

diff --git a/finish/system/pom.xml b/finish/system/pom.xml
@@ -35,27 +35,27 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>4.0.1</version>
+            <version>3.3</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.6.2</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.3.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.4.3</version>
+            <version>3.3.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -66,13 +66,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.2.3</version>
             </plugin>
             <!-- Enable Liberty Maven plugin -->
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.3.4</version>
+                <version>3.2</version>
             </plugin>
             <!-- Plugin to run unit tests -->
             <plugin>

diff --git a/finish/system/src/main/webapp/index.html b/finish/system/src/main/webapp/index.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016, 2021 IBM Corp.
+  Copyright (c) 2016, 2020 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-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.0</a></li>
+            <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/#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/#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/#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
@@ -6,19 +6,18 @@ do
         d) DRIVER="${OPTARG}";;
         b) BUILD="${OPTARG}";;
         u) DOCKER_USERNAME="${OPTARG}";;
-        *) echo "Invalid option";;
     esac
 done
 
 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>" inventory/pom.xml system/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>" inventory/pom.xml system/pom.xml
 cat inventory/pom.xml system/pom.xml
 
-sed -i "s;FROM openliberty/open-liberty:full-java8-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" system/Dockerfile inventory/Dockerfile
+sed -i "s;FROM openliberty/open-liberty:kernel-java8-openj9-ubi;FROM "$DOCKER_USERNAME"/olguides:"$BUILD";g" system/Dockerfile inventory/Dockerfile
 cat system/Dockerfile inventory/Dockerfile
 
-docker pull "$DOCKER_USERNAME/olguides:$BUILD"
+docker pull $DOCKER_USERNAME"/olguides:"$BUILD
 
 ../scripts/startMinikube.sh
 ../scripts/testApp.sh

diff --git a/scripts/dockerImageTest.sh b/scripts/dockerImageTest.sh
@@ -4,16 +4,15 @@ do
     case "${flag}" in
         t) DATE="${OPTARG}";;
         d) DRIVER="${OPTARG}";;
-        *) echo "Invalid option";;
     esac
 done
 
 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
+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" system/Dockerfile inventory/Dockerfile
+sed -i "s;FROM openliberty/open-liberty:kernel-java8-openj9-ubi;FROM openliberty/daily:latest;g" system/Dockerfile inventory/Dockerfile
 cat system/Dockerfile inventory/Dockerfile
 
 docker pull "openliberty/daily:latest"

diff --git a/scripts/testApp.sh b/scripts/testApp.sh
@@ -5,7 +5,7 @@ set -euxo pipefail
 
 mvn -q package
 
-docker pull openliberty/open-liberty:full-java11-openj9-ubi
+docker pull openliberty/open-liberty:kernel-java8-openj9-ubi
 
 docker build -t system:1.0-SNAPSHOT system/.
 docker build -t inventory:1.0-SNAPSHOT inventory/.
@@ -19,16 +19,16 @@ sleep 120
 
 kubectl get pods
 
-minikube ip
+echo `minikube ip`
 
-curl "http://$(minikube ip):31000/system/properties"
-curl "http://$(minikube ip):32000/api/inventory/systems/system-service"
+curl http://`minikube ip`:31000/system/properties
+curl http://`minikube ip`:32000/api/inventory/systems/system-service
 
-mvn failsafe:integration-test "-Dcluster.ip=$(minikube ip)"
+mvn failsafe:integration-test -Dcluster.ip=`minikube ip`
 mvn failsafe:verify
 
-kubectl logs "$(kubectl get pods -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}' | grep system)"
-kubectl logs "$(kubectl get pods -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}' | grep inventory)"
+kubectl logs $(kubectl get pods -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}' | grep system)
+kubectl logs $(kubectl get pods -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}' | grep inventory)
 
 # Clear .m2 cache
 rm -rf ~/.m2
diff --git a/start/inventory/Dockerfile b/start/inventory/Dockerfile
@@ -1,4 +1,4 @@
-FROM openliberty/open-liberty:full-java11-openj9-ubi
+FROM openliberty/open-liberty:kernel-java8-openj9-ubi
 
 ARG VERSION=1.0
 ARG REVISION=SNAPSHOT

diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml
@@ -37,27 +37,27 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>4.0.1</version>
+            <version>3.3</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.6.2</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.3.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.4.3</version>
+            <version>3.3.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -74,13 +74,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.2.3</version>
             </plugin>
             <!-- Enable Liberty Maven plugin -->
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.3.4</version>
+                <version>3.2</version>
             </plugin>
             <!-- Plugin to run unit tests -->
             <plugin>

diff --git a/start/inventory/src/main/liberty/config/server.xml b/start/inventory/src/main/liberty/config/server.xml
@@ -3,8 +3,8 @@
   <featureManager>
     <feature>jaxrs-2.1</feature>
     <feature>cdi-2.0</feature>
-    <feature>mpRestClient-2.0</feature>
-    <feature>mpConfig-2.0</feature>
+    <feature>mpRestClient-1.4</feature>
+    <feature>mpConfig-1.4</feature>
     <feature>jsonp-1.1</feature>
   </featureManager>
 

diff --git a/start/inventory/src/main/webapp/index.html b/start/inventory/src/main/webapp/index.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016, 2021 IBM Corp.
+  Copyright (c) 2016, 2020 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,11 +30,11 @@ <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-3.3.html" target="_blank" rel="noopener noreferrer">MicroProfile 3.3</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/#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/#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/#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/#jsonp-1.1.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Processing 1.1</a></li>
         </ul>
     </p>

diff --git a/start/system/Dockerfile b/start/system/Dockerfile
@@ -1,4 +1,4 @@
-FROM openliberty/open-liberty:full-java11-openj9-ubi
+FROM openliberty/open-liberty:kernel-java8-openj9-ubi
 
 ARG VERSION=1.0
 ARG REVISION=SNAPSHOT

diff --git a/start/system/pom.xml b/start/system/pom.xml
@@ -35,27 +35,27 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>4.0.1</version>
+            <version>3.3</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.6.2</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.3.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.4.3</version>
+            <version>3.3.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -66,13 +66,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.2.3</version>
             </plugin>
             <!-- Enable Liberty Maven plugin -->
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.3.4</version>
+                <version>3.2</version>
             </plugin>
             <!-- Plugin to run unit tests -->
             <plugin>