Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use versionless features #422

Open
wants to merge 6 commits into
base: staging
Choose a base branch
from
Open

Use versionless features #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
799bc08
use versionless feature
gkwan-ibm Nov 13, 2024
5978e29
Merge branch 'staging' into versionless
gkwan-ibm Dec 2, 2024
bb7e32e
use versionless feature
gkwan-ibm Dec 9, 2024
e932fc6
use versionless feature
gkwan-ibm Dec 10, 2024
e7ed938
use versionless feature
gkwan-ibm Dec 10, 2024
4e39d23
Merge branch 'staging' into versionless
gkwan-ibm Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
canSkip: ${{ steps.Checker.outputs.canSkip }}
steps:
- name: Get files
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Get tools
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: tools/
repository: openliberty/guides-common
Expand Down Expand Up @@ -46,10 +46,11 @@ jobs:
run:
working-directory: finish
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
distribution: 'semeru'
java-version: 11
- run: unset _JAVA_OPTIONS
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion finish/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>6.1</version>
<version>7.0</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
Expand Down
16 changes: 9 additions & 7 deletions finish/src/main/liberty/config/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
<server description="Sample Liberty server">
<!-- tag::features[] -->
<featureManager>
<feature>restfulWS-3.1</feature>
<feature>jsonp-2.1</feature>
<feature>jsonb-3.0</feature>
<feature>cdi-4.0</feature>
<feature>mpMetrics-5.1</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-7.0</platform>
<feature>restfulWS</feature>
<feature>jsonp</feature>
<feature>jsonb</feature>
<feature>cdi</feature>
<!-- tag::mpHealth[] -->
<feature>mpHealth-4.0</feature>
<feature>mpHealth</feature>
<!-- end::mpHealth[] -->
<feature>mpConfig-3.1</feature>
<feature>mpConfig</feature>
<feature>mpMetrics-5.1</feature>
</featureManager>
<!-- end::features[] -->

Expand Down
Binary file added finish/src/main/webapp/fonts/BunueloCleanPro-Light.otf
View file
Open in desktop
Binary file not shown.
Binary file removed finish/src/main/webapp/fonts/BunueloCleanPro-Light.woff
View file
Open in desktop
Binary file not shown.
Binary file added finish/src/main/webapp/fonts/BunueloCleanPro-SemiBold.otf
View file
Open in desktop
Binary file not shown.
Binary file removed finish/src/main/webapp/fonts/BunueloCleanPro-SemiBold.woff
View file
Open in desktop
Binary file not shown.
16 changes: 9 additions & 7 deletions staging/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
<server description="Sample Liberty server">
<!-- tag::features[] -->
<featureManager>
<feature>restfulWS-3.1</feature>
<feature>jsonp-2.1</feature>
<feature>jsonb-3.0</feature>
<feature>cdi-4.0</feature>
<feature>mpMetrics-5.1</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-7.0</platform>
<feature>restfulWS</feature>
<feature>jsonp</feature>
<feature>jsonb</feature>
<feature>cdi</feature>
<!-- tag::mpHealth[] -->
<feature>mpHealth-4.0</feature>
<feature>mpHealth</feature>
<!-- end::mpHealth[] -->
<feature>mpConfig-3.1</feature>
<feature>mpConfig</feature>
<feature>mpMetrics-5.1</feature>
</featureManager>
<!-- end::features[] -->

Expand Down
2 changes: 1 addition & 1 deletion start/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>6.1</version>
<version>7.0</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
Expand Down
12 changes: 7 additions & 5 deletions start/src/main/liberty/config/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<server description="Sample Liberty server">
<featureManager>
<feature>restfulWS-3.1</feature>
<feature>jsonp-2.1</feature>
<feature>jsonb-3.0</feature>
<feature>cdi-4.0</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-7.0</platform>
<feature>restfulWS</feature>
<feature>jsonp</feature>
<feature>jsonb</feature>
<feature>cdi</feature>
<feature>mpConfig</feature>
<feature>mpMetrics-5.1</feature>
<feature>mpConfig-3.1</feature>
</featureManager>

<variable name="http.port" defaultValue="9080"/>
Expand Down
10 changes: 5 additions & 5 deletions start/src/main/webapp/js/mpData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/*******************************************************************************
* Copyright (c) 2018, 2019 IBM Corporation and others.
* Copyright (c) 2018, 2021 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* http://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
function displayMetrics() {
Expand Down Expand Up @@ -85,7 +84,8 @@ function displaySystemProperties() {
}

function getSystemPropertiesRequest() {
var propToDisplay = ["java.vendor", "java.version", "user.name", "os.name", "wlp.install.dir", "wlp.server.name" ];
var propToDisplay = ["java.vendor", "java.version", "user.name",
"os.name", "wlp.install.dir", "wlp.server.name" ];
var url = "http://localhost:9080/system/properties";
var req = new XMLHttpRequest();
var table = document.getElementById("systemPropertiesTable");
Expand Down
Loading