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

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

Use versionless features #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb14a28
use versionless feature
gkwan-ibm Nov 13, 2024
cab3cd9
use versionless feature
gkwan-ibm Nov 19, 2024
86764cc
use versionless feature
gkwan-ibm Nov 27, 2024
5c10eee
Merge branch 'staging' into versionless
gkwan-ibm Dec 2, 2024
926a366
Merge branch 'staging' into versionless
gkwan-ibm Dec 2, 2024
4663eb9
Merge branch 'staging' into versionless
gkwan-ibm Jan 7, 2025
eecd2b9
Update README.adoc
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 @@ -44,10 +44,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
6 changes: 3 additions & 3 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2022, 2024 IBM Corporation and others.
// Copyright (c) 2022, 2025 IBM Corporation and others.
// Licensed under Creative Commons Attribution-NoDerivatives
// 4.0 International (CC BY-ND 4.0)
// https://creativecommons.org/licenses/by-nd/4.0/
Expand Down Expand Up @@ -52,7 +52,7 @@ with each other in different containers.

== Additional prerequisites

Before you begin, Podman needs to be installed. For installation instructions, refer to the https://podman.io/getting-started/installation[official Podman documentation^]. You will build and run the microservices in containers.
Before you begin, Podman needs to be installed. For installation instructions, refer to the https://podman.io/docs/installation[official Podman documentation^]. You will build and run the microservices in containers.

If you are running Mac or Windows, make sure to start your Podman-managed VM before you proceed.

Expand Down Expand Up @@ -194,7 +194,7 @@ A `Containerfile` file is a collection of instructions for building a container
The `podman build` command uses Buildah to build your container image. As each instruction in a `Containerfile` file runs, a new image layer is created.
These layers, which are known as intermediate images, are created when a change is made to your container image.

Learn more about Podman on the https://podman.io/getting-started/[official Podman page^].
Learn more about Podman on the https://podman.io/get-started[official Podman page^].

=== Creating your Containerfile files
You will be creating two container images to run the `inventory` service and `system` service. The first step is to create `Containerfile` files for both services.
Expand Down
12 changes: 7 additions & 5 deletions finish/inventory/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>jsonb-3.0</feature>
<feature>jsonp-2.1</feature>
<feature>cdi-4.0</feature>
<feature>mpConfig-3.1</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-6.1</platform>
<feature>restfulWS</feature>
<feature>jsonb</feature>
<feature>jsonp</feature>
<feature>cdi</feature>
<feature>mpConfig</feature>
</featureManager>

<!-- tag::httpPort[] -->
Expand Down
Binary file added finish/inventory/src/main/webapp/favicon.ico
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions finish/inventory/src/main/webapp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2016, 2021 IBM Corp.
Copyright (c) 2016, 2024 IBM Corp.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,11 +30,11 @@ <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/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta 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/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</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/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta 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/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
</ul>
</p>
</div>
Expand Down
9 changes: 5 additions & 4 deletions finish/system/src/main/liberty/config/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<server description="Sample Liberty server">

<featureManager>
<feature>restfulWS-3.1</feature>
<feature>jsonb-3.0</feature>
<feature>jsonp-2.1</feature>
<feature>cdi-4.0</feature>
<platform>jakartaee-10.0</platform>
<feature>restfulWS</feature>
<feature>jsonb</feature>
<feature>jsonp</feature>
<feature>cdi</feature>
</featureManager>

<variable name="http.port" defaultValue="9080" />
Expand Down
Binary file added finish/system/src/main/webapp/favicon.ico
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions finish/system/src/main/webapp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2016, 2021 IBM Corp.
Copyright (c) 2016, 2024 IBM Corp.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,10 +30,10 @@ <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/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta 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/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</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/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta 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/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
</ul>
</p>
</div>
Expand Down
12 changes: 7 additions & 5 deletions start/inventory/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>jsonb-3.0</feature>
<feature>jsonp-2.1</feature>
<feature>cdi-4.0</feature>
<feature>mpConfig-3.1</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-6.1</platform>
<feature>restfulWS</feature>
<feature>jsonb</feature>
<feature>jsonp</feature>
<feature>cdi</feature>
<feature>mpConfig</feature>
</featureManager>

<variable name="http.port" defaultValue="9081" />
Expand Down
Binary file added start/inventory/src/main/webapp/favicon.ico
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions start/inventory/src/main/webapp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2016, 2021 IBM Corp.
Copyright (c) 2016, 2024 IBM Corp.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,11 +30,11 @@ <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/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta 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/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</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/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta 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/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
</ul>
</p>
</div>
Expand Down
9 changes: 5 additions & 4 deletions start/system/src/main/liberty/config/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<server description="Sample Liberty server">

<featureManager>
<feature>restfulWS-3.1</feature>
<feature>jsonb-3.0</feature>
<feature>jsonp-2.1</feature>
<feature>cdi-4.0</feature>
<platform>jakartaee-10.0</platform>
<feature>restfulWS</feature>
<feature>jsonb</feature>
<feature>jsonp</feature>
<feature>cdi</feature>
</featureManager>

<variable name="http.port" defaultValue="9080" />
Expand Down
Binary file added start/system/src/main/webapp/favicon.ico
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions start/system/src/main/webapp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2016, 2021 IBM Corp.
Copyright (c) 2016, 2024 IBM Corp.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,10 +30,10 @@ <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/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta 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/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</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/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta 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/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
</ul>
</p>
</div>
Expand Down
Loading