diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml index 62962ad..8c2b71c 100644 --- a/finish/inventory/pom.xml +++ b/finish/inventory/pom.xml @@ -27,8 +27,8 @@ localhost:32000 - 9080 - 9443 + 9090 + 9453 @@ -42,7 +42,7 @@ org.eclipse.microprofile microprofile - 6.0 + 6.1 pom provided @@ -50,25 +50,25 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.14.0 org.junit.jupiter junit-jupiter - 5.9.2 + 5.10.1 test org.jboss.resteasy resteasy-client - 6.2.3.Final + 6.2.7.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.3.Final + 6.2.7.Final test @@ -90,19 +90,19 @@ io.openliberty.tools liberty-maven-plugin - 3.8.2 + 3.10 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.2.5 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.2.5 ${inventory.service.root} diff --git a/finish/inventory/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java b/finish/inventory/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java index 9d8d4e6..0cb34dd 100644 --- a/finish/inventory/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java +++ b/finish/inventory/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2023 IBM Corporation and others. + * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -34,8 +34,8 @@ public class SystemClient { private final String PROTOCOL = "http"; @Inject - @ConfigProperty(name = "default.http.port") - String DEFAULT_PORT; + @ConfigProperty(name = "http.port") + String HTTP_PORT; // Wrapper function that gets properties public Properties getProperties(String hostname) { @@ -56,7 +56,7 @@ public Properties getProperties(String hostname) { // Method that creates the client builder private Builder getBuilder(String hostname, Client client) throws Exception { URI uri = new URI( - PROTOCOL, null, hostname, Integer.valueOf(DEFAULT_PORT), + PROTOCOL, null, hostname, Integer.valueOf(HTTP_PORT), SYSTEM_PROPERTIES, null, null); String urlString = uri.toString(); Builder builder = client.target(urlString).request(); diff --git a/finish/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml index a085ee6..0f868f0 100755 --- a/finish/inventory/src/main/liberty/config/server.xml +++ b/finish/inventory/src/main/liberty/config/server.xml @@ -4,16 +4,16 @@ restfulWS-3.1 jsonb-3.0 cdi-4.0 - mpConfig-3.0 + mpConfig-3.1 jsonp-2.1 mpHealth-4.0 - - + + - + diff --git a/finish/inventory/src/main/webapp/index.html b/finish/inventory/src/main/webapp/index.html index 87ef1c7..bacee49 100755 --- a/finish/inventory/src/main/webapp/index.html +++ b/finish/inventory/src/main/webapp/index.html @@ -1,5 +1,5 @@ localhost:31000 - 9080 - 9443 + 9090 + 9453 @@ -34,7 +34,7 @@ org.eclipse.microprofile microprofile - 6.0 + 6.1 pom provided @@ -42,19 +42,19 @@ org.junit.jupiter junit-jupiter - 5.9.2 + 5.10.1 test org.jboss.resteasy resteasy-json-binding-provider - 6.2.3.Final + 6.2.7.Final test org.jboss.resteasy resteasy-client - 6.2.3.Final + 6.2.7.Final test @@ -71,19 +71,19 @@ io.openliberty.tools liberty-maven-plugin - 3.8.2 + 3.10 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.2.5 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.2.5 ${system.service.root} diff --git a/finish/system/src/main/liberty/config/server.xml b/finish/system/src/main/liberty/config/server.xml index 1c5a43e..0d3a515 100755 --- a/finish/system/src/main/liberty/config/server.xml +++ b/finish/system/src/main/liberty/config/server.xml @@ -8,11 +8,11 @@ mpHealth-4.0 - - + + - + diff --git a/finish/system/src/main/webapp/index.html b/finish/system/src/main/webapp/index.html index dd248c4..c775eea 100755 --- a/finish/system/src/main/webapp/index.html +++ b/finish/system/src/main/webapp/index.html @@ -1,5 +1,5 @@ - 9080 - 9443 + 9090 + 9453 @@ -37,7 +37,7 @@ org.eclipse.microprofile microprofile - 6.0 + 6.1 pom provided @@ -45,25 +45,25 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.14.0 org.junit.jupiter junit-jupiter - 5.9.2 + 5.10.1 test org.jboss.resteasy resteasy-client - 6.2.3.Final + 6.2.7.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.3.Final + 6.2.7.Final test @@ -85,19 +85,19 @@ io.openliberty.tools liberty-maven-plugin - 3.8.2 + 3.10 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.2.5 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.2.5 ${inventory.service.root} diff --git a/start/inventory/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java b/start/inventory/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java index 9d8d4e6..0cb34dd 100644 --- a/start/inventory/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java +++ b/start/inventory/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2023 IBM Corporation and others. + * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -34,8 +34,8 @@ public class SystemClient { private final String PROTOCOL = "http"; @Inject - @ConfigProperty(name = "default.http.port") - String DEFAULT_PORT; + @ConfigProperty(name = "http.port") + String HTTP_PORT; // Wrapper function that gets properties public Properties getProperties(String hostname) { @@ -56,7 +56,7 @@ public Properties getProperties(String hostname) { // Method that creates the client builder private Builder getBuilder(String hostname, Client client) throws Exception { URI uri = new URI( - PROTOCOL, null, hostname, Integer.valueOf(DEFAULT_PORT), + PROTOCOL, null, hostname, Integer.valueOf(HTTP_PORT), SYSTEM_PROPERTIES, null, null); String urlString = uri.toString(); Builder builder = client.target(urlString).request(); diff --git a/start/inventory/src/main/liberty/config/server.xml b/start/inventory/src/main/liberty/config/server.xml index a085ee6..0f868f0 100755 --- a/start/inventory/src/main/liberty/config/server.xml +++ b/start/inventory/src/main/liberty/config/server.xml @@ -4,16 +4,16 @@ restfulWS-3.1 jsonb-3.0 cdi-4.0 - mpConfig-3.0 + mpConfig-3.1 jsonp-2.1 mpHealth-4.0 - - + + - + diff --git a/start/inventory/src/main/webapp/index.html b/start/inventory/src/main/webapp/index.html index 87ef1c7..bacee49 100755 --- a/start/inventory/src/main/webapp/index.html +++ b/start/inventory/src/main/webapp/index.html @@ -1,5 +1,5 @@ localhost:31000 - 9080 - 9443 + 9090 + 9453 @@ -34,7 +34,7 @@ org.eclipse.microprofile microprofile - 6.0 + 6.1 pom provided @@ -42,19 +42,19 @@ org.junit.jupiter junit-jupiter - 5.9.2 + 5.10.1 test org.jboss.resteasy resteasy-json-binding-provider - 6.2.3.Final + 6.2.7.Final test org.jboss.resteasy resteasy-client - 6.2.3.Final + 6.2.7.Final test @@ -71,19 +71,19 @@ io.openliberty.tools liberty-maven-plugin - 3.8.2 + 3.10 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.2.5 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.2.5 ${system.service.root} diff --git a/start/system/src/main/liberty/config/server.xml b/start/system/src/main/liberty/config/server.xml index 1c5a43e..0d3a515 100755 --- a/start/system/src/main/liberty/config/server.xml +++ b/start/system/src/main/liberty/config/server.xml @@ -8,11 +8,11 @@ mpHealth-4.0 - - + + - + diff --git a/start/system/src/main/webapp/index.html b/start/system/src/main/webapp/index.html index dd248c4..c775eea 100755 --- a/start/system/src/main/webapp/index.html +++ b/start/system/src/main/webapp/index.html @@ -1,5 +1,5 @@