From 7fc580d8c5461228c76fdb21f30c302ade7cd71f Mon Sep 17 00:00:00 2001
From: TJ Addams <40658492+addamstj@users.noreply.github.com>
Date: Wed, 13 May 2020 12:54:40 +0100
Subject: [PATCH 01/10] Added new jenkinsfile

---
 test.jenkinsfile | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 test.jenkinsfile

diff --git a/test.jenkinsfile b/test.jenkinsfile
new file mode 100644
index 0000000000..52eed25843
--- /dev/null
+++ b/test.jenkinsfile
@@ -0,0 +1,30 @@
+pipeline {
+    agent any
+    stages {
+        stage('Build') {
+            steps {
+                sh 'mvn -B -DskipTests clean package'
+            }
+        }
+        stage('Test') {
+            steps {
+                sh 'mvn test'
+            }
+            post {
+                always {
+                    junit 'target/surefire-reports/*.xml'
+                }
+            }
+        }
+        stage('Deliver') {
+            steps {
+                sh './jenkins/scripts/deliver.sh'
+            }
+        }
+        stage('Complete') {
+            steps {
+                echo 'Job Complete!'
+            }
+        }
+    }
+}

From 1c3d1791548e4e9de6ff1de25d461894ad085a7a Mon Sep 17 00:00:00 2001
From: TJ Addams <40658492+addamstj@users.noreply.github.com>
Date: Mon, 10 Feb 2025 18:49:28 +0000
Subject: [PATCH 02/10] Maven fix (#6)

* Update pom.xml

Addressing issue with pom.xml and Java versions causing errors
---
 jenkins/scripts/deliver.sh | 27 ++++-----------------------
 pom.xml                    | 22 +++++++++++++++++++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/jenkins/scripts/deliver.sh b/jenkins/scripts/deliver.sh
index 25b27dc795..ebcefdf346 100755
--- a/jenkins/scripts/deliver.sh
+++ b/jenkins/scripts/deliver.sh
@@ -1,26 +1,7 @@
 #!/usr/bin/env bash
 
-echo 'The following Maven command installs your Maven-built Java application'
-echo 'into the local Maven repository, which will ultimately be stored in'
-echo 'Jenkins''s local Maven repository (and the "maven-repository" Docker data'
-echo 'volume).'
-set -x
-mvn jar:jar install:install help:evaluate -Dexpression=project.name
-set +x
+#!/bin/bash
+set -e
 
-echo 'The following complex command extracts the value of the <name/> element'
-echo 'within <project/> of your Java/Maven project''s "pom.xml" file.'
-set -x
-NAME=`mvn help:evaluate -Dexpression=project.name | grep "^[^\[]"`
-set +x
-
-echo 'The following complex command behaves similarly to the previous one but'
-echo 'extracts the value of the <version/> element within <project/> instead.'
-set -x
-VERSION=`mvn help:evaluate -Dexpression=project.version | grep "^[^\[]"`
-set +x
-
-echo 'The following command runs and outputs the execution of your Java'
-echo 'application (which Jenkins built using Maven) to the Jenkins UI.'
-set -x
-java -jar target/${NAME}-${VERSION}.jar
+echo "Running the Java application..."
+java -jar target/my-app.jar
diff --git a/pom.xml b/pom.xml
index 19ee4305a8..303aaf8888 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.mycompany.app</groupId>
   <artifactId>my-app</artifactId>
@@ -7,6 +8,7 @@
   <version>1.0-SNAPSHOT</version>
   <name>my-app</name>
   <url>http://maven.apache.org</url>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -15,14 +17,28 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
+    <finalName>my-app</finalName>       
     <plugins>
       <plugin>
-        <!-- Build an executable JAR -->
+        <!-- Ensure correct Java version -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>8</source>
+          <target>8</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <!-- Build an executable JAR with a fixed name -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>3.0.2</version>
         <configuration>
+          <finalName>my-app</finalName>  <!-- Ensures JAR is named my-app.jar -->
           <archive>
             <manifest>
               <addClasspath>true</addClasspath>

From 43799c9aed9b5a7a914783c8845cf5360f8a2d01 Mon Sep 17 00:00:00 2001
From: Nigel Hennigar <nigelhennigar@hotmail.com>
Date: Mon, 13 Oct 2025 20:40:53 +0100
Subject: [PATCH 03/10] making a chnage

---
 simple-java-maven-app | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 simple-java-maven-app

diff --git a/simple-java-maven-app b/simple-java-maven-app
new file mode 160000
index 0000000000..1c3d179154
--- /dev/null
+++ b/simple-java-maven-app
@@ -0,0 +1 @@
+Subproject commit 1c3d1791548e4e9de6ff1de25d461894ad085a7a

From b3bb9a5baba95cb170b0365f42e79ee47c21d4ac Mon Sep 17 00:00:00 2001
From: Nigel Hennigar <nigelhennigar@hotmail.com>
Date: Mon, 13 Oct 2025 21:37:51 +0100
Subject: [PATCH 04/10] testing the jenkins SCM plugin

---
 jenkins/Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
index 52eed25843..f68d3ab87f 100644
--- a/jenkins/Jenkinsfile
+++ b/jenkins/Jenkinsfile
@@ -1,3 +1,4 @@
+
 pipeline {
     agent any
     stages {
@@ -23,7 +24,7 @@ pipeline {
         }
         stage('Complete') {
             steps {
-                echo 'Job Complete!'
+                echo 'Job Complete!!!'
             }
         }
     }

From c94a2ca4d7f94dc9a175b3f5f13d14b9f8e006dc Mon Sep 17 00:00:00 2001
From: Nigel Hennigar <nigelhennigar@hotmail.com>
Date: Mon, 13 Oct 2025 21:41:34 +0100
Subject: [PATCH 05/10] testing the jenkins SCM plugin 2

---
 jenkins/Jenkinsfile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
index f68d3ab87f..8cac8dfebb 100644
--- a/jenkins/Jenkinsfile
+++ b/jenkins/Jenkinsfile
@@ -21,11 +21,7 @@ pipeline {
             steps {
                 sh './jenkins/scripts/deliver.sh'
             }
-        }
-        stage('Complete') {
-            steps {
-                echo 'Job Complete!!!'
-            }
+       
         }
     }
 }

From 506facf7616cb220a31aaecf65bac36b994dfd54 Mon Sep 17 00:00:00 2001
From: Nigel Hennigar <nigelhennigar@hotmail.com>
Date: Mon, 13 Oct 2025 21:56:57 +0100
Subject: [PATCH 06/10] testing the jenkins SCM plugin 3

---
 jenkins/Jenkinsfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
index 8cac8dfebb..cf42153c1f 100644
--- a/jenkins/Jenkinsfile
+++ b/jenkins/Jenkinsfile
@@ -22,6 +22,10 @@ pipeline {
                 sh './jenkins/scripts/deliver.sh'
             }
        
+        }stage('Complete') {
+            steps {
+                echo 'Job Complete - The Pipeline has Finished!'
+            }
         }
     }
 }

From cf6a173c51df96f61dd8e257623e3d0b1bd287ea Mon Sep 17 00:00:00 2001
From: Nigel Hennigar <nigelhennigar@hotmail.com>
Date: Mon, 13 Oct 2025 21:59:37 +0100
Subject: [PATCH 07/10] Fix a curly bracket error

---
 jenkins/Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
index cf42153c1f..3a071c5dab 100644
--- a/jenkins/Jenkinsfile
+++ b/jenkins/Jenkinsfile
@@ -22,7 +22,8 @@ pipeline {
                 sh './jenkins/scripts/deliver.sh'
             }
        
-        }stage('Complete') {
+        }
+        stage('Complete') {
             steps {
                 echo 'Job Complete - The Pipeline has Finished!'
             }

From 23e08a11252fd0698318ca30d740a921a25f3073 Mon Sep 17 00:00:00 2001
From: Nigel Hennigar <nigelhennigar@hotmail.com>
Date: Mon, 13 Oct 2025 23:10:56 +0100
Subject: [PATCH 08/10] Removed 'completed' stage

---
 jenkins/Jenkinsfile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
index 3a071c5dab..ef75d97eb5 100644
--- a/jenkins/Jenkinsfile
+++ b/jenkins/Jenkinsfile
@@ -23,10 +23,6 @@ pipeline {
             }
        
         }
-        stage('Complete') {
-            steps {
-                echo 'Job Complete - The Pipeline has Finished!'
-            }
-        }
+       
     }
 }

From 89a696ce16152394832fa275aa1a255bfeede431 Mon Sep 17 00:00:00 2001
From: Nigel Hennigar <nigelhennigar@hotmail.com>
Date: Tue, 14 Oct 2025 01:45:02 +0100
Subject: [PATCH 09/10] add 'complete' stage

---
 jenkins/Jenkinsfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
index ef75d97eb5..1ebab7d55d 100644
--- a/jenkins/Jenkinsfile
+++ b/jenkins/Jenkinsfile
@@ -23,6 +23,11 @@ pipeline {
             }
        
         }
+        stage('Complete') {
+            steps {
+                echo 'Job Complete - The Pipeline has Completed!'
+            }
+        }
        
     }
 }

From b805ae5828b1472e4a01957d10e88896d469b755 Mon Sep 17 00:00:00 2001
From: Nigel Hennigar <nigelhennigar@hotmail.com>
Date: Tue, 14 Oct 2025 17:23:47 +0100
Subject: [PATCH 10/10] setting up jenkins again

---
 jenkins/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
index 1ebab7d55d..e74921a14d 100644
--- a/jenkins/Jenkinsfile
+++ b/jenkins/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
         }
         stage('Complete') {
             steps {
-                echo 'Job Complete - The Pipeline has Completed!'
+                echo 'Job Complete - The Pipeline has Finished!'
             }
         }