Skip to content

Commit 9357c97

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #189 from OpenLiberty/staging
Merge staging to prod: Update to MP6.1
2 parents 2f66f79 + c8e5b50 commit 9357c97

File tree

13 files changed

+58
-51
lines changed

13 files changed

+58
-51
lines changed

Diff for: ‎.github/dependabot.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: maven
4+
directory: "/"
5+
schedule:
6+
interval: monthly
7+
open-pull-requests-limit: 50

Diff for: ‎finish/pom.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<maven.compiler.source>11</maven.compiler.source>
1515
<maven.compiler.target>11</maven.compiler.target>
1616
<!-- Liberty configuration -->
17-
<liberty.var.default.http.port>9080</liberty.var.default.http.port>
18-
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
17+
<liberty.var.http.port>9080</liberty.var.http.port>
18+
<liberty.var.https.port>9443</liberty.var.https.port>
1919
</properties>
2020

2121
<dependencies>
@@ -39,19 +39,19 @@
3939
<dependency>
4040
<groupId>org.junit.jupiter</groupId>
4141
<artifactId>junit-jupiter</artifactId>
42-
<version>5.9.2</version>
42+
<version>5.10.1</version>
4343
<scope>test</scope>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.jboss.resteasy</groupId>
4747
<artifactId>resteasy-client</artifactId>
48-
<version>6.2.3.Final</version>
48+
<version>6.2.7.Final</version>
4949
<scope>test</scope>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.jboss.resteasy</groupId>
5353
<artifactId>resteasy-json-binding-provider</artifactId>
54-
<version>6.2.3.Final</version>
54+
<version>6.2.7.Final</version>
5555
<scope>test</scope>
5656
</dependency>
5757
<dependency>
@@ -64,7 +64,7 @@
6464
<dependency>
6565
<groupId>org.apache.commons</groupId>
6666
<artifactId>commons-lang3</artifactId>
67-
<version>3.12.0</version>
67+
<version>3.14.0</version>
6868
</dependency>
6969
</dependencies>
7070

@@ -80,23 +80,23 @@
8080
<plugin>
8181
<groupId>org.apache.maven.plugins</groupId>
8282
<artifactId>maven-surefire-plugin</artifactId>
83-
<version>3.0.0</version>
83+
<version>3.2.5</version>
8484
</plugin>
8585
<!-- Enable liberty-maven plugin -->
8686
<plugin>
8787
<groupId>io.openliberty.tools</groupId>
8888
<artifactId>liberty-maven-plugin</artifactId>
89-
<version>3.8.2</version>
89+
<version>3.10</version>
9090
</plugin>
9191
<!-- Plugin to run functional tests -->
9292
<plugin>
9393
<groupId>org.apache.maven.plugins</groupId>
9494
<artifactId>maven-failsafe-plugin</artifactId>
95-
<version>3.0.0</version>
95+
<version>3.2.5</version>
9696
<configuration>
9797
<systemPropertyVariables>
98-
<default.http.port>${liberty.var.default.http.port}</default.http.port>
99-
<default.https.port>${liberty.var.default.https.port}</default.https.port>
98+
<http.port>${liberty.var.http.port}</http.port>
99+
<https.port>${liberty.var.https.port}</https.port>
100100
</systemPropertyVariables>
101101
</configuration>
102102
</plugin>

Diff for: ‎finish/src/main/liberty/config/server.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<feature>jsonb-3.0</feature>
66
<feature>jsonp-2.1</feature>
77
<feature>cdi-4.0</feature>
8-
<feature>mpConfig-3.0</feature>
8+
<feature>mpConfig-3.1</feature>
99
<feature>mpRestClient-3.0</feature>
1010
<!-- tag::mpHealth[] -->
1111
<feature>mpHealth-4.0</feature>
1212
<!-- end::mpHealth[] -->
1313
</featureManager>
1414

15-
<variable name="default.http.port" defaultValue="9080"/>
16-
<variable name="default.https.port" defaultValue="9443"/>
15+
<variable name="http.port" defaultValue="9080"/>
16+
<variable name="https.port" defaultValue="9443"/>
1717

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

2121
<webApplication location="guide-microprofile-health.war" contextRoot="/"/>
2222
</server>

Diff for: ‎finish/src/main/webapp/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2016, 2023 IBM Corp.
2+
Copyright (c) 2016, 2024 IBM Corp.
33
​
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -30,11 +30,11 @@ <h2>Eclipse MicroProfile</h2>
3030
<p>
3131
For more information about the features used in this application, see the Open Liberty documentation:
3232
<ul>
33-
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.0</a></li>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
3434
<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>
3535
<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>
3636
<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>
37-
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.0</a></li>
37+
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
3838
<li><a href="https://openliberty.io/docs/ref/feature/#mpRestClient-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 3.0</a></li>
3939
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Health 4.0</a></li>
4040
<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>

Diff for: ‎finish/src/test/java/it/io/openliberty/guides/health/HealthITUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2018, 2022 IBM Corporation and others.
3+
* Copyright (c) 2018, 2024 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
@@ -36,7 +36,7 @@ public class HealthITUtil {
3636
+ "inMaintenance\":true";
3737

3838
static {
39-
port = System.getProperty("default.http.port");
39+
port = System.getProperty("http.port");
4040
baseUrl = "http://localhost:" + port + "/";
4141
}
4242

Diff for: ‎finish/src/test/java/it/io/openliberty/guides/inventory/InventoryEndpointIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2017, 2022 IBM Corporation and others.
3+
* Copyright (c) 2017, 2024 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
@@ -43,7 +43,7 @@ public class InventoryEndpointIT {
4343

4444
@BeforeAll
4545
public static void oneTimeSetup() {
46-
port = System.getProperty("default.http.port");
46+
port = System.getProperty("http.port");
4747
baseUrl = "http://localhost:" + port + "/";
4848
}
4949

Diff for: ‎finish/src/test/java/it/io/openliberty/guides/system/SystemEndpointIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2017, 2022 IBM Corporation and others.
3+
* Copyright (c) 2017, 2024 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@ public class SystemEndpointIT {
2525

2626
@Test
2727
public void testGetProperties() {
28-
String port = System.getProperty("default.http.port");
28+
String port = System.getProperty("http.port");
2929
String url = "http://localhost:" + port + "/";
3030

3131
Client client = ClientBuilder.newClient();

Diff for: ‎start/pom.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<maven.compiler.source>11</maven.compiler.source>
1515
<maven.compiler.target>11</maven.compiler.target>
1616
<!-- Liberty configuration -->
17-
<liberty.var.default.http.port>9080</liberty.var.default.http.port>
18-
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
17+
<liberty.var.http.port>9080</liberty.var.http.port>
18+
<liberty.var.https.port>9443</liberty.var.https.port>
1919
</properties>
2020

2121
<dependencies>
@@ -29,27 +29,27 @@
2929
<dependency>
3030
<groupId>org.eclipse.microprofile</groupId>
3131
<artifactId>microprofile</artifactId>
32-
<version>6.0</version>
32+
<version>6.1</version>
3333
<type>pom</type>
3434
<scope>provided</scope>
3535
</dependency>
3636
<!-- For tests -->
3737
<dependency>
3838
<groupId>org.junit.jupiter</groupId>
3939
<artifactId>junit-jupiter</artifactId>
40-
<version>5.9.2</version>
40+
<version>5.10.1</version>
4141
<scope>test</scope>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.jboss.resteasy</groupId>
4545
<artifactId>resteasy-client</artifactId>
46-
<version>6.2.3.Final</version>
46+
<version>6.2.7.Final</version>
4747
<scope>test</scope>
4848
</dependency>
4949
<dependency>
5050
<groupId>org.jboss.resteasy</groupId>
5151
<artifactId>resteasy-json-binding-provider</artifactId>
52-
<version>6.2.3.Final</version>
52+
<version>6.2.7.Final</version>
5353
<scope>test</scope>
5454
</dependency>
5555
<dependency>
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>org.apache.commons</groupId>
6464
<artifactId>commons-lang3</artifactId>
65-
<version>3.12.0</version>
65+
<version>3.14.0</version>
6666
</dependency>
6767
</dependencies>
6868

@@ -78,23 +78,23 @@
7878
<plugin>
7979
<groupId>org.apache.maven.plugins</groupId>
8080
<artifactId>maven-surefire-plugin</artifactId>
81-
<version>3.0.0</version>
81+
<version>3.2.5</version>
8282
</plugin>
8383
<!-- Enable liberty-maven plugin -->
8484
<plugin>
8585
<groupId>io.openliberty.tools</groupId>
8686
<artifactId>liberty-maven-plugin</artifactId>
87-
<version>3.8.2</version>
87+
<version>3.10</version>
8888
</plugin>
8989
<!-- Plugin to run functional tests -->
9090
<plugin>
9191
<groupId>org.apache.maven.plugins</groupId>
9292
<artifactId>maven-failsafe-plugin</artifactId>
93-
<version>3.0.0</version>
93+
<version>3.2.5</version>
9494
<configuration>
9595
<systemPropertyVariables>
96-
<default.http.port>${liberty.var.default.http.port}</default.http.port>
97-
<default.https.port>${liberty.var.default.https.port}</default.https.port>
96+
<http.port>${liberty.var.http.port}</http.port>
97+
<https.port>${liberty.var.https.port}</https.port>
9898
</systemPropertyVariables>
9999
</configuration>
100100
</plugin>

Diff for: ‎start/src/main/liberty/config/server.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
<feature>jsonb-3.0</feature>
66
<feature>jsonp-2.1</feature>
77
<feature>cdi-4.0</feature>
8-
<feature>mpConfig-3.0</feature>
8+
<feature>mpConfig-3.1</feature>
99
<feature>mpRestClient-3.0</feature>
1010
<feature>mpHealth-4.0</feature>
1111
</featureManager>
1212

13-
<variable name="default.http.port" defaultValue="9080"/>
14-
<variable name="default.https.port" defaultValue="9443"/>
13+
<variable name="http.port" defaultValue="9080"/>
14+
<variable name="https.port" defaultValue="9443"/>
1515

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

1919
<webApplication location="guide-microprofile-health.war" contextRoot="/"/>
2020
</server>

Diff for: ‎start/src/main/webapp/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2016, 2023 IBM Corp.
2+
Copyright (c) 2016, 2024 IBM Corp.
33
​
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -30,11 +30,11 @@ <h2>Eclipse MicroProfile</h2>
3030
<p>
3131
For more information about the features used in this application, see the Open Liberty documentation:
3232
<ul>
33-
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.0</a></li>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
3434
<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>
3535
<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>
3636
<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>
37-
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.0</a></li>
37+
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
3838
<li><a href="https://openliberty.io/docs/ref/feature/#mpRestClient-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 3.0</a></li>
3939
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Health 4.0</a></li>
4040
<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>

Diff for: ‎start/src/test/java/it/io/openliberty/guides/health/HealthITUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2018, 2022 IBM Corporation and others.
3+
* Copyright (c) 2018, 2024 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
@@ -36,7 +36,7 @@ public class HealthITUtil {
3636
"io_openliberty_guides_inventory_inMaintenance\":true";
3737

3838
static {
39-
port = System.getProperty("default.http.port");
39+
port = System.getProperty("http.port");
4040
baseUrl = "http://localhost:" + port + "/";
4141
}
4242

Diff for: ‎start/src/test/java/it/io/openliberty/guides/inventory/InventoryEndpointIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2017, 2022 IBM Corporation and others.
3+
* Copyright (c) 2017, 2024 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
@@ -44,7 +44,7 @@ public class InventoryEndpointIT {
4444

4545
@BeforeAll
4646
public static void oneTimeSetup() {
47-
port = System.getProperty("default.http.port");
47+
port = System.getProperty("http.port");
4848
baseUrl = "http://localhost:" + port + "/";
4949
}
5050

Diff for: ‎start/src/test/java/it/io/openliberty/guides/system/SystemEndpointIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2017, 2022 IBM Corporation and others.
3+
* Copyright (c) 2017, 2024 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@ public class SystemEndpointIT {
2525

2626
@Test
2727
public void testGetProperties() {
28-
String port = System.getProperty("default.http.port");
28+
String port = System.getProperty("http.port");
2929
String url = "http://localhost:" + port + "/";
3030

3131
Client client = ClientBuilder.newClient();

0 commit comments

Comments
 (0)