Skip to content

Commit fff2299

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #439 from OpenLiberty/staging
Merge staging to prod - Use versionless feature and MP7
2 parents c19fa30 + 5b8f1d2 commit fff2299

File tree

12 files changed

+48
-35
lines changed

12 files changed

+48
-35
lines changed

‎.github/workflows/test.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
canSkip: ${{ steps.Checker.outputs.canSkip }}
1313
steps:
1414
- name: Get files
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616
- name: Get tools
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
with:
1919
path: tools/
2020
repository: openliberty/guides-common
@@ -46,10 +46,11 @@ jobs:
4646
run:
4747
working-directory: finish
4848
steps:
49-
- uses: actions/checkout@v2
49+
- uses: actions/checkout@v4
5050
- name: Set up JDK 11
51-
uses: actions/setup-java@v1
51+
uses: actions/setup-java@v4
5252
with:
53+
distribution: 'semeru'
5354
java-version: 11
5455
- run: unset _JAVA_OPTIONS
5556
- name: Run tests

‎README.adoc

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2018, 2024 IBM Corporation and others.
1+
// Copyright (c) 2018, 2025 IBM Corporation and others.
22
// Licensed under Creative Commons Attribution-NoDerivatives
33
// 4.0 International (CC BY-ND 4.0)
44
// https://creativecommons.org/licenses/by-nd/4.0/
@@ -323,6 +323,12 @@ After you change the file, Open Liberty automatically reloads its configuration.
323323

324324
Now, when you visit the `/health` endpoint, additional traces are logged in the `trace.log` file.
325325

326+
ifdef::cloud-hosted[]
327+
```bash
328+
ls /home/project/guide-getting-started/start/target/liberty/wlp/usr/servers/defaultServer/logs
329+
```
330+
endif::[]
331+
326332
[role='command']
327333
include::{common-includes}/devmode-quit-ctrlc.adoc[]
328334

‎finish/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.eclipse.microprofile</groupId>
3232
<artifactId>microprofile</artifactId>
33-
<version>6.1</version>
33+
<version>7.0</version>
3434
<type>pom</type>
3535
<scope>provided</scope>
3636
</dependency>

‎finish/src/main/liberty/config/server.xml

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<server description="Sample Liberty server">
22
<!-- tag::features[] -->
33
<featureManager>
4-
<feature>restfulWS-3.1</feature>
5-
<feature>jsonp-2.1</feature>
6-
<feature>jsonb-3.0</feature>
7-
<feature>cdi-4.0</feature>
8-
<feature>mpMetrics-5.1</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<platform>microprofile-7.0</platform>
6+
<feature>restfulWS</feature>
7+
<feature>jsonp</feature>
8+
<feature>jsonb</feature>
9+
<feature>cdi</feature>
910
<!-- tag::mpHealth[] -->
10-
<feature>mpHealth-4.0</feature>
11+
<feature>mpHealth</feature>
1112
<!-- end::mpHealth[] -->
12-
<feature>mpConfig-3.1</feature>
13+
<feature>mpConfig</feature>
14+
<feature>mpMetrics</feature>
1315
</featureManager>
1416
<!-- end::features[] -->
1517

@@ -25,7 +27,7 @@
2527
<logging traceSpecification="com.ibm.ws.microprofile.health.*=all" />
2628
<!-- end::logging[] -->
2729

28-
<httpEndpoint host="*" httpPort="${http.port}"
30+
<httpEndpoint host="*" httpPort="${http.port}"
2931
httpsPort="${https.port}" id="defaultHttpEndpoint"/>
3032

3133
<variable name="io_openliberty_guides_system_inMaintenance" value="false"/>

‎finish/src/main/webapp/fonts/BunueloCleanPro-Light.otf

111 KB
Binary file not shown.

‎finish/src/main/webapp/fonts/BunueloCleanPro-Light.woff

-62.8 KB
Binary file not shown.

‎finish/src/main/webapp/fonts/BunueloCleanPro-SemiBold.otf

114 KB
Binary file not shown.

‎finish/src/main/webapp/fonts/BunueloCleanPro-SemiBold.woff

-65.7 KB
Binary file not shown.

‎staging/server.xml

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<server description="Sample Liberty server">
22
<!-- tag::features[] -->
33
<featureManager>
4-
<feature>restfulWS-3.1</feature>
5-
<feature>jsonp-2.1</feature>
6-
<feature>jsonb-3.0</feature>
7-
<feature>cdi-4.0</feature>
8-
<feature>mpMetrics-5.1</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<platform>microprofile-7.0</platform>
6+
<feature>restfulWS</feature>
7+
<feature>jsonp</feature>
8+
<feature>jsonb</feature>
9+
<feature>cdi</feature>
910
<!-- tag::mpHealth[] -->
10-
<feature>mpHealth-4.0</feature>
11+
<feature>mpHealth</feature>
1112
<!-- end::mpHealth[] -->
12-
<feature>mpConfig-3.1</feature>
13+
<feature>mpConfig</feature>
14+
<feature>mpMetrics</feature>
1315
</featureManager>
1416
<!-- end::features[] -->
1517

@@ -24,7 +26,7 @@
2426
<logging traceSpecification="com.ibm.ws.microprofile.health.*=all" />
2527
<!-- end::logging[] -->
2628

27-
<httpEndpoint host="*" httpPort="${http.port}"
29+
<httpEndpoint host="*" httpPort="${http.port}"
2830
httpsPort="${https.port}" id="defaultHttpEndpoint"/>
2931

3032
<variable name="io_openliberty_guides_system_inMaintenance" value="false"/>

‎start/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.eclipse.microprofile</groupId>
3232
<artifactId>microprofile</artifactId>
33-
<version>6.1</version>
33+
<version>7.0</version>
3434
<type>pom</type>
3535
<scope>provided</scope>
3636
</dependency>

‎start/src/main/liberty/config/server.xml

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<server description="Sample Liberty server">
22
<featureManager>
3-
<feature>restfulWS-3.1</feature>
4-
<feature>jsonp-2.1</feature>
5-
<feature>jsonb-3.0</feature>
6-
<feature>cdi-4.0</feature>
7-
<feature>mpMetrics-5.1</feature>
8-
<feature>mpConfig-3.1</feature>
3+
<platform>jakartaee-10.0</platform>
4+
<platform>microprofile-7.0</platform>
5+
<feature>restfulWS</feature>
6+
<feature>jsonp</feature>
7+
<feature>jsonb</feature>
8+
<feature>cdi</feature>
9+
<feature>mpConfig</feature>
10+
<feature>mpMetrics</feature>
911
</featureManager>
1012

1113
<variable name="http.port" defaultValue="9080"/>

‎start/src/main/webapp/js/mpData.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*******************************************************************************
2-
* Copyright (c) 2018, 2019 IBM Corporation and others.
2+
* Copyright (c) 2018, 2025 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
4-
* are made available under the terms of the Eclipse Public License v1.0
4+
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v10.html
6+
* http://www.eclipse.org/legal/epl-2.0/
77
*
8-
* Contributors:
98
* IBM Corporation - initial API and implementation
109
*******************************************************************************/
1110
function displayMetrics() {
@@ -85,7 +84,8 @@ function displaySystemProperties() {
8584
}
8685

8786
function getSystemPropertiesRequest() {
88-
var propToDisplay = ["java.vendor", "java.version", "user.name", "os.name", "wlp.install.dir", "wlp.server.name" ];
87+
var propToDisplay = ["java.vendor", "java.version", "user.name",
88+
"os.name", "wlp.install.dir", "wlp.server.name" ];
8989
var url = "http://localhost:9080/system/properties";
9090
var req = new XMLHttpRequest();
9191
var table = document.getElementById("systemPropertiesTable");
@@ -240,4 +240,4 @@ function addSourceRow(table, url) {
240240
sourceText.innerHTML = "API Source\: <a href='"+url+"'>"+url+"</a>";
241241
sourceRow.appendChild(sourceText);
242242
table.appendChild(sourceRow);
243-
}
243+
}

0 commit comments

Comments
 (0)