Skip to content

Commit 39f7283

Browse files
gkwan-ibmgkwan-ibm
authored
Use versionless features (#422)
* use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * Update mpData.js --------- Signed-off-by: Gilbert Kwan <[email protected]>
1 parent 383fc73 commit 39f7283

File tree

11 files changed

+41
-34
lines changed

11 files changed

+41
-34
lines changed

‎.github/workflows/test.yml‎

Lines changed: 5 additions & 4 deletions
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

‎finish/pom.xml‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 10 additions & 8 deletions
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‎

Lines changed: 10 additions & 8 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 8 additions & 6 deletions
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"/>

0 commit comments

Comments
 (0)