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

Merged
merged 7 commits into from
Feb 10, 2025
Merged

Use versionless features #318

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
116c4f3
use versionless feature
gkwan-ibm Nov 13, 2024
241872b
use versionless feature
gkwan-ibm Nov 13, 2024
247b973
use versionless feature
gkwan-ibm Nov 19, 2024
af5de43
Merge branch 'staging' into versionless
gkwan-ibm Dec 5, 2024
021ebf5
Merge branch 'staging' into versionless
gkwan-ibm Jan 7, 2025
4f39038
use versionless feature
gkwan-ibm Jan 30, 2025
54dcba0
use versionless feature
gkwan-ibm Jan 30, 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 @@ -45,10 +45,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
19 changes: 2 additions & 17 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2020, 2024 IBM Corporation and others.
// Copyright (c) 2020, 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 @@ -115,7 +115,7 @@ You have access to the following projects and can switch between them with 'oc p
If the https://cert-manager.io[cert-manager^] is not installed on your cluster yet, install it by running the following command:
[role='command']
```
oc apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.16.2/cert-manager.yaml
oc apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.16.3/cert-manager.yaml
```
For more information, see the https://cert-manager.io/docs/installation[cert-manager installation] documentation.

Expand Down Expand Up @@ -202,21 +202,6 @@ You can also confirm the installation of the operators from the web console.
Navigate to the OperatorHub.
From the categories on the left, you can filter to see only installed operators.

== Adding a private Docker credential

Docker limits container image pull requests for free DockerHub subscriptions.
For more information, see link:https://www.docker.com/increase-rate-limits[Understanding Docker Hub Rate Limiting].
If you have a Docker account with a Pro or Team subscription, you can add a private credential to avoid any errors as a result of the limits.

To add a private credential, navigate to the OpenShift web console and select *Workloads > Secrets* from the sidebar menu.
Ensure that the selected project is `openshift-config`.
Search for `pull-secret` and click the *three vertical dots* menu; then *Edit Secret*.
Scroll down and click *Add credentials*.
Enter `docker.io` to the *Registry Server Address* field,
your Docker user ID to the *Username* field,
and your Docker password to the *Password* field.
Click the *Save* button to save the credential.


== Deploying the Kafka cluster to OpenShift

Expand Down
2 changes: 1 addition & 1 deletion finish/inventory/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>6.1</version>
<version>7.0</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
Expand Down
16 changes: 9 additions & 7 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,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-7.0</platform>
<feature>restfulWS</feature>
<feature>cdi</feature>
<feature>concurrent</feature>
<feature>jsonb</feature>
<feature>mpHealth</feature>
<feature>mpConfig</feature>
<feature>mpReactiveMessaging</feature>
<feature>ssl-1.0</feature>
</featureManager>

Expand Down
Binary file added finish/inventory/src/main/webapp/favicon.ico
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions finish/inventory/src/main/webapp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,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
2 changes: 1 addition & 1 deletion finish/models/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>6.1</version>
<version>7.0</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion finish/system/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>6.1</version>
<version>7.0</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
Expand Down
14 changes: 8 additions & 6 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,12 +1,14 @@
<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>
<feature>mpReactiveMessaging-3.0</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-7.0</platform>
<feature>cdi</feature>
<feature>concurrent</feature>
<feature>jsonb</feature>
<feature>mpHealth</feature>
<feature>mpConfig</feature>
<feature>mpReactiveMessaging</feature>
</featureManager>

<variable name="http.port" defaultValue="9083"/>
Expand Down
Binary file added finish/system/src/main/webapp/favicon.ico
View file
Open in desktop
Binary file not shown.
14 changes: 7 additions & 7 deletions finish/system/src/main/webapp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,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
2 changes: 1 addition & 1 deletion start/inventory/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>6.1</version>
<version>7.0</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
Expand Down
16 changes: 9 additions & 7 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,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-7.0</platform>
<feature>restfulWS</feature>
<feature>cdi</feature>
<feature>concurrent</feature>
<feature>jsonb</feature>
<feature>mpHealth</feature>
<feature>mpConfig</feature>
<feature>mpReactiveMessaging</feature>
<feature>ssl-1.0</feature>
</featureManager>

Expand Down
Binary file added start/inventory/src/main/webapp/favicon.ico
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions start/inventory/src/main/webapp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,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
2 changes: 1 addition & 1 deletion start/models/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>6.1</version>
<version>7.0</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion start/system/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>6.1</version>
<version>7.0</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
Expand Down
14 changes: 8 additions & 6 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,12 +1,14 @@
<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>
<feature>mpReactiveMessaging-3.0</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-7.0</platform>
<feature>cdi</feature>
<feature>concurrent</feature>
<feature>jsonb</feature>
<feature>mpHealth</feature>
<feature>mpConfig</feature>
<feature>mpReactiveMessaging</feature>
</featureManager>

<variable name="http.port" defaultValue="9083"/>
Expand Down
Binary file added start/system/src/main/webapp/favicon.ico
View file
Open in desktop
Binary file not shown.
14 changes: 7 additions & 7 deletions start/system/src/main/webapp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,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