From 55f17a962d9f4e8df805d528e813beda265b9426 Mon Sep 17 00:00:00 2001
From: raghav-agarwal <bly.raghav@gmail.com>
Date: Wed, 4 Oct 2023 14:11:38 +0530
Subject: [PATCH 1/3] Update git actions

---
 .../{maven-build.yml => maven-pr-build.yml}   | 19 -------------------
 1 file changed, 19 deletions(-)
 rename .github/workflows/{maven-build.yml => maven-pr-build.yml} (69%)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-pr-build.yml
similarity index 69%
rename from .github/workflows/maven-build.yml
rename to .github/workflows/maven-pr-build.yml
index 87171c9..50b9015 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-pr-build.yml
@@ -9,8 +9,6 @@
 name: Java CI with Maven
 
 on:
-  push:
-    branches: [ "master" ]
   pull_request:
     branches: [ "master" ]
 
@@ -28,11 +26,6 @@ jobs:
         cache: maven
     - name: Build with Maven
       run: mvn -B package --file pom.xml
-
-    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-    - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
-      
     - name: Generate JaCoCo Badge
       id: jacoco
       uses: cicirello/jacoco-badge-generator@v2
@@ -41,22 +34,10 @@ jobs:
         generate-coverage-endpoint: true
         generate-branches-endpoint: true
         generate-branches-badge: true
-
     - name: Log coverage percentage
       run: |
         echo "coverage = ${{ steps.jacoco.outputs.coverage }}"
         echo "branch coverage = ${{ steps.jacoco.outputs.branches }}"
-
-    - name: Commit the badge (if it changed)
-      run: |
-        if [[ `git status --porcelain` ]]; then
-          git config --global user.name 'Raghav Agarwal'
-          git config --global user.email 'bly.raghav@gmail.com'
-          git add -A
-          git commit -m "Autogenerated JaCoCo coverage badge"
-          git push
-        fi
-
     - name: Upload JaCoCo coverage report
       uses: actions/upload-artifact@v2
       with:

From c73ed04e21d1cc8aa6dfed249d4afe290ac77f7f Mon Sep 17 00:00:00 2001
From: raghav-agarwal <bly.raghav@gmail.com>
Date: Wed, 4 Oct 2023 14:12:44 +0530
Subject: [PATCH 2/3] Create maven-merge-build

---
 .github/workflows/maven-merge-build | 62 +++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 .github/workflows/maven-merge-build

diff --git a/.github/workflows/maven-merge-build b/.github/workflows/maven-merge-build
new file mode 100644
index 0000000..eecdd61
--- /dev/null
+++ b/.github/workflows/maven-merge-build
@@ -0,0 +1,62 @@
+# 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://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11 for x64
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+        architecture: x64
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+(* 
+    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+    - name: Update dependency graph
+      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 *)
+      
+    - name: Generate JaCoCo Badge
+      id: jacoco
+      uses: cicirello/jacoco-badge-generator@v2
+      with:
+        generate-coverage-badge: true
+        generate-coverage-endpoint: true
+        generate-branches-endpoint: true
+        generate-branches-badge: true
+
+    - name: Log coverage percentage
+      run: |
+        echo "coverage = ${{ steps.jacoco.outputs.coverage }}"
+        echo "branch coverage = ${{ steps.jacoco.outputs.branches }}"
+
+    - name: Commit the badge (if it changed)
+      run: |
+        if [[ `git status --porcelain` ]]; then
+          git config --global user.name 'Raghav Agarwal'
+          git config --global user.email 'bly.raghav@gmail.com'
+          git add -A
+          git commit -m "Autogenerated JaCoCo coverage badge"
+          git push
+        fi
+
+    - name: Upload JaCoCo coverage report
+      uses: actions/upload-artifact@v2
+      with:
+        name: jacoco-report
+        path: target/site/jacoco/

From 83bfe62bc548e90fe47a5c38542201394f90d10c Mon Sep 17 00:00:00 2001
From: raghav-agarwal <bly.raghav@gmail.com>
Date: Wed, 4 Oct 2023 14:14:38 +0530
Subject: [PATCH 3/3] Update maven-pr-build.yml

---
 .github/workflows/maven-pr-build.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/maven-pr-build.yml b/.github/workflows/maven-pr-build.yml
index 50b9015..6a32611 100644
--- a/.github/workflows/maven-pr-build.yml
+++ b/.github/workflows/maven-pr-build.yml
@@ -26,14 +26,6 @@ jobs:
         cache: maven
     - name: Build with Maven
       run: mvn -B package --file pom.xml
-    - name: Generate JaCoCo Badge
-      id: jacoco
-      uses: cicirello/jacoco-badge-generator@v2
-      with:
-        generate-coverage-badge: true
-        generate-coverage-endpoint: true
-        generate-branches-endpoint: true
-        generate-branches-badge: true
     - name: Log coverage percentage
       run: |
         echo "coverage = ${{ steps.jacoco.outputs.coverage }}"