Merge pull request #220 from OpenLiberty/staging

Merge staging to prod - Use versionless feature and MP7
OpenLiberty · Feb 13, 2025 · d1eff5b · d1eff5b
2 parents dce74fe + 729c852
commit d1eff5b
Show file tree

Hide file tree

Showing 26 changed files with 115 additions and 86 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,4 +1,4 @@
-// Copyright (c) 2023 IBM Corporation and others.
+// Copyright (c) 2023, 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/
@@ -12,7 +12,7 @@
 :page-releasedate: 2022-09-14
 :page-essential: false
 :page-description: Learn how to use the SmallRye GraphQL client's typesafe interface to query and mutate data from multiple microservices.
-:page-tags: ['MicroProfile', 'Jakarta EE']
+:page-tags: ['microprofile', 'jakarta-ee']
 :page-related-guides: ['microprofile-graphql']
 :page-permalink: /guides/{projectid}
 :common-includes: https://raw.githubusercontent.com/OpenLiberty/guides-common/prod
@@ -179,7 +179,15 @@ include::{common-includes}/os-tabs.adoc[]
 ```
 --
 
-[.tab_content.mac_section.linux_section]
+[.tab_content.mac_section]
+--
+[role='command']
+```
+./scripts/startContainers.sh
+```
+--
+
+[.tab_content.linux_section]
 --
 [role='command']
 ```
@@ -331,7 +339,7 @@ include::{common-includes}/os-tabs.adoc[]
 ```
 --
 
-[.tab_content.mac_section.linux_section]
+[.tab_content.mac_section]
 --
 [role='command']
 ```
@@ -340,6 +348,14 @@ include::{common-includes}/os-tabs.adoc[]
 --
 
 
+[.tab_content.linux_section]
+--
+[role='command']
+```
+./scripts/stopContainers.sh
+```
+--
+
 == Testing the application
 
 Although you can test your application manually, you should rely on automated tests. In this section, you'll create integration tests using Testcontainers to verify that the basic operations you implemented function correctly. 

diff --git a/finish/graphql/pom.xml b/finish/graphql/pom.xml
@@ -30,7 +30,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/graphql/src/main/liberty/config/server.xml b/finish/graphql/src/main/liberty/config/server.xml
@@ -1,12 +1,14 @@
 <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>
-        <feature>mpRestClient-3.0</feature>
-        <feature>mpGraphQL-2.0</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>
+        <feature>mpRestClient</feature>
+        <feature>mpGraphQL</feature>
     </featureManager>
 
     <variable name="http.port" defaultValue="9082"/>

diff --git a/finish/graphql/src/main/webapp/index.html b/finish/graphql/src/main/webapp/index.html
@@ -41,13 +41,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/mpGraphQL-1.0.html" target="_blank" rel="noopener noreferrer">GraphQL 1.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/#mpRestClient-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 3.0</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/#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/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/mpGraphQL.html" target="_blank" rel="noopener noreferrer">GraphQL</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/#mpRestClient.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client</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/#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>
         </ul>
     </p>
 </div>

diff --git a/finish/models/pom.xml b/finish/models/pom.xml
@@ -23,7 +23,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/query/pom.xml b/finish/query/pom.xml
@@ -30,7 +30,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/query/src/main/liberty/config/server.xml b/finish/query/src/main/liberty/config/server.xml
@@ -1,11 +1,13 @@
 <server description="Query Service">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>cdi-4.0</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>mpConfig-3.1</feature>
-    <feature>mpOpenAPI-3.1</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-7.0</platform>
+    <feature>restfulWS</feature>
+    <feature>cdi</feature>
+    <feature>jsonb</feature>
+    <feature>mpConfig</feature>
+    <feature>mpOpenAPI</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9084"/>

diff --git a/finish/query/src/main/webapp/favicon.ico b/finish/query/src/main/webapp/favicon.ico
diff --git a/finish/query/src/main/webapp/index.html b/finish/query/src/main/webapp/index.html
@@ -44,13 +44,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/mpGraphQL-1.0.html" target="_blank" rel="noopener noreferrer">GraphQL 1.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/#mpOpenAPI-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile OpenAPI 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/#jaxrs-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 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/mpGraphQL.html" target="_blank" rel="noopener noreferrer">GraphQL</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/#mpOpenAPI.html" target="_blank" rel="noopener noreferrer">MicroProfile OpenAPI</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/#jaxrs.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 2.1</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
         </ul>
     </p>
 </div>

diff --git a/finish/system/pom.xml b/finish/system/pom.xml
@@ -30,7 +30,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,10 +1,12 @@
 <server description="Query Service">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>cdi-4.0</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>mpConfig-3.1</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-7.0</platform>
+    <feature>restfulWS</feature>
+    <feature>cdi</feature>
+    <feature>jsonb</feature>
+    <feature>mpConfig</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9080"/>

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/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 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/#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/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</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/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta 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/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
         </ul>
     </p>
 </div>

diff --git a/start/graphql/pom.xml b/start/graphql/pom.xml
@@ -30,7 +30,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/graphql/src/main/liberty/config/server.xml b/start/graphql/src/main/liberty/config/server.xml
@@ -1,12 +1,14 @@
 <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>
-        <feature>mpRestClient-3.0</feature>
-        <feature>mpGraphQL-2.0</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>
+        <feature>mpRestClient</feature>
+        <feature>mpGraphQL</feature>
     </featureManager>
 
     <variable name="http.port" defaultValue="9082"/>

diff --git a/start/graphql/src/main/webapp/index.html b/start/graphql/src/main/webapp/index.html
@@ -41,13 +41,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/mpGraphQL-1.0.html" target="_blank" rel="noopener noreferrer">GraphQL 1.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/#mpRestClient-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 3.0</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/#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/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/mpGraphQL.html" target="_blank" rel="noopener noreferrer">GraphQL</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/#mpRestClient.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client</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/#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>
         </ul>
     </p>
 </div>

diff --git a/start/models/pom.xml b/start/models/pom.xml
@@ -23,7 +23,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/query/pom.xml b/start/query/pom.xml
@@ -30,7 +30,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/query/src/main/liberty/config/server.xml b/start/query/src/main/liberty/config/server.xml
@@ -1,11 +1,13 @@
 <server description="Query Service">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>cdi-4.0</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>mpConfig-3.1</feature>
-    <feature>mpOpenAPI-3.1</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-7.0</platform>
+    <feature>restfulWS</feature>
+    <feature>cdi</feature>
+    <feature>jsonb</feature>
+    <feature>mpConfig</feature>
+    <feature>mpOpenAPI</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9084"/>

diff --git a/start/query/src/main/webapp/favicon.ico b/start/query/src/main/webapp/favicon.ico
diff --git a/start/query/src/main/webapp/index.html b/start/query/src/main/webapp/index.html
@@ -44,13 +44,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/mpGraphQL-1.0.html" target="_blank" rel="noopener noreferrer">GraphQL 1.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/#mpOpenAPI-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile OpenAPI 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/#jaxrs-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 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/mpGraphQL.html" target="_blank" rel="noopener noreferrer">GraphQL</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/#mpOpenAPI.html" target="_blank" rel="noopener noreferrer">MicroProfile OpenAPI</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/#jaxrs.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 2.1</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
         </ul>
     </p>
 </div>

diff --git a/start/system/pom.xml b/start/system/pom.xml
@@ -30,7 +30,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,10 +1,12 @@
 <server description="Query Service">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>cdi-4.0</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>mpConfig-3.1</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-7.0</platform>
+    <feature>restfulWS</feature>
+    <feature>cdi</feature>
+    <feature>jsonb</feature>
+    <feature>mpConfig</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9080"/>

diff --git a/start/system/src/main/webapp/favicon.ico b/start/system/src/main/webapp/favicon.ico