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 #291

Merged
merged 6 commits into from
Feb 4, 2025
+123 −107
Merged

Use versionless features #291

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c39970d
use versionless feature
gkwan-ibm Nov 13, 2024
81bf9a2
use versionless feature
gkwan-ibm Nov 19, 2024
e3dd764
Update test.yml
gkwan-ibm Dec 4, 2024
0b54fac
Merge branch 'staging' into versionless
gkwan-ibm Dec 4, 2024
077a78b
Merge branch 'staging' into versionless
gkwan-ibm Jan 7, 2025
2b0923e
use versionless feature
gkwan-ibm Jan 21, 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
Next Next commit
Loading
Loading status checks…
use versionless feature 
Signed-off-by: Gilbert Kwan <[email protected]>
@gkwan-ibm
gkwan-ibm committed Nov 13, 2024
commit c39970d88a91f84511fc7fc7a68f0fa7629bd855
13 changes: 7 additions & 6 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
@@ -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
@@ -44,11 +44,12 @@ jobs:
run:
working-directory: finish
steps:
- uses: actions/checkout@v2
- name: Set up JDK 8
uses: actions/setup-java@v1
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: 8
distribution: 'semeru'
java-version: 11
- run: unset _JAVA_OPTIONS
- name: Run tests
run: sudo ../scripts/testApp.sh
16 changes: 9 additions & 7 deletions finish/inventory/src/main/liberty/config/server.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<server description="Inventory Service">

<featureManager>
<feature>restfulWS-3.1</feature>
<feature>cdi-4.0</feature>
<feature>concurrent-3.0</feature>
<feature>jsonb-3.0</feature>
<feature>mpHealth-4.0</feature>
<feature>mpConfig-3.1</feature>
<feature>mpReactiveMessaging-3.0</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-6.1</platform>
<feature>restfulWS</feature>
<feature>cdi</feature>
<feature>concurrent</feature>
<feature>jsonb</feature>
<feature>mpHealth</feature>
<feature>mpConfig</feature>
<feature>mpReactiveMessaging</feature>
</featureManager>

<variable name="http.port" defaultValue="9085"/>
14 changes: 7 additions & 7 deletions finish/inventory/src/main/webapp/index.html
View file
Original file line number Diff line number Diff line change
@@ -31,13 +31,13 @@ <h2>Eclipse MicroProfile</h2>
For more information about the features used in this application, see the Open Liberty documentation:
<ul>
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpReactiveMessaging-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Reactive Messaging 3.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
<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>
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#concurrent-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta Concurrency 3.0</a></li>
<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>
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Health 4.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpReactiveMessaging.html" target="_blank" rel="noopener noreferrer">MicroProfile Reactive Messaging</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#concurrent.html" target="_blank" rel="noopener noreferrer">Jakarta Concurrency</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth.html" target="_blank" rel="noopener noreferrer"> MicroProfile Health</a></li>
</ul>
</p>
</div>
22 changes: 12 additions & 10 deletions finish/query/src/main/liberty/config/server.xml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<server description="Query Service">

<featureManager>
<feature>beanValidation-3.0</feature>
<feature>restfulWS-3.1</feature>
<feature>cdi-4.0</feature>
<feature>concurrent-3.0</feature>
<feature>jsonb-3.0</feature>
<feature>mpHealth-4.0</feature>
<feature>mpConfig-3.1</feature>
<feature>mpOpenAPI-3.1</feature>
<feature>mpReactiveMessaging-3.0</feature>
<feature>mpRestClient-3.0</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-6.1</platform>
<feature>beanValidation</feature>
<feature>restfulWS</feature>
<feature>cdi</feature>
<feature>concurrent</feature>
<feature>jsonb</feature>
<feature>mpHealth</feature>
<feature>mpConfig</feature>
<feature>mpOpenAPI</feature>
<feature>mpReactiveMessaging</feature>
<feature>mpRestClient</feature>
</featureManager>

<variable name="http.port" defaultValue="9080"/>
14 changes: 7 additions & 7 deletions finish/query/src/main/webapp/index.html
View file
Original file line number Diff line number Diff line change
@@ -31,13 +31,13 @@ <h2>Eclipse MicroProfile</h2>
For more information about the features used in this application, see the Open Liberty documentation:
<ul>
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpReactiveMessaging-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Reactive Messaging 3.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
<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>
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#concurrent-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta Concurrency 3.0</a></li>
<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>
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Health 4.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpReactiveMessaging.html" target="_blank" rel="noopener noreferrer">MicroProfile Reactive Messaging</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#concurrent.html" target="_blank" rel="noopener noreferrer">Jakarta Concurrency</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth.html" target="_blank" rel="noopener noreferrer"> MicroProfile Health</a></li>
</ul>
</p>
</div>
14 changes: 8 additions & 6 deletions finish/system/src/main/liberty/config/server.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<server description="System Service">

<featureManager>
<feature>cdi-4.0</feature>
<feature>concurrent-3.0</feature>
<feature>jsonb-3.0</feature>
<feature>mpHealth-4.0</feature>
<feature>mpConfig-3.1</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-6.1</platform>
<feature>cdi</feature>
<feature>concurrent</feature>
<feature>jsonb</feature>
<feature>mpHealth</feature>
<feature>mpConfig</feature>
<!-- tag::featureMP[] -->
<feature>mpReactiveMessaging-3.0</feature>
<feature>mpReactiveMessaging</feature>
<!-- end::featureMP[] -->
</featureManager>

12 changes: 6 additions & 6 deletions finish/system/src/main/webapp/index.html
View file
Original file line number Diff line number Diff line change
@@ -31,12 +31,12 @@ <h2>Eclipse MicroProfile</h2>
For more information about the features used in this application, see the Open Liberty documentation:
<ul>
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpReactiveMessaging-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Reactive Messaging 3.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#concurrent-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta Concurrency 3.0</a></li>
<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>
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Health 4.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpReactiveMessaging.html" target="_blank" rel="noopener noreferrer">MicroProfile Reactive Messaging</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#concurrent.html" target="_blank" rel="noopener noreferrer">Jakarta Concurrency</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth.html" target="_blank" rel="noopener noreferrer"> MicroProfile Health</a></li>
</ul>
</p>
</div>
16 changes: 9 additions & 7 deletions start/inventory/src/main/liberty/config/server.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<server description="Inventory Service">

<featureManager>
<feature>restfulWS-3.1</feature>
<feature>cdi-4.0</feature>
<feature>concurrent-3.0</feature>
<feature>jsonb-3.0</feature>
<feature>mpHealth-4.0</feature>
<feature>mpConfig-3.1</feature>
<feature>mpReactiveMessaging-3.0</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-6.1</platform>
<feature>restfulWS</feature>
<feature>cdi</feature>
<feature>concurrent</feature>
<feature>jsonb</feature>
<feature>mpHealth</feature>
<feature>mpConfig</feature>
<feature>mpReactiveMessaging</feature>
</featureManager>

<variable name="http.port" defaultValue="9085"/>
14 changes: 7 additions & 7 deletions start/inventory/src/main/webapp/index.html
View file
Original file line number Diff line number Diff line change
@@ -31,13 +31,13 @@ <h2>Eclipse MicroProfile</h2>
For more information about the features used in this application, see the Open Liberty documentation:
<ul>
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpReactiveMessaging-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Reactive Messaging 3.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
<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>
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#concurrent-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta Concurrency 3.0</a></li>
<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>
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Health 4.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpReactiveMessaging.html" target="_blank" rel="noopener noreferrer">MicroProfile Reactive Messaging</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#concurrent.html" target="_blank" rel="noopener noreferrer">Jakarta Concurrency</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth.html" target="_blank" rel="noopener noreferrer"> MicroProfile Health</a></li>
</ul>
</p>
</div>
22 changes: 12 additions & 10 deletions start/query/src/main/liberty/config/server.xml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<server description="Query Service">

<featureManager>
<feature>beanValidation-3.0</feature>
<feature>restfulWS-3.1</feature>
<feature>cdi-4.0</feature>
<feature>concurrent-3.0</feature>
<feature>jsonb-3.0</feature>
<feature>mpHealth-4.0</feature>
<feature>mpConfig-3.1</feature>
<feature>mpOpenAPI-3.1</feature>
<feature>mpReactiveMessaging-3.0</feature>
<feature>mpRestClient-3.0</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-6.1</platform>
<feature>beanValidation</feature>
<feature>restfulWS</feature>
<feature>cdi</feature>
<feature>concurrent</feature>
<feature>jsonb</feature>
<feature>mpHealth</feature>
<feature>mpConfig</feature>
<feature>mpOpenAPI</feature>
<feature>mpReactiveMessaging</feature>
<feature>mpRestClient</feature>
</featureManager>

<variable name="http.port" defaultValue="9080"/>
14 changes: 7 additions & 7 deletions start/query/src/main/webapp/index.html
View file
Original file line number Diff line number Diff line change
@@ -31,13 +31,13 @@ <h2>Eclipse MicroProfile</h2>
For more information about the features used in this application, see the Open Liberty documentation:
<ul>
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpReactiveMessaging-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Reactive Messaging 3.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
<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>
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#concurrent-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta Concurrency 3.0</a></li>
<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>
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Health 4.0</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpReactiveMessaging.html" target="_blank" rel="noopener noreferrer">MicroProfile Reactive Messaging</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#concurrent.html" target="_blank" rel="noopener noreferrer">Jakarta Concurrency</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth.html" target="_blank" rel="noopener noreferrer"> MicroProfile Health</a></li>
</ul>
</p>
</div>
14 changes: 8 additions & 6 deletions start/system/src/main/liberty/config/server.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<server description="System Service">

<featureManager>
<feature>cdi-4.0</feature>
<feature>concurrent-3.0</feature>
<feature>jsonb-3.0</feature>
<feature>mpHealth-4.0</feature>
<feature>mpConfig-3.1</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-6.1</platform>
<feature>cdi</feature>
<feature>concurrent</feature>
<feature>jsonb</feature>
<feature>mpHealth</feature>
<feature>mpConfig</feature>
<!-- tag::featureMP[] -->
<feature>mpReactiveMessaging-3.0</feature>
<feature>mpReactiveMessaging</feature>
<!-- end::featureMP[] -->
</featureManager>

Loading