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.

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

Open
wants to merge 5 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 9 additions & 5 deletions .github/workflows/test.yml
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 @@ -44,14 +44,18 @@ 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
run: sudo ../scripts/testApp.sh
- name: Post tests
if: always()
run: sudo docker images
run: |
sudo docker images
echo bitnami/kafka:latest version:
sudo docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.version\"}}" bitnami/kafka:latest
16 changes: 9 additions & 7 deletions finish/inventory/src/main/liberty/config/server.xml
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"/>
Expand Down
Binary file added finish/inventory/src/main/webapp/favicon.ico
Binary file not shown.
16 changes: 8 additions & 8 deletions finish/inventory/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ <h2>Eclipse MicroProfile</h2>
<p>
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/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</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>
Expand Down
14 changes: 8 additions & 6 deletions finish/system/src/main/liberty/config/server.xml
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>

Expand Down
Binary file added finish/system/src/main/webapp/favicon.ico
Binary file not shown.
14 changes: 7 additions & 7 deletions finish/system/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ <h2>Eclipse MicroProfile</h2>
<p>
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/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</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>
Expand Down
16 changes: 9 additions & 7 deletions start/inventory/src/main/liberty/config/server.xml
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"/>
Expand Down
Binary file added start/inventory/src/main/webapp/favicon.ico
Binary file not shown.
16 changes: 8 additions & 8 deletions start/inventory/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ <h2>Eclipse MicroProfile</h2>
<p>
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/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</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>
Expand Down
14 changes: 8 additions & 6 deletions start/system/src/main/liberty/config/server.xml
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>

Expand Down
Binary file added start/system/src/main/webapp/favicon.ico
Binary file not shown.
14 changes: 7 additions & 7 deletions start/system/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ <h2>Eclipse MicroProfile</h2>
<p>
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/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</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>
Expand Down
Loading