Use versionless features (#318)

* use versionless feature Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com> * use versionless feature Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com> * use versionless feature Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com> * use versionless feature Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com> * use versionless feature Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com> --------- Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com>
OpenLiberty · Feb 10, 2025 · 555604a · 555604a
1 parent 7a03143
commit 555604a
Show file tree

Hide file tree

Showing 20 changed files with 77 additions and 83 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -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
@@ -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

diff --git a/README.adoc b/README.adoc
@@ -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/
@@ -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.
 
@@ -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
 

diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml
@@ -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>

diff --git a/finish/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml
@@ -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>
 

diff --git a/finish/inventory/src/main/webapp/favicon.ico b/finish/inventory/src/main/webapp/favicon.ico
diff --git a/finish/inventory/src/main/webapp/index.html b/finish/inventory/src/main/webapp/index.html
@@ -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>

diff --git a/finish/models/pom.xml b/finish/models/pom.xml
@@ -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>

diff --git a/finish/system/pom.xml b/finish/system/pom.xml
@@ -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>

diff --git a/finish/system/src/main/liberty/config/server.xml b/finish/system/src/main/liberty/config/server.xml
@@ -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"/>

diff --git a/finish/system/src/main/webapp/favicon.ico b/finish/system/src/main/webapp/favicon.ico
diff --git a/finish/system/src/main/webapp/index.html b/finish/system/src/main/webapp/index.html
@@ -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>

diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml
@@ -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>

diff --git a/start/inventory/src/main/liberty/config/server.xml b/start/inventory/src/main/liberty/config/server.xml
@@ -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>
 

diff --git a/start/inventory/src/main/webapp/favicon.ico b/start/inventory/src/main/webapp/favicon.ico
diff --git a/start/inventory/src/main/webapp/index.html b/start/inventory/src/main/webapp/index.html
@@ -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>

diff --git a/start/models/pom.xml b/start/models/pom.xml
@@ -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>

diff --git a/start/system/pom.xml b/start/system/pom.xml
@@ -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>

diff --git a/start/system/src/main/liberty/config/server.xml b/start/system/src/main/liberty/config/server.xml
@@ -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"/>

diff --git a/start/system/src/main/webapp/favicon.ico b/start/system/src/main/webapp/favicon.ico
diff --git a/start/system/src/main/webapp/index.html b/start/system/src/main/webapp/index.html
@@ -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>