Merge pull request #327 from OpenLiberty/staging

Merge staging to prod - Use versionless feature and MP7
OpenLiberty · Feb 13, 2025 · 74e84e3 · 74e84e3
2 parents 3f4dc9f + b524e42
commit 74e84e3
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 33 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,7 +46,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 21
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'semeru'
         java-version: 21

diff --git a/README.adoc b/README.adoc
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2024 IBM Corporation and others.
+// Copyright (c) 2018, 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/
@@ -250,7 +250,7 @@ server.xml
 include::finish/backendServices/src/main/liberty/config/server.xml[]
 ----
 
-The [hotspot=schema-generation file=0]`jakarta.persistence.schema-generation` properties are used here so that you aren't required to manually create a database table to run this sample application. To learn more about the JPA schema generation and available properties, see https://jakarta.ee/specifications/persistence/3.0/jakarta-persistence-spec-3.0.html#a12917[Schema Generation, Section 9.4 of the JPA Specification]
+The [hotspot=schema-generation file=0]`jakarta.persistence.schema-generation` properties are used here so that you aren't required to manually create a database table to run this sample application. To learn more about the JPA schema generation and available properties, see https://jakarta.ee/specifications/persistence/3.1/jakarta-persistence-spec-3.1.html#a12917[Schema Generation, Section 9.4 of the JPA Specification^]
 
 // =================================================================================================
 // Performing CRUD operations using JPA

diff --git a/finish/backendServices/pom.xml b/finish/backendServices/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/backendServices/src/main/liberty/config/server.xml b/finish/backendServices/src/main/liberty/config/server.xml
@@ -1,11 +1,12 @@
 <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>persistence-3.1</feature>
+    <platform>jakartaee-10.0</platform>
+    <feature>restfulWS</feature>
+    <feature>jsonb</feature>
+    <feature>jsonp</feature>
+    <feature>cdi</feature>
+    <feature>persistence</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="5050" />

diff --git a/finish/frontendUI/pom.xml b/finish/frontendUI/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/frontendUI/src/main/liberty/config/server.xml b/finish/frontendUI/src/main/liberty/config/server.xml
@@ -1,13 +1,15 @@
 <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>faces-4.0</feature>
-    <feature>mpConfig-3.1</feature>
-    <feature>mpRestClient-3.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>faces</feature>
+    <feature>mpConfig</feature>
+    <feature>mpRestClient</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9090"/>

diff --git a/finish/frontendUI/src/main/webapp/favicon.ico b/finish/frontendUI/src/main/webapp/favicon.ico
diff --git a/start/backendServices/pom.xml b/start/backendServices/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/backendServices/src/main/liberty/config/server.xml b/start/backendServices/src/main/liberty/config/server.xml
@@ -1,11 +1,12 @@
 <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>persistence-3.1</feature>
+    <platform>jakartaee-10.0</platform>
+    <feature>restfulWS</feature>
+    <feature>jsonb</feature>
+    <feature>jsonp</feature>
+    <feature>cdi</feature>
+    <feature>persistence</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="5050" />

diff --git a/start/frontendUI/pom.xml b/start/frontendUI/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/frontendUI/src/main/liberty/config/server.xml b/start/frontendUI/src/main/liberty/config/server.xml
@@ -1,13 +1,15 @@
 <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>faces-4.0</feature>
-    <feature>mpConfig-3.1</feature>
-    <feature>mpRestClient-3.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>faces</feature>
+    <feature>mpConfig</feature>
+    <feature>mpRestClient</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9090"/>

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