Use versionless features (#190)

* use versionless feature Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com> * use versionless feature Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com> * use versionless feature Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com> * use versionless feature Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com> * Update README.adoc * use versionless feature Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com> * Update index.html * Update index.html --------- Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com>
OpenLiberty · Feb 5, 2025 · cbd8913 · cbd8913
1 parent 9206b1a
commit cbd8913
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 27 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
@@ -44,10 +44,11 @@ jobs:
       run:
         working-directory: finish
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'semeru'
           java-version: 17
       - run: unset _JAVA_OPTIONS
       - name: Run tests

diff --git a/README.adoc b/README.adoc
@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2024 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/
@@ -73,8 +73,9 @@ docker-compose -f "pact-broker/docker-compose.yml" up -d --build
 When the Pact Broker is running, you'll see the following output:
 [role="no_copy"]
 ```
-Creating pact-broker_postgres_1 ... done
-Creating pact-broker_pact-broker_1 ... done
+...
+Container pact-broker-postgres-1      Started
+Container pact-broker-pact-broker-1   Started
 ```
 
 // Static guide instruction
@@ -436,7 +437,7 @@ endif::[]
 [role='command']
 ```
 docker-compose -f "pact-broker/docker-compose.yml" down
-docker rmi postgres:16.2
+docker rmi postgres:17.2
 docker rmi pactfoundation/pact-broker:latest
 docker volume rm pact-broker_postgres-volume
 ```

diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml
@@ -22,7 +22,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/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml
@@ -1,8 +1,9 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-      <feature>restfulWS-3.1</feature>
-      <feature>jsonb-3.0</feature>
+      <platform>jakartaee-10.0</platform>
+      <feature>restfulWS</feature>
+      <feature>jsonb</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9091"/>

diff --git a/finish/inventory/src/main/webapp/favicon.ico b/finish/inventory/src/main/webapp/favicon.ico
diff --git a/finish/inventory/src/main/webapp/index.html b/finish/inventory/src/main/webapp/index.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016, 2020 IBM Corp.
+  Copyright (c) 2016, 2025 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ <h2>Eclipse MicroProfile</h2>
     </p>
     <p>
         For more information about the features used in this application, see the Open Liberty documentation:
-        <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/#restfulWS.html">Jakarta RESTful Web Services</a></li>
     </p>
 </div>
 </body>

diff --git a/finish/system/pom.xml b/finish/system/pom.xml
@@ -25,7 +25,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,8 +1,9 @@
 <server description="Sample Liberty server">
     <!-- tag::features[] -->
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonb-3.0</feature>
+        <platform>jakartaee-10.0</platform>
+        <feature>restfulWS</feature>
+        <feature>jsonb</feature>
     </featureManager>
     <!-- end::features[] -->
     <variable name="http.port" defaultValue="9090"/>

diff --git a/pact-broker/docker-compose.yml b/pact-broker/docker-compose.yml
@@ -1,7 +1,6 @@
-version: "3"
 services:
   postgres:
-    image: postgres:16.2
+    image: postgres:17.2
     healthcheck:
       test: psql postgres --command "select 1" -U postgres
     ports:

diff --git a/scripts/testApp.sh b/scripts/testApp.sh
@@ -43,6 +43,6 @@ mvn -ntp failsafe:integration-test liberty:stop
 ## Remove the pact-broker application
 cd ../..
 docker compose -f "pact-broker/docker-compose.yml" down
-docker rmi postgres:16.2
+docker rmi postgres:17.2
 docker rmi pactfoundation/pact-broker:latest
 docker volume rm pact-broker_postgres-volume
diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml
@@ -22,7 +22,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/inventory/src/main/liberty/config/server.xml b/start/inventory/src/main/liberty/config/server.xml
@@ -1,8 +1,9 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-      <feature>restfulWS-3.1</feature>
-      <feature>jsonb-3.0</feature>
+      <platform>jakartaee-10.0</platform>
+      <feature>restfulWS</feature>
+      <feature>jsonb</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9091"/>

diff --git a/start/inventory/src/main/webapp/favicon.ico b/start/inventory/src/main/webapp/favicon.ico
diff --git a/start/inventory/src/main/webapp/index.html b/start/inventory/src/main/webapp/index.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016, 2020 IBM Corp.
+  Copyright (c) 2016, 2025 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ <h2>Eclipse MicroProfile</h2>
     </p>
     <p>
         For more information about the features used in this application, see the Open Liberty documentation:
-        <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/#restfulWS.html">Jakarta RESTful Web Services</a></li>
     </p>
 </div>
 </body>

diff --git a/start/system/pom.xml b/start/system/pom.xml
@@ -25,7 +25,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,8 +1,9 @@
 <server description="Sample Liberty server">
     <!-- tag::features[] -->
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonb-3.0</feature>
+        <platform>jakartaee-10.0</platform>
+        <feature>restfulWS</feature>
+        <feature>jsonb</feature>
     </featureManager>
     <!-- end::features[] -->
     <variable name="http.port" defaultValue="9090"/>