Version update (#111)

* update versions * fixed linting issues * typecast in InventoryClient.java * fixed linting issues * reverting last changees * trying fix for Jersey Class * fixed linting issues * fixed linting issues * fixed linting issues * reverted changes to InventoryClient.java and rolled back Jersey Client version in pom.xml * updating versions Co-authored-by: Rutav Shah <[email protected]>
OpenLiberty · May 31, 2021 · 77c1054 · 77c1054
1 parent ac84d2d
commit 77c1054
Show file tree

Hide file tree

Showing 20 changed files with 51 additions and 49 deletions.
diff --git a/README.adoc b/README.adoc
@@ -138,7 +138,7 @@ mvn -pl models install
 mvn package
 ```
 
-include::{common-includes}/ol-kernel-docker-pull.adoc[]
+include::{common-includes}/ol-full-docker-pull.adoc[]
 
 Run the following commands to containerize the microservices:
 

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

diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
-            <version>2.7.0</version>
+            <version>2.8.0</version>
         </dependency>
         <!-- end::kafka[] -->
         <!-- For tests -->
@@ -70,13 +70,13 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>kafka</artifactId>
-            <version>1.15.1</version>
+            <version>1.15.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.6.2</version>
+            <version>5.7.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -87,7 +87,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.3.1</version>
                 <configuration>
                     <packagingExcludes>pom.xml</packagingExcludes>
                 </configuration>

diff --git a/finish/models/pom.xml b/finish/models/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
-            <version>2.7.0</version>
+            <version>2.8.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

diff --git a/finish/query/pom.xml b/finish/query/pom.xml
@@ -57,21 +57,21 @@
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
-            <version>2.30</version>
+            <version>2.34</version>
         </dependency>
         <!-- end::jerseyClient[] -->
         <!-- tag::jerseyRxjava[] -->
         <dependency>
             <groupId>org.glassfish.jersey.ext.rx</groupId>
             <artifactId>jersey-rx-client-rxjava</artifactId>
-            <version>2.30</version>
+            <version>2.34</version>
         </dependency>
         <!-- end::jerseyRxjava[] -->
         <!-- tag::jerseyRxjava2[] -->
         <dependency>
             <groupId>org.glassfish.jersey.ext.rx</groupId>
             <artifactId>jersey-rx-client-rxjava2</artifactId>
-            <version>2.30</version>
+            <version>2.34</version>
         </dependency>
         <!-- end::jerseyRxjava2[] -->
         <!-- For tests -->
@@ -84,19 +84,19 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>mockserver</artifactId>
-            <version>1.15.1</version>
+            <version>1.15.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-client-java</artifactId>
-            <version>5.10.0</version>
+            <version>5.11.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.6.2</version>
+            <version>5.7.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -107,7 +107,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.3.1</version>
                 <configuration>
                     <packagingExcludes>pom.xml</packagingExcludes>
                 </configuration>

diff --git a/finish/query/src/main/java/io/openliberty/guides/query/client/InventoryClient.java b/finish/query/src/main/java/io/openliberty/guides/query/client/InventoryClient.java
@@ -35,14 +35,14 @@ public class InventoryClient {
     @ConfigProperty(name = "INVENTORY_BASE_URI", defaultValue = "http://localhost:9085")
     private String baseUri;
 
-
     public List<String> getSystems() {
         return ClientBuilder.newClient()
                             .target(baseUri)
                             .path("/inventory/systems")
                             .request()
-                            .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                            .get(new GenericType<List<String>>(){});
+                            .header(HttpHeaders.CONTENT_TYPE,
+                            MediaType.APPLICATION_JSON)
+                            .get(new GenericType<List<String>>() { });
     }
 
     // tag::getSystem[]
@@ -55,11 +55,12 @@ public Observable<Properties> getSystem(String hostname) {
                             .path("/inventory/systems")
                             .path(hostname)
                             .request()
-                            .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                            .header(HttpHeaders.CONTENT_TYPE,
+                            MediaType.APPLICATION_JSON)
                             // tag::rx[]
                             .rx(RxObservableInvoker.class)
                             // end::rx[]
-                            .get(new GenericType<Properties>(){});
+                            .get(new GenericType<Properties>() { });
     }
     // end::getSystem[]
 }
diff --git a/finish/query/src/test/java/it/io/openliberty/guides/query/AppContainerConfig.java b/finish/query/src/test/java/it/io/openliberty/guides/query/AppContainerConfig.java
@@ -26,7 +26,7 @@ public class AppContainerConfig implements SharedContainerConfiguration {
     private static Network network = Network.newNetwork();
 
     @Container
-    public static MockServerContainer mockServer = new MockServerContainer("5.10.0")
+    public static MockServerContainer mockServer = new MockServerContainer("5.11.2")
                     .withNetworkAliases("mock-server")
                     .withNetwork(network);
 

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

diff --git a/finish/system/pom.xml b/finish/system/pom.xml
@@ -52,14 +52,14 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
-            <version>2.7.0</version>
+            <version>2.8.0</version>
         </dependency>
         <!-- end::kafka[] -->
         <!-- tag::rxjava[] -->
         <dependency>
             <groupId>io.reactivex.rxjava3</groupId>
             <artifactId>rxjava</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.12</version>
         </dependency>
         <!-- end::rxjava[] -->
         <!-- For tests -->
@@ -72,13 +72,13 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>kafka</artifactId>
-            <version>1.15.1</version>
+            <version>1.15.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.6.2</version>
+            <version>5.7.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -89,7 +89,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.3.1</version>
                 <configuration>
                     <packagingExcludes>pom.xml</packagingExcludes>
                 </configuration>

diff --git a/scripts/dailyBuild.sh b/scripts/dailyBuild.sh
@@ -6,17 +6,18 @@ do
         d) DRIVER="${OPTARG}";;
         b) BUILD="${OPTARG}";;
         u) DOCKER_USERNAME="${OPTARG}";;
+        *) echo "Invalid option";;
     esac
 done
 
 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>" system/pom.xml inventory/pom.xml query/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>" system/pom.xml inventory/pom.xml query/pom.xml
 cat system/pom.xml inventory/pom.xml query/pom.xml
 
-sed -i "s;FROM openliberty/open-liberty:kernel-java8-openj9-ubi;FROM "$DOCKER_USERNAME"/olguides:"$BUILD";g" system/Dockerfile inventory/Dockerfile query/Dockerfile
+sed -i "s;FROM openliberty/open-liberty:full-java8-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" system/Dockerfile inventory/Dockerfile query/Dockerfile
 cat system/Dockerfile inventory/Dockerfile query/Dockerfile
 
-docker pull $DOCKER_USERNAME"/olguides:"$BUILD
+docker pull "$DOCKER_USERNAME""/olguides:""$BUILD"
 
 ../scripts/testApp.sh
diff --git a/scripts/dockerImageTest.sh b/scripts/dockerImageTest.sh
@@ -13,7 +13,7 @@ echo "Testing daily 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>" system/pom.xml inventory/pom.xml query/pom.xml
 cat system/pom.xml inventory/pom.xml query/pom.xml
 
-sed -i "s;FROM openliberty/open-liberty:kernel-java8-openj9-ubi;FROM openliberty/daily:latest;g" system/Dockerfile inventory/Dockerfile query/Dockerfile
+sed -i "s;FROM openliberty/open-liberty:full-java11-openj9-ubi;FROM openliberty/daily:latest;g" system/Dockerfile inventory/Dockerfile query/Dockerfile
 cat system/Dockerfile inventory/Dockerfile query/Dockerfile
 
 docker pull "openliberty/daily:latest"

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

diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
-            <version>2.7.0</version>
+            <version>2.8.0</version>
         </dependency>
         <!-- For tests -->
         <dependency>
@@ -66,13 +66,13 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>kafka</artifactId>
-            <version>1.15.1</version>
+            <version>1.15.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.6.2</version>
+            <version>5.7.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -83,7 +83,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.3.1</version>
                 <configuration>
                     <packagingExcludes>pom.xml</packagingExcludes>
                 </configuration>

diff --git a/start/models/pom.xml b/start/models/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
-            <version>2.7.0</version>
+            <version>2.8.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

diff --git a/start/query/pom.xml b/start/query/pom.xml
@@ -62,19 +62,19 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>mockserver</artifactId>
-            <version>1.15.1</version>
+            <version>1.15.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-client-java</artifactId>
-            <version>5.10.0</version>
+            <version>5.11.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.6.2</version>
+            <version>5.7.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -85,7 +85,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.3.1</version>
                 <configuration>
                     <packagingExcludes>pom.xml</packagingExcludes>
                 </configuration>

diff --git a/start/query/src/test/java/it/io/openliberty/guides/query/AppContainerConfig.java b/start/query/src/test/java/it/io/openliberty/guides/query/AppContainerConfig.java
@@ -26,7 +26,7 @@ public class AppContainerConfig implements SharedContainerConfiguration {
     private static Network network = Network.newNetwork();
 
     @Container
-    public static MockServerContainer mockServer = new MockServerContainer("5.10.0")
+    public static MockServerContainer mockServer = new MockServerContainer("5.11.2")
                     .withNetworkAliases("mock-server")
                     .withNetwork(network);
 

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

diff --git a/start/system/pom.xml b/start/system/pom.xml
@@ -52,14 +52,14 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
-            <version>2.7.0</version>
+            <version>2.8.0</version>
         </dependency>
         <!-- end::kafka[] -->
         <!-- tag::rxjava[] -->
         <dependency>
             <groupId>io.reactivex.rxjava3</groupId>
             <artifactId>rxjava</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.12</version>
         </dependency>
         <!-- end::rxjava[] -->
         <!-- For tests -->
@@ -72,13 +72,13 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>kafka</artifactId>
-            <version>1.15.1</version>
+            <version>1.15.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.6.2</version>
+            <version>5.7.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -89,7 +89,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.3.1</version>
                 <configuration>
                     <packagingExcludes>pom.xml</packagingExcludes>
                 </configuration>