Skip to content

Commit cbd8913

Browse files
gkwan-ibmgkwan-ibm
authored
Use versionless features (#190)
* 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 README.adoc * use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * Update index.html * Update index.html --------- Signed-off-by: Gilbert Kwan <[email protected]>
1 parent 9206b1a commit cbd8913

File tree

16 files changed

+32
-27
lines changed

16 files changed

+32
-27
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
@@ -44,10 +44,11 @@ jobs:
4444
run:
4545
working-directory: finish
4646
steps:
47-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v4
4848
- name: Set up JDK 17
49-
uses: actions/setup-java@v1
49+
uses: actions/setup-java@v4
5050
with:
51+
distribution: 'semeru'
5152
java-version: 17
5253
- run: unset _JAVA_OPTIONS
5354
- name: Run tests

‎README.adoc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022, 2024 IBM Corporation and others.
1+
// Copyright (c) 2022, 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/
@@ -73,8 +73,9 @@ docker-compose -f "pact-broker/docker-compose.yml" up -d --build
7373
When the Pact Broker is running, you'll see the following output:
7474
[role="no_copy"]
7575
```
76-
Creating pact-broker_postgres_1 ... done
77-
Creating pact-broker_pact-broker_1 ... done
76+
...
77+
Container pact-broker-postgres-1 Started
78+
Container pact-broker-pact-broker-1 Started
7879
```
7980

8081
// Static guide instruction
@@ -436,7 +437,7 @@ endif::[]
436437
[role='command']
437438
```
438439
docker-compose -f "pact-broker/docker-compose.yml" down
439-
docker rmi postgres:16.2
440+
docker rmi postgres:17.2
440441
docker rmi pactfoundation/pact-broker:latest
441442
docker volume rm pact-broker_postgres-volume
442443
```

‎finish/inventory/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>org.eclipse.microprofile</groupId>
2424
<artifactId>microprofile</artifactId>
25-
<version>6.1</version>
25+
<version>7.0</version>
2626
<type>pom</type>
2727
<scope>provided</scope>
2828
</dependency>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<server description="Sample Liberty server">
22

33
<featureManager>
4-
<feature>restfulWS-3.1</feature>
5-
<feature>jsonb-3.0</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<feature>restfulWS</feature>
6+
<feature>jsonb</feature>
67
</featureManager>
78

89
<variable name="http.port" defaultValue="9091"/>

‎finish/inventory/src/main/webapp/favicon.ico‎

14.7 KB
Binary file not shown.

‎finish/inventory/src/main/webapp/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2016, 2020 IBM Corp.
2+
Copyright (c) 2016, 2025 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.
@@ -29,7 +29,7 @@ <h2>Eclipse MicroProfile</h2>
2929
</p>
3030
<p>
3131
For more information about the features used in this application, see the Open Liberty documentation:
32-
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html">Jakarta RESTful Web Services 3.1</a></li>
32+
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html">Jakarta RESTful Web Services</a></li>
3333
</p>
3434
</div>
3535
</body>

‎finish/system/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>org.eclipse.microprofile</groupId>
2727
<artifactId>microprofile</artifactId>
28-
<version>6.1</version>
28+
<version>7.0</version>
2929
<type>pom</type>
3030
<scope>provided</scope>
3131
</dependency>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<server description="Sample Liberty server">
22
<!-- tag::features[] -->
33
<featureManager>
4-
<feature>restfulWS-3.1</feature>
5-
<feature>jsonb-3.0</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<feature>restfulWS</feature>
6+
<feature>jsonb</feature>
67
</featureManager>
78
<!-- end::features[] -->
89
<variable name="http.port" defaultValue="9090"/>

‎pact-broker/docker-compose.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
version: "3"
21
services:
32
postgres:
4-
image: postgres:16.2
3+
image: postgres:17.2
54
healthcheck:
65
test: psql postgres --command "select 1" -U postgres
76
ports:

‎scripts/testApp.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ mvn -ntp failsafe:integration-test liberty:stop
4343
## Remove the pact-broker application
4444
cd ../..
4545
docker compose -f "pact-broker/docker-compose.yml" down
46-
docker rmi postgres:16.2
46+
docker rmi postgres:17.2
4747
docker rmi pactfoundation/pact-broker:latest
4848
docker volume rm pact-broker_postgres-volume

0 commit comments

Comments
 (0)