From c638053487c1afd2b6b6e2e824ae954900eaa876 Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Thu, 29 Feb 2024 12:36:36 -0500
Subject: [PATCH] Update to MP6.1 (#128)

* update versions

* Update pom.xml

* update versions

* update start pom.xml

* remove jakarta.xml.bind-api dependency

---------

Co-authored-by: Ruilin Ma <this.is.millerma@gmail.com>
---
 .github/dependabot.yml                    |  7 +++++++
 .github/workflows/add-pr-to-project.yml   | 18 ++++++++++++++++++
 finish/pom.xml                            | 10 ++--------
 finish/src/main/liberty/config/server.xml |  6 +++---
 start/pom.xml                             | 10 ++--------
 start/src/main/liberty/config/server.xml  |  6 +++---
 6 files changed, 35 insertions(+), 22 deletions(-)
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/workflows/add-pr-to-project.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..00dad74
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: monthly
+  open-pull-requests-limit: 50
diff --git a/.github/workflows/add-pr-to-project.yml b/.github/workflows/add-pr-to-project.yml
new file mode 100644
index 0000000..0b1643a
--- /dev/null
+++ b/.github/workflows/add-pr-to-project.yml
@@ -0,0 +1,18 @@
+name: Add PRs to Dependabot PRs dashboard
+
+on:
+  pull_request:
+    types:
+      - opened
+      - labeled
+
+jobs:
+  add-to-project:
+    name: Add PR to dashboard
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@v0.5.0
+        with:
+          project-url: https://github.com/orgs/OpenLiberty/projects/26
+          github-token: ${{ secrets.ADMIN_BACKLOG }}
+          labeled: dependencies
diff --git a/finish/pom.xml b/finish/pom.xml
index c2ed572..ab54669 100644
--- a/finish/pom.xml
+++ b/finish/pom.xml
@@ -28,16 +28,10 @@
             <!-- tag::microprofile[] -->
             <artifactId>microprofile</artifactId>
             <!-- end::microprofile[] -->
-            <version>6.0</version>
+            <version>6.1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
-        <!-- For JDK 9 & 10 support -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -52,7 +46,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.8.2</version>
+                <version>3.10</version>
             </plugin>
         </plugins>
     </build>
diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml
index 065f4af..44473e2 100644
--- a/finish/src/main/liberty/config/server.xml
+++ b/finish/src/main/liberty/config/server.xml
@@ -6,10 +6,10 @@
       <feature>jsonp-2.1</feature>
   </featureManager>
 
-  <variable name="default.http.port" defaultValue="9080"/>
-  <variable name="default.https.port" defaultValue="9443"/>
+  <variable name="http.port" defaultValue="9080"/>
+  <variable name="https.port" defaultValue="9443"/>
 
-  <httpEndpoint host="*" httpPort="${default.http.port}" httpsPort="${default.https.port}" id="defaultHttpEndpoint" />
+  <httpEndpoint host="*" httpPort="${http.port}" httpsPort="${https.port}" id="defaultHttpEndpoint" />
 
   <webApplication location="guide-rest-client-angularjs.war" contextRoot="/"/>
 </server>
diff --git a/start/pom.xml b/start/pom.xml
index c2ed572..ab54669 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -28,16 +28,10 @@
             <!-- tag::microprofile[] -->
             <artifactId>microprofile</artifactId>
             <!-- end::microprofile[] -->
-            <version>6.0</version>
+            <version>6.1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
-        <!-- For JDK 9 & 10 support -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -52,7 +46,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.8.2</version>
+                <version>3.10</version>
             </plugin>
         </plugins>
     </build>
diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml
index 065f4af..44473e2 100644
--- a/start/src/main/liberty/config/server.xml
+++ b/start/src/main/liberty/config/server.xml
@@ -6,10 +6,10 @@
       <feature>jsonp-2.1</feature>
   </featureManager>
 
-  <variable name="default.http.port" defaultValue="9080"/>
-  <variable name="default.https.port" defaultValue="9443"/>
+  <variable name="http.port" defaultValue="9080"/>
+  <variable name="https.port" defaultValue="9443"/>
 
-  <httpEndpoint host="*" httpPort="${default.http.port}" httpsPort="${default.https.port}" id="defaultHttpEndpoint" />
+  <httpEndpoint host="*" httpPort="${http.port}" httpsPort="${https.port}" id="defaultHttpEndpoint" />
 
   <webApplication location="guide-rest-client-angularjs.war" contextRoot="/"/>
 </server>