Skip to content

Commit

Permalink
update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@gkwan-ibm
gkwan-ibm committed Jan 29, 2024
1 parent 82783cc commit 022cc03
Show file tree
Hide file tree
Showing 15 changed files with 82 additions and 82 deletions.
20 changes: 10 additions & 10 deletions finish/inventory/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<inventory.service.root>localhost:32000</inventory.service.root>
<!-- end::inventory.service.root[] -->
<!-- Liberty configuration -->
<liberty.var.default.http.port>9080</liberty.var.default.http.port>
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
<liberty.var.http.port>9090</liberty.var.http.port>
<liberty.var.https.port>9453</liberty.var.https.port>
</properties>

<dependencies>
Expand All @@ -42,33 +42,33 @@
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>6.0</version>
<version>6.1</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
<!-- Java utility classes -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<version>3.14.0</version>
</dependency>
<!-- For tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.2</version>
<version>5.10.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>6.2.3.Final</version>
<version>6.2.7.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-json-binding-provider</artifactId>
<version>6.2.3.Final</version>
<version>6.2.7.Final</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -90,19 +90,19 @@
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>3.8.2</version>
<version>3.10</version>
</plugin>
<!-- Plugin to run unit tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.5</version>
</plugin>
<!-- Plugin to run functional tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.5</version>
<configuration>
<systemPropertyVariables>
<inventory.service.root>${inventory.service.root}</inventory.service.root>
Expand Down
8 changes: 4 additions & 4 deletions finish/inventory/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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) {
Expand All @@ -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();
Expand Down
10 changes: 5 additions & 5 deletions finish/inventory/src/main/liberty/config/server.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
<feature>restfulWS-3.1</feature>
<feature>jsonb-3.0</feature>
<feature>cdi-4.0</feature>
<feature>mpConfig-3.0</feature>
<feature>mpConfig-3.1</feature>
<feature>jsonp-2.1</feature>
<feature>mpHealth-4.0</feature>
</featureManager>

<variable name="default.http.port" defaultValue="9080" />
<variable name="default.https.port" defaultValue="9443" />
<variable name="http.port" defaultValue="9090" />
<variable name="https.port" defaultValue="9453" />

<httpEndpoint host="*" httpPort="${default.http.port}"
httpsPort="${default.https.port}" id="defaultHttpEndpoint" />
<httpEndpoint host="*" httpPort="${http.port}"
httpsPort="${https.port}" id="defaultHttpEndpoint" />

<webApplication location="guide-kubernetes-intro-inventory.war" contextRoot="/" />
</server>
6 changes: 3 additions & 3 deletions finish/inventory/src/main/webapp/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2016, 2023 IBM Corp.
Copyright (c) 2016, 2024 IBM Corp.
​
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,10 +30,10 @@ <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-6.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
</ul>
Expand Down
16 changes: 8 additions & 8 deletions finish/kubernetes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ spec:
# end::image1[]
ports:
# tag::containerPort1[]
- containerPort: 9080
- containerPort: 9090
# end::containerPort1[]
# tag::readinessProbe1[]
readinessProbe:
httpGet:
# tag::ready1[]
path: /health/ready
# end::ready1[]
port: 9080
port: 9090
# tag::delay2[]
initialDelaySeconds: 30
# end::delay2[]
Expand Down Expand Up @@ -107,7 +107,7 @@ spec:
# end::image2[]
ports:
# tag::containerPort2[]
- containerPort: 9080
- containerPort: 9090
# end::containerPort2[]
env:
- name: SYS_APP_HOSTNAME
Expand All @@ -118,7 +118,7 @@ spec:
# tag::ready2[]
path: /health/ready
# end::ready2[]
port: 9080
port: 9090
# tag::delay4[]
initialDelaySeconds: 30
# end::delay4[]
Expand Down Expand Up @@ -147,8 +147,8 @@ spec:
# end::app7[]
ports:
- protocol: TCP
port: 9080
targetPort: 9080
port: 9090
targetPort: 9090
# tag::nodePort1[]
nodePort: 31000
# end::nodePort1[]
Expand All @@ -168,8 +168,8 @@ spec:
# end::app8[]
ports:
- protocol: TCP
port: 9080
targetPort: 9080
port: 9090
targetPort: 9090
# tag::nodePort2[]
nodePort: 32000
# end::nodePort2[]
18 changes: 9 additions & 9 deletions finish/system/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<!-- Default test properties -->
<system.service.root>localhost:31000</system.service.root>
<!-- Liberty configuration -->
<liberty.var.default.http.port>9080</liberty.var.default.http.port>
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
<liberty.var.http.port>9090</liberty.var.http.port>
<liberty.var.https.port>9453</liberty.var.https.port>
</properties>

<dependencies>
Expand All @@ -34,27 +34,27 @@
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>6.0</version>
<version>6.1</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
<!-- For tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.2</version>
<version>5.10.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-json-binding-provider</artifactId>
<version>6.2.3.Final</version>
<version>6.2.7.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>6.2.3.Final</version>
<version>6.2.7.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -71,19 +71,19 @@
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>3.8.2</version>
<version>3.10</version>
</plugin>
<!-- Plugin to run unit tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.5</version>
</plugin>
<!-- Plugin to run functional tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.5</version>
<configuration>
<systemPropertyVariables>
<system.service.root>${system.service.root}</system.service.root>
Expand Down
8 changes: 4 additions & 4 deletions finish/system/src/main/liberty/config/server.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<feature>mpHealth-4.0</feature>
</featureManager>

<variable name="default.http.port" defaultValue="9080" />
<variable name="default.https.port" defaultValue="9443" />
<variable name="http.port" defaultValue="9090" />
<variable name="https.port" defaultValue="9453" />

<httpEndpoint host="*" httpPort="${default.http.port}"
httpsPort="${default.https.port}" id="defaultHttpEndpoint" />
<httpEndpoint host="*" httpPort="${http.port}"
httpsPort="${https.port}" id="defaultHttpEndpoint" />

<webApplication location="guide-kubernetes-intro-system.war" contextRoot="/" />
</server>
4 changes: 2 additions & 2 deletions finish/system/src/main/webapp/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2016, 2023 IBM Corp.
Copyright (c) 2016, 2024 IBM Corp.
​
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -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-6.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
Expand Down
20 changes: 10 additions & 10 deletions start/inventory/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<inventory.service.root>localhost:32000</inventory.service.root>

<!-- Liberty configuration -->
<liberty.var.default.http.port>9080</liberty.var.default.http.port>
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
<liberty.var.http.port>9090</liberty.var.http.port>
<liberty.var.https.port>9453</liberty.var.https.port>
</properties>

<dependencies>
Expand All @@ -37,33 +37,33 @@
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>6.0</version>
<version>6.1</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
<!-- Java utility classes -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<version>3.14.0</version>
</dependency>
<!-- For tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.2</version>
<version>5.10.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>6.2.3.Final</version>
<version>6.2.7.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-json-binding-provider</artifactId>
<version>6.2.3.Final</version>
<version>6.2.7.Final</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -85,19 +85,19 @@
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>3.8.2</version>
<version>3.10</version>
</plugin>
<!-- Plugin to run unit tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.5</version>
</plugin>
<!-- Plugin to run functional tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.5</version>
<configuration>
<systemPropertyVariables>
<inventory.service.root>${inventory.service.root}</inventory.service.root>
Expand Down
8 changes: 4 additions & 4 deletions start/inventory/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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) {
Expand All @@ -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();
Expand Down
Loading

0 comments on commit 022cc03

Please sign in to comment.