Merge pull request #256 from OpenLiberty/staging

Merge staging to prod - Use versionless feature and MP7
OpenLiberty · Feb 13, 2025 · c0df93d · c0df93d
2 parents fe350d6 + 22cbdfc
commit c0df93d
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 31 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
@@ -47,10 +47,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,7 +1,7 @@
 // INSTRUCTION: Please remove all comments that start INSTRUCTION prior to commit. Most comments should be removed, although not the copyright.
 // INSTRUCTION: The copyright statement must appear at the top of the file
 //
-// Copyright (c) 2017, 2024 IBM Corporation and others.
+// Copyright (c) 2017, 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/
@@ -155,8 +155,8 @@ You'll see an image called `system:1.0-SNAPSHOT` listed in a table similar to th
 ----
 REPOSITORY                     TAG                              IMAGE ID        CREATED          SIZE
 system                         1.0-SNAPSHOT                     8856039f4c42    9 minutes ago    745MB
-istio/proxyv2                  1.20.3                           7a3aaffcf645    3 weeks ago      347MB
-istio/pilot                    1.20.3                           4974b5b22dcc    3 weeks ago      261MB
+istio/proxyv2                  1.24.2                           7a3aaffcf645    3 weeks ago      347MB
+istio/pilot                    1.24.2                           4974b5b22dcc    3 weeks ago      261MB
 icr.io/appcafe/open-liberty    kernel-slim-java11-openj9-ubi    d6ef646493e1    8 days ago       729MB
 ----
 

diff --git a/finish/pom.xml b/finish/pom.xml
@@ -34,7 +34,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/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml
@@ -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-7.0</platform>
+    <feature>restfulWS</feature>
+    <feature>jsonb</feature>
+    <feature>jsonp</feature>
+    <feature>cdi</feature>
+    <feature>mpConfig</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9090"/>

diff --git a/finish/src/main/webapp/favicon.ico b/finish/src/main/webapp/favicon.ico
diff --git a/finish/src/main/webapp/index.html b/finish/src/main/webapp/index.html
@@ -34,12 +34,12 @@ <h2>MicroProfile</h2>
         <div id="technologies">
             <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.1.html">MicroProfile 6.1</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/#jsonp-2.1.html">Jakarta JSON Processing 2.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.1.html">MicroProfile Config 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/#microProfile.html">MicroProfile</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/#jsonp.html">Jakarta JSON Processing</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</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/pom.xml b/start/pom.xml
@@ -34,7 +34,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/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml
@@ -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-7.0</platform>
+    <feature>restfulWS</feature>
+    <feature>jsonb</feature>
+    <feature>jsonp</feature>
+    <feature>cdi</feature>
+    <feature>mpConfig</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9090"/>

diff --git a/start/src/main/webapp/favicon.ico b/start/src/main/webapp/favicon.ico
diff --git a/start/src/main/webapp/index.html b/start/src/main/webapp/index.html
@@ -34,12 +34,12 @@ <h2>MicroProfile</h2>
         <div id="technologies">
             <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.1.html">MicroProfile 6.1</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/#jsonp-2.1.html">Jakarta JSON Processing 2.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.1.html">MicroProfile Config 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/#microProfile.html">MicroProfile</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/#jsonp.html">Jakarta JSON Processing</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</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>