use versionless feature

Signed-off-by: Gilbert Kwan <[email protected]>
OpenLiberty · Nov 13, 2024 · df062fa · df062fa
1 parent a03867c
commit df062fa
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 50 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
@@ -46,10 +46,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/finish/query/src/main/liberty/config/server.xml b/finish/query/src/main/liberty/config/server.xml
@@ -2,12 +2,14 @@
 <server description="query service">
 
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>cdi-4.0</feature>
-        <feature>mpConfig-3.0</feature>
-        <feature>mpRestClient-3.0</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>
+        <feature>mpRestClient</feature>
         <feature>ssl-1.0</feature>
     </featureManager>
 

diff --git a/finish/query/src/main/webapp/index.html b/finish/query/src/main/webapp/index.html
@@ -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.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.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/#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/#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/#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.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity-5.0.html" target="_blank" rel="noopener noreferrer">Application Security (Jakarta Security) 5.0</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/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</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 3.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity.html" target="_blank" rel="noopener noreferrer">Application Security (Jakarta Security)</a></li>
         </ul>
     </p>
 </div>

diff --git a/finish/system/src/main/liberty/config/server.xml b/finish/system/src/main/liberty/config/server.xml
@@ -1,11 +1,13 @@
 <server description="system service">
 
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>cdi-4.0</feature>
-        <feature>mpConfig-3.0</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>
         <feature>ssl-1.0</feature>
     </featureManager>
 

diff --git a/finish/system/src/main/webapp/index.html b/finish/system/src/main/webapp/index.html
@@ -35,12 +35,12 @@ <h2>Eclipse MicroProfile</h2>
             <p>For more information about the features used in the application, see the Open Liberty documentation:</p>
             <ul>
                 <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.0.html">MicroProfile 6.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html">Jakarta RESTful Web Services 3.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html">Jakarta Contexts and Dependency Injection 4.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.0.html">MicroProfile Config 3.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html">Jakarta JSON Processing 2.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity-5.0.html">Application Security 5.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/#restfulWS.html">Jakarta RESTful Web Services</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#cdi.html">Jakarta Contexts and Dependency Injection</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html">MicroProfile Config 3.0</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html">Jakarta JSON Processing</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity.html">Application Security</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
             </ul>
         </div>
     </body>

diff --git a/start/query/src/main/liberty/config/server.xml b/start/query/src/main/liberty/config/server.xml
@@ -2,12 +2,14 @@
 <server description="query service">
 
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>cdi-4.0</feature>
-        <feature>mpConfig-3.0</feature>
-        <feature>mpRestClient-3.0</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>
+        <feature>mpRestClient</feature>
         <feature>ssl-1.0</feature>
     </featureManager>
 

diff --git a/start/query/src/main/webapp/index.html b/start/query/src/main/webapp/index.html
@@ -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.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.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/#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/#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/#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.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity-5.0.html" target="_blank" rel="noopener noreferrer">Application Security (Jakarta Security) 5.0</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/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</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 3.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity.html" target="_blank" rel="noopener noreferrer">Application Security (Jakarta Security)</a></li>
         </ul>
     </p>
 </div>

diff --git a/start/system/src/main/liberty/config/server.xml b/start/system/src/main/liberty/config/server.xml
@@ -1,11 +1,13 @@
 <server description="system service">
 
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>cdi-4.0</feature>
-        <feature>mpConfig-3.0</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>
         <feature>ssl-1.0</feature>
     </featureManager>
 

diff --git a/start/system/src/main/webapp/index.html b/start/system/src/main/webapp/index.html
@@ -35,12 +35,12 @@ <h2>Eclipse MicroProfile</h2>
             <p>For more information about the features used in the application, see the Open Liberty documentation:</p>
             <ul>
                 <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.0.html">MicroProfile 6.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html">Jakarta RESTful Web Services 3.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html">Jakarta Contexts and Dependency Injection 4.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.0.html">MicroProfile Config 3.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html">Jakarta JSON Processing 2.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity-5.0.html">Application Security 5.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/#restfulWS.html">Jakarta RESTful Web Services</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#cdi.html">Jakarta Contexts and Dependency Injection</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html">MicroProfile Config 3.0</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html">Jakarta JSON Processing</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity.html">Application Security</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
             </ul>
         </div>
     </body>