From 77c1054085a2d72d7ea5ce54a4e544424e7d1d25 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Mon, 31 May 2021 09:40:10 -0400 Subject: [PATCH] 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 --- README.adoc | 2 +- finish/inventory/Dockerfile | 2 +- finish/inventory/pom.xml | 8 ++++---- finish/models/pom.xml | 2 +- finish/query/Dockerfile | 2 +- finish/query/pom.xml | 14 +++++++------- .../guides/query/client/InventoryClient.java | 11 ++++++----- .../guides/query/AppContainerConfig.java | 2 +- finish/system/Dockerfile | 2 +- finish/system/pom.xml | 10 +++++----- scripts/dailyBuild.sh | 7 ++++--- scripts/dockerImageTest.sh | 2 +- start/inventory/Dockerfile | 2 +- start/inventory/pom.xml | 8 ++++---- start/models/pom.xml | 2 +- start/query/Dockerfile | 2 +- start/query/pom.xml | 8 ++++---- .../guides/query/AppContainerConfig.java | 2 +- start/system/Dockerfile | 2 +- start/system/pom.xml | 10 +++++----- 20 files changed, 51 insertions(+), 49 deletions(-) diff --git a/README.adoc b/README.adoc index aed55402..0636196c 100644 --- 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 index 048cc2f1..19eac7a3 100644 --- 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 index 07db624b..f37f0fc1 100644 --- a/finish/inventory/pom.xml +++ b/finish/inventory/pom.xml @@ -57,7 +57,7 @@ org.apache.kafka kafka-clients - 2.7.0 + 2.8.0 @@ -70,13 +70,13 @@ org.testcontainers kafka - 1.15.1 + 1.15.3 test org.junit.jupiter junit-jupiter - 5.6.2 + 5.7.1 test @@ -87,7 +87,7 @@ org.apache.maven.plugins maven-war-plugin - 3.2.3 + 3.3.1 pom.xml diff --git a/finish/models/pom.xml b/finish/models/pom.xml index 51cc0ab4..d4c78e57 100644 --- a/finish/models/pom.xml +++ b/finish/models/pom.xml @@ -23,7 +23,7 @@ org.apache.kafka kafka-clients - 2.7.0 + 2.8.0 provided diff --git a/finish/query/Dockerfile b/finish/query/Dockerfile index 49287d47..159de34e 100644 --- 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 index d01b5b68..f2e7c218 100644 --- a/finish/query/pom.xml +++ b/finish/query/pom.xml @@ -57,21 +57,21 @@ org.glassfish.jersey.core jersey-client - 2.30 + 2.34 org.glassfish.jersey.ext.rx jersey-rx-client-rxjava - 2.30 + 2.34 org.glassfish.jersey.ext.rx jersey-rx-client-rxjava2 - 2.30 + 2.34 @@ -84,19 +84,19 @@ org.testcontainers mockserver - 1.15.1 + 1.15.3 test org.mock-server mockserver-client-java - 5.10.0 + 5.11.2 test org.junit.jupiter junit-jupiter - 5.6.2 + 5.7.1 test @@ -107,7 +107,7 @@ org.apache.maven.plugins maven-war-plugin - 3.2.3 + 3.3.1 pom.xml 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 index ea673054..635aae42 100644 --- 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 getSystems() { return ClientBuilder.newClient() .target(baseUri) .path("/inventory/systems") .request() - .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) - .get(new GenericType>(){}); + .header(HttpHeaders.CONTENT_TYPE, + MediaType.APPLICATION_JSON) + .get(new GenericType>() { }); } // tag::getSystem[] @@ -55,11 +55,12 @@ public Observable 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(){}); + .get(new GenericType() { }); } // 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 index 6437a91e..095ae7dd 100644 --- 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 index 2f52b343..31dd9d67 100644 --- 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 index 790962da..ac503103 100644 --- a/finish/system/pom.xml +++ b/finish/system/pom.xml @@ -52,14 +52,14 @@ org.apache.kafka kafka-clients - 2.7.0 + 2.8.0 io.reactivex.rxjava3 rxjava - 3.0.0 + 3.0.12 @@ -72,13 +72,13 @@ org.testcontainers kafka - 1.15.1 + 1.15.3 test org.junit.jupiter junit-jupiter - 5.6.2 + 5.7.1 test @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-war-plugin - 3.2.3 + 3.3.1 pom.xml diff --git a/scripts/dailyBuild.sh b/scripts/dailyBuild.sh index b0bb7f58..d90dead9 100755 --- 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 "\#liberty-maven-plugin#ahttps://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/"$DATE"/"$DRIVER"" system/pom.xml inventory/pom.xml query/pom.xml +sed -i "\#liberty-maven-plugin#ahttps://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER" 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 index 4a4af579..264baf03 100755 --- a/scripts/dockerImageTest.sh +++ b/scripts/dockerImageTest.sh @@ -13,7 +13,7 @@ echo "Testing daily Docker image" sed -i "\#liberty-maven-plugin#ahttps://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER" 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 index 048cc2f1..19eac7a3 100644 --- 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 index f939916f..04d02d22 100644 --- a/start/inventory/pom.xml +++ b/start/inventory/pom.xml @@ -54,7 +54,7 @@ org.apache.kafka kafka-clients - 2.7.0 + 2.8.0 @@ -66,13 +66,13 @@ org.testcontainers kafka - 1.15.1 + 1.15.3 test org.junit.jupiter junit-jupiter - 5.6.2 + 5.7.1 test @@ -83,7 +83,7 @@ org.apache.maven.plugins maven-war-plugin - 3.2.3 + 3.3.1 pom.xml diff --git a/start/models/pom.xml b/start/models/pom.xml index 51cc0ab4..d4c78e57 100644 --- a/start/models/pom.xml +++ b/start/models/pom.xml @@ -23,7 +23,7 @@ org.apache.kafka kafka-clients - 2.7.0 + 2.8.0 provided diff --git a/start/query/Dockerfile b/start/query/Dockerfile index 49287d47..159de34e 100644 --- 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 index eb88163f..cfd3fb99 100644 --- a/start/query/pom.xml +++ b/start/query/pom.xml @@ -62,19 +62,19 @@ org.testcontainers mockserver - 1.15.1 + 1.15.3 test org.mock-server mockserver-client-java - 5.10.0 + 5.11.2 test org.junit.jupiter junit-jupiter - 5.6.2 + 5.7.1 test @@ -85,7 +85,7 @@ org.apache.maven.plugins maven-war-plugin - 3.2.3 + 3.3.1 pom.xml 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 index 6437a91e..095ae7dd 100644 --- 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 index 2f52b343..31dd9d67 100644 --- 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 index 790962da..ac503103 100644 --- a/start/system/pom.xml +++ b/start/system/pom.xml @@ -52,14 +52,14 @@ org.apache.kafka kafka-clients - 2.7.0 + 2.8.0 io.reactivex.rxjava3 rxjava - 3.0.0 + 3.0.12 @@ -72,13 +72,13 @@ org.testcontainers kafka - 1.15.1 + 1.15.3 test org.junit.jupiter junit-jupiter - 5.6.2 + 5.7.1 test @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-war-plugin - 3.2.3 + 3.3.1 pom.xml