From fda90015037185154ec902b5585563cffa6c5336 Mon Sep 17 00:00:00 2001
From: Phil Smart <philip.smart@jisc.ac.uk>
Date: Mon, 22 Aug 2022 09:39:45 +0100
Subject: [PATCH 1/4] Add Java 11 workflow action

---
 .github/workflows/maven.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..88154a2
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,31 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ maint-0.9 ]
+  pull_request:
+    branches: [ maint-0.9 ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'zulu'      
+        java-version: '11'
+        cache: 'maven'
+    - name: Build with Maven
+      run: mvn -B verify checkstyle:checkstyle --file pom.xml
+    - name: Upload jar artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: ukf-mda-snapshot
+        path: target/ukf-mda*.jar

From 631d38dec1f713d0d5aea04e6bb798b6dde86a0e Mon Sep 17 00:00:00 2001
From: Phil Smart <philip.smart@jisc.ac.uk>
Date: Mon, 22 Aug 2022 09:41:28 +0100
Subject: [PATCH 2/4] Change PR and push branch

---
 .github/workflows/maven.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 88154a2..9b73e50 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -5,9 +5,9 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ maint-0.9 ]
+    branches: [ main ]
   pull_request:
-    branches: [ maint-0.9 ]
+    branches: [ main ]
 
 jobs:
   build:

From 217d49eba3125089af47f9fb9184464b169bbd98 Mon Sep 17 00:00:00 2001
From: Phil Smart <philip.smart@jisc.ac.uk>
Date: Mon, 22 Aug 2022 10:12:21 +0100
Subject: [PATCH 3/4] Update java distribution to Corretto

---
 .github/workflows/maven.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9b73e50..350cbc5 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -17,9 +17,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
-        distribution: 'zulu'      
+        distribution: 'corretto'      
         java-version: '11'
         cache: 'maven'
     - name: Build with Maven

From b2aa06758421436e6adf2a1a840d26adc468a030 Mon Sep 17 00:00:00 2001
From: Phil Smart <philip.smart@jisc.ac.uk>
Date: Mon, 22 Aug 2022 10:38:16 +0100
Subject: [PATCH 4/4] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index f9f4617..30b4a18 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # ukf-mda
 
+Update to test PR action trigger
+
 ## UK federation Aggregator Beans
 
 This project contains a collection of beans supporting metadata aggregation for the UK federation, based on the [Shibboleth metadata aggregator framework](http://shibboleth.net/products/metadata-aggregator.html).