Merge pull request #152 from OpenLiberty/staging

Merge staging to prod - Use versionless feature and MP7

Author: gkwan-ibm

Diff for: .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 for: finish/pom.xml

@@ -29,14 +29,14 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>6.1</version>
+            <version>7.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.7.4</version>
+            <version>42.7.5</version>
             <scope>provided</scope>
         </dependency>
 

Diff for: finish/src/main/liberty/config/server.xml

@@ -2,10 +2,12 @@
 <server description="inventory">
 
     <featureManager>
-        <feature>jsonb-3.0</feature>
-        <feature>mpHealth-4.0</feature>
-        <feature>mpOpenAPI-3.1</feature>
-        <feature>persistence-3.1</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-7.0</platform>
+        <feature>jsonb</feature>
+        <feature>mpHealth</feature>
+        <feature>mpOpenAPI</feature>
+        <feature>persistence</feature>
         <feature>transportSecurity-1.0</feature>
         <feature>monitor-1.0</feature>
     </featureManager>

Diff for: start/pom.xml

@@ -29,14 +29,14 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>6.1</version>
+            <version>7.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.7.4</version>
+            <version>42.7.5</version>
             <scope>provided</scope>
         </dependency>
 

Diff for: start/src/main/liberty/config/server.xml

@@ -2,10 +2,12 @@
 <server description="inventory">
 
     <featureManager>
-        <feature>jsonb-3.0</feature>
-        <feature>mpHealth-4.0</feature>
-        <feature>mpOpenAPI-3.1</feature>
-        <feature>persistence-3.1</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-7.0</platform>
+        <feature>jsonb</feature>
+        <feature>mpHealth</feature>
+        <feature>mpOpenAPI</feature>
+        <feature>persistence</feature>
         <feature>transportSecurity-1.0</feature>
         <feature>monitor-1.0</feature>
     </featureManager>