From f6f707434e5545257fb8c095cfe3faa9acd5b41e Mon Sep 17 00:00:00 2001
From: clumpkin <clumpkin@delta.org>
Date: Tue, 30 Jan 2024 12:15:48 -0800
Subject: [PATCH 01/16] updated jenkinsfile

---
 my-app/Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/my-app/Jenkinsfile b/my-app/Jenkinsfile
index 6ebdccf..0749b16 100644
--- a/my-app/Jenkinsfile
+++ b/my-app/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
 
     tools {
         maven "MAVEN"
-        jdk "JDK"
+        jdk "JDK11"
     }
 
     stages {
@@ -16,7 +16,7 @@ pipeline {
         stage('Build') {
             steps {
                 dir("/var/lib/jenkins/workspace/New_demo/my-app/") {
-                sh 'mvn -B -DskipTests clean package'
+                bat 'mvn -B -DskipTests clean package'
                 }
             
             }

From 9900d25791362cc63a42f97a6cef40643dd25971 Mon Sep 17 00:00:00 2001
From: camlumpDelta <158065575+camlumpDelta@users.noreply.github.com>
Date: Tue, 30 Jan 2024 19:09:06 -0500
Subject: [PATCH 02/16] Create maven.yml

---
 .github/workflows/maven.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 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..5de9278
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,30 @@
+# 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: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  trigger-a-jenkins-job:
+    runs-on: ubuntu-latest
+    steps:
+      - id: triggerjenkinsjob
+        uses: mickeygoussetorg/trigger-jenkins-job@v1
+        with:
+          jenkins-server:  "${{ secrets.JENKINS_SERVER }}" # URL of the jenkins server. ex: http://myjenkins.acme.com:8080
+          jenkins-job: "mySampleApp" # The name of the jenkins job to run
+          jenkins-username: ${{ secrets.JENKINS_USERNAME }} # user name for accessing jenkins
+          jenkins-pat: ${{ secrets.JENKINS_PAT }} # personal Access token for accessing Jenkins
+          poll-time: 10 # how often (seconds) to poll the jenkins server for results
+          timeout-value: 600 # How long (seconds) to poll before timing out the action
+          verbose: true # true/false - turns on extra logging

From 48f3623af7487da148af55377347cc0c1d5e1a80 Mon Sep 17 00:00:00 2001
From: camlumpDelta <158065575+camlumpDelta@users.noreply.github.com>
Date: Tue, 30 Jan 2024 19:31:52 -0500
Subject: [PATCH 03/16] Update maven.yml

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

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 5de9278..efea347 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,10 +21,10 @@ jobs:
       - id: triggerjenkinsjob
         uses: mickeygoussetorg/trigger-jenkins-job@v1
         with:
-          jenkins-server:  "${{ secrets.JENKINS_SERVER }}" # URL of the jenkins server. ex: http://myjenkins.acme.com:8080
-          jenkins-job: "mySampleApp" # The name of the jenkins job to run
-          jenkins-username: ${{ secrets.JENKINS_USERNAME }} # user name for accessing jenkins
-          jenkins-pat: ${{ secrets.JENKINS_PAT }} # personal Access token for accessing Jenkins
-          poll-time: 10 # how often (seconds) to poll the jenkins server for results
-          timeout-value: 600 # How long (seconds) to poll before timing out the action
-          verbose: true # true/false - turns on extra logging
+          jenkins-server:  ${{ secrets.JENKINS_SERVER }}
+          jenkins-job: "demo-pipeline"
+          jenkins-username: ${{ secrets.JENKINS_USERNAME }}
+          jenkins-pat: ${{ secrets.JENKINS_PAT }
+          poll-time: 10 
+          timeout-value: 600
+          verbose: true 

From 44a74adb496f459cb15042025ab2f1bda1e1392b Mon Sep 17 00:00:00 2001
From: camlumpDelta <158065575+camlumpDelta@users.noreply.github.com>
Date: Tue, 30 Jan 2024 20:08:31 -0500
Subject: [PATCH 04/16] Update and rename maven.yml to jenkinsBuild.yml

---
 .github/workflows/jenkinsBuild.yml | 23 +++++++++++++++++++++++
 .github/workflows/maven.yml        | 30 ------------------------------
 2 files changed, 23 insertions(+), 30 deletions(-)
 create mode 100644 .github/workflows/jenkinsBuild.yml
 delete mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/jenkinsBuild.yml b/.github/workflows/jenkinsBuild.yml
new file mode 100644
index 0000000..4e15bf1
--- /dev/null
+++ b/.github/workflows/jenkinsBuild.yml
@@ -0,0 +1,23 @@
+# 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: trigger jenkins job
+on: [push]
+jobs:
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+    - name: trigger single Job
+      uses: appleboy/jenkins-action@master
+      with:
+        url: ${{ secrets.JENKINS_SERVER }}
+        user: ${{ secrets.JENKINS_USERNAME }}
+        token: ${{ secrets.JENKINS_PAT }}
+        job: "demo-pipeline"
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
deleted file mode 100644
index efea347..0000000
--- a/.github/workflows/maven.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-jobs:
-  trigger-a-jenkins-job:
-    runs-on: ubuntu-latest
-    steps:
-      - id: triggerjenkinsjob
-        uses: mickeygoussetorg/trigger-jenkins-job@v1
-        with:
-          jenkins-server:  ${{ secrets.JENKINS_SERVER }}
-          jenkins-job: "demo-pipeline"
-          jenkins-username: ${{ secrets.JENKINS_USERNAME }}
-          jenkins-pat: ${{ secrets.JENKINS_PAT }
-          poll-time: 10 
-          timeout-value: 600
-          verbose: true 

From a17251d7ed8dd51831cc71dadf209d293aaeee1a Mon Sep 17 00:00:00 2001
From: camlumpDelta <158065575+camlumpDelta@users.noreply.github.com>
Date: Tue, 30 Jan 2024 20:33:29 -0800
Subject: [PATCH 05/16] Update jenkinsBuild.yml

---
 .github/workflows/jenkinsBuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/jenkinsBuild.yml b/.github/workflows/jenkinsBuild.yml
index 4e15bf1..57da5fe 100644
--- a/.github/workflows/jenkinsBuild.yml
+++ b/.github/workflows/jenkinsBuild.yml
@@ -18,6 +18,6 @@ jobs:
       uses: appleboy/jenkins-action@master
       with:
         url: ${{ secrets.JENKINS_SERVER }}
-        user: ${{ secrets.JENKINS_USERNAME }}
+        user: "camlump"
         token: ${{ secrets.JENKINS_PAT }}
         job: "demo-pipeline"

From 0ea190efbe0be06c4ca40ffe48c17597a0a1f8d3 Mon Sep 17 00:00:00 2001
From: clumpkin <clumpkin@delta.org>
Date: Tue, 30 Jan 2024 20:44:03 -0800
Subject: [PATCH 06/16] test commit for action

---
 my-app/src/main/java/com/mycompany/app/Test.java | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 my-app/src/main/java/com/mycompany/app/Test.java

diff --git a/my-app/src/main/java/com/mycompany/app/Test.java b/my-app/src/main/java/com/mycompany/app/Test.java
new file mode 100644
index 0000000..43a6520
--- /dev/null
+++ b/my-app/src/main/java/com/mycompany/app/Test.java
@@ -0,0 +1,4 @@
+package com.mycompany.app;
+
+public class Test {
+}

From 4aeca8e1485f94a54f2cbccf29527801cbf72e63 Mon Sep 17 00:00:00 2001
From: camlumpDelta <158065575+camlumpDelta@users.noreply.github.com>
Date: Tue, 30 Jan 2024 20:47:40 -0800
Subject: [PATCH 07/16] Update jenkinsBuild.yml

---
 .github/workflows/jenkinsBuild.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/jenkinsBuild.yml b/.github/workflows/jenkinsBuild.yml
index 57da5fe..ab95990 100644
--- a/.github/workflows/jenkinsBuild.yml
+++ b/.github/workflows/jenkinsBuild.yml
@@ -7,7 +7,11 @@
 # documentation.
 
 name: trigger jenkins job
-on: [push]
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
 jobs:
 
   build:

From ee4a0c630649411ad936f169a4abe52906d3c5b5 Mon Sep 17 00:00:00 2001
From: clumpkin <clumpkin@delta.org>
Date: Tue, 30 Jan 2024 20:49:33 -0800
Subject: [PATCH 08/16] tes twot commit for action

---
 my-app/src/main/java/com/mycompany/app/Test2.java | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 my-app/src/main/java/com/mycompany/app/Test2.java

diff --git a/my-app/src/main/java/com/mycompany/app/Test2.java b/my-app/src/main/java/com/mycompany/app/Test2.java
new file mode 100644
index 0000000..03180fb
--- /dev/null
+++ b/my-app/src/main/java/com/mycompany/app/Test2.java
@@ -0,0 +1,4 @@
+package com.mycompany.app;
+
+public class Test2 {
+}

From 65a9a78a9fab07d0ad29afe289b1b98813e243b8 Mon Sep 17 00:00:00 2001
From: camlumpDelta <158065575+camlumpDelta@users.noreply.github.com>
Date: Tue, 30 Jan 2024 21:27:30 -0800
Subject: [PATCH 09/16] Update jenkinsBuild.yml

---
 .github/workflows/jenkinsBuild.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/jenkinsBuild.yml b/.github/workflows/jenkinsBuild.yml
index ab95990..fd85fc4 100644
--- a/.github/workflows/jenkinsBuild.yml
+++ b/.github/workflows/jenkinsBuild.yml
@@ -10,10 +10,8 @@ name: trigger jenkins job
 on:
   push:
     branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
 jobs:
-
+ 
   build:
     name: Build
     runs-on: ubuntu-latest

From 9d9a81f396edb7f4b82a5e3bf7d80d7fe47b8c13 Mon Sep 17 00:00:00 2001
From: clumpkin <clumpkin@delta.org>
Date: Tue, 30 Jan 2024 21:32:12 -0800
Subject: [PATCH 10/16] test three commit for action

---
 my-app/src/main/java/com/mycompany/app/test3.java | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 my-app/src/main/java/com/mycompany/app/test3.java

diff --git a/my-app/src/main/java/com/mycompany/app/test3.java b/my-app/src/main/java/com/mycompany/app/test3.java
new file mode 100644
index 0000000..500bd29
--- /dev/null
+++ b/my-app/src/main/java/com/mycompany/app/test3.java
@@ -0,0 +1,4 @@
+package com.mycompany.app;
+
+public class test3 {
+}

From 2dab38a7c37d716dbea1935d7d61634d6a852833 Mon Sep 17 00:00:00 2001
From: camlumpDelta <158065575+camlumpDelta@users.noreply.github.com>
Date: Tue, 30 Jan 2024 21:58:14 -0800
Subject: [PATCH 11/16] Update jenkinsBuild.yml

---
 .github/workflows/jenkinsBuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/jenkinsBuild.yml b/.github/workflows/jenkinsBuild.yml
index fd85fc4..90e80b0 100644
--- a/.github/workflows/jenkinsBuild.yml
+++ b/.github/workflows/jenkinsBuild.yml
@@ -8,7 +8,7 @@
 
 name: trigger jenkins job
 on:
-  push:
+  pull_request:
     branches: [ "main" ]
 jobs:
  

From 1c98a40f3301b8f72cdeb353acc1ff30634629e0 Mon Sep 17 00:00:00 2001
From: clumpkin <clumpkin@delta.org>
Date: Tue, 30 Jan 2024 22:01:22 -0800
Subject: [PATCH 12/16] added empty class called student

---
 my-app/src/main/java/com/mycompany/app/Student.java | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 my-app/src/main/java/com/mycompany/app/Student.java

diff --git a/my-app/src/main/java/com/mycompany/app/Student.java b/my-app/src/main/java/com/mycompany/app/Student.java
new file mode 100644
index 0000000..76d9992
--- /dev/null
+++ b/my-app/src/main/java/com/mycompany/app/Student.java
@@ -0,0 +1,4 @@
+package com.mycompany.app;
+
+public class Student {
+}

From 12f6f59e014486ba1d001cab815b6c41ea9e2e8f Mon Sep 17 00:00:00 2001
From: clumpkin <clumpkin@delta.org>
Date: Tue, 30 Jan 2024 22:05:02 -0800
Subject: [PATCH 13/16] modified Student class

---
 my-app/src/main/java/com/mycompany/app/Student.java | 5 +++++
 my-app/src/main/java/com/mycompany/app/Test2.java   | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/my-app/src/main/java/com/mycompany/app/Student.java b/my-app/src/main/java/com/mycompany/app/Student.java
index 76d9992..ede7d1b 100644
--- a/my-app/src/main/java/com/mycompany/app/Student.java
+++ b/my-app/src/main/java/com/mycompany/app/Student.java
@@ -1,4 +1,9 @@
 package com.mycompany.app;
 
 public class Student {
+
+    private String name;
+    private int age;
+
+    private String major;
 }
diff --git a/my-app/src/main/java/com/mycompany/app/Test2.java b/my-app/src/main/java/com/mycompany/app/Test2.java
index 03180fb..0a978a3 100644
--- a/my-app/src/main/java/com/mycompany/app/Test2.java
+++ b/my-app/src/main/java/com/mycompany/app/Test2.java
@@ -1,4 +1,8 @@
 package com.mycompany.app;
 
+import org.w3c.dom.ls.LSOutput;
+
 public class Test2 {
+
+
 }

From adaf1e939ea81db4a339c0ef6bc54365adf957da Mon Sep 17 00:00:00 2001
From: clumpkin <clumpkin@delta.org>
Date: Tue, 30 Jan 2024 22:10:29 -0800
Subject: [PATCH 14/16] modified Student class

---
 my-app/src/main/java/com/mycompany/app/Student.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/my-app/src/main/java/com/mycompany/app/Student.java b/my-app/src/main/java/com/mycompany/app/Student.java
index ede7d1b..a7dd0b0 100644
--- a/my-app/src/main/java/com/mycompany/app/Student.java
+++ b/my-app/src/main/java/com/mycompany/app/Student.java
@@ -1,9 +1,13 @@
 package com.mycompany.app;
 
+import java.time.LocalDate;
+
 public class Student {
 
     private String name;
     private int age;
 
     private String major;
+
+    private String birthdate;
 }

From 24034e474f8843a4638c3cb89daaec6bb1cd7e82 Mon Sep 17 00:00:00 2001
From: camlumpDelta <158065575+camlumpDelta@users.noreply.github.com>
Date: Tue, 30 Jan 2024 22:20:21 -0800
Subject: [PATCH 15/16] Update jenkinsBuild.yml

---
 .github/workflows/jenkinsBuild.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/jenkinsBuild.yml b/.github/workflows/jenkinsBuild.yml
index 90e80b0..13e3e67 100644
--- a/.github/workflows/jenkinsBuild.yml
+++ b/.github/workflows/jenkinsBuild.yml
@@ -10,9 +10,12 @@ name: trigger jenkins job
 on:
   pull_request:
     branches: [ "main" ]
+    types: [closed]
+
 jobs:
  
   build:
+    if: github.event.pull_request.merged == true
     name: Build
     runs-on: ubuntu-latest
     steps:

From eb14fa19637fd6ab0b5d3657b3ff749cca1c0916 Mon Sep 17 00:00:00 2001
From: clumpkin <clumpkin@delta.org>
Date: Tue, 30 Jan 2024 22:34:49 -0800
Subject: [PATCH 16/16] FEAT02 modified Student class

---
 my-app/src/main/java/com/mycompany/app/Student.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/my-app/src/main/java/com/mycompany/app/Student.java b/my-app/src/main/java/com/mycompany/app/Student.java
index a7dd0b0..ed2e0a6 100644
--- a/my-app/src/main/java/com/mycompany/app/Student.java
+++ b/my-app/src/main/java/com/mycompany/app/Student.java
@@ -10,4 +10,6 @@ public class Student {
     private String major;
 
     private String birthdate;
+
+    private String hometown;
 }