From a2ce3a32597b5572853a6289b6ff3c88271069d5 Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Tue, 15 Nov 2022 07:37:46 +0530
Subject: [PATCH 01/29] Update Jenkinsfile
---
Jenkinsfile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1a7877e..d08b530 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,7 @@
pipeline {
- agent any
+ agent {
+ label 'master'
+ }
tools {
maven 'm1'
}
From c1835aafb657b9ee08da3f05f69eadd0b8cc9dbc Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Tue, 15 Nov 2022 20:30:26 +0530
Subject: [PATCH 02/29] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d08b530..1e962fd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
}
post {
always {
- junit 'target/surefire-reports/*.xml'
+ jun 'target/surefire-reports/*.xml'
}
}
}
From cfd14160e11320fac9f8c1cfb10ef257b2287038 Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Tue, 15 Nov 2022 20:32:52 +0530
Subject: [PATCH 03/29] Update Jenkinsfile
---
Jenkinsfile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1e962fd..e2c2008 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,5 @@
pipeline {
- agent {
- label 'master'
- }
+ agent any
tools {
maven 'm1'
}
From 3ae4f611d3d08a1d8d35f82825c338fddf2278ca Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Tue, 15 Nov 2022 20:38:33 +0530
Subject: [PATCH 04/29] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e2c2008..1a7877e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
}
post {
always {
- jun 'target/surefire-reports/*.xml'
+ junit 'target/surefire-reports/*.xml'
}
}
}
From 7f3c55c616ec75e6f53c71ead9ad36ff0d34d364 Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Tue, 15 Nov 2022 20:47:31 +0530
Subject: [PATCH 05/29] Update deliver.sh
---
scripts/deliver.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/deliver.sh b/scripts/deliver.sh
index fb1cb38..27ac879 100755
--- a/scripts/deliver.sh
+++ b/scripts/deliver.sh
@@ -13,4 +13,4 @@ VERSION=`mvn help:evaluate -Dexpression=project.version | grep "^[^\[]"`
set +x
set -x
-java -jar target/${NAME}-${VERSION}.jar
+java -jar target/my-app-1.0-SNAPSHOT.jar
From 61cd19cce6739646657a3e4024174e4b424c208d Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Tue, 15 Nov 2022 20:48:12 +0530
Subject: [PATCH 06/29] Update deliver.sh
---
scripts/deliver.sh | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/scripts/deliver.sh b/scripts/deliver.sh
index 27ac879..59d7c08 100755
--- a/scripts/deliver.sh
+++ b/scripts/deliver.sh
@@ -1,16 +1,3 @@
#!/usr/bin/env bash
-set -x
-mvn jar:jar install:install help:evaluate -Dexpression=project.name
-set +x
-
-set -x
-NAME=`mvn help:evaluate -Dexpression=project.name | grep "^[^\[]"`
-set +x
-
-set -x
-VERSION=`mvn help:evaluate -Dexpression=project.version | grep "^[^\[]"`
-set +x
-
-set -x
java -jar target/my-app-1.0-SNAPSHOT.jar
From 2ebedeb7426750226f37fe9a4561620af674667c Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Wed, 16 Nov 2022 13:21:07 +0530
Subject: [PATCH 07/29] Update README.md
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index a4915f5..74b0ce3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
# java-maven-app
+
The repository contains a simple Java application which outputs the string
"Hello world!"
From ebbe8787bfbf5abf83a0968d6f3e44c6e381648f Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Wed, 16 Nov 2022 13:48:07 +0530
Subject: [PATCH 08/29] Update pom.xml
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 6f3a1ad..9731901 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4.0.0
com.mycompany.app
+
my-app
jar
1.0-SNAPSHOT
From f7a6adeefc5766a9a6d60c5572df6d7cda90956e Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Wed, 16 Nov 2022 13:58:21 +0530
Subject: [PATCH 09/29] Create test
---
test | 1 +
1 file changed, 1 insertion(+)
create mode 100644 test
diff --git a/test b/test
new file mode 100644
index 0000000..9daeafb
--- /dev/null
+++ b/test
@@ -0,0 +1 @@
+test
From 12ed2613375612e001a9b76b458c189819b95697 Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Thu, 17 Nov 2022 07:43:04 +0530
Subject: [PATCH 10/29] Create test1
---
test1 | 1 +
1 file changed, 1 insertion(+)
create mode 100644 test1
diff --git a/test1 b/test1
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/test1
@@ -0,0 +1 @@
+
From 046201bf89a1307185d410f5e033bd9133057a60 Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Thu, 17 Nov 2022 07:44:07 +0530
Subject: [PATCH 11/29] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 74b0ce3..19b006c 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ to build
mvn clean install
-to run
+to run the application
scripts/deliver.sh
From e41d5a479af73fcedd67943059c53f7ab48ec54d Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:29:22 +0530
Subject: [PATCH 12/29] Update test
---
test | 1 +
1 file changed, 1 insertion(+)
diff --git a/test b/test
index 9daeafb..4e7eade 100644
--- a/test
+++ b/test
@@ -1 +1,2 @@
test
+1234
From a003dfc1cf27de086094293dcc2187c9988786ea Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Tue, 14 Feb 2023 08:21:08 +0530
Subject: [PATCH 13/29] Update test
---
test | 1 +
1 file changed, 1 insertion(+)
diff --git a/test b/test
index 4e7eade..1459e9c 100644
--- a/test
+++ b/test
@@ -1,2 +1,3 @@
test
1234
+124
From f77002c0b216b993446735ca5ea85c65372af89e Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Wed, 15 Feb 2023 08:26:07 +0530
Subject: [PATCH 14/29] Update Jenkinsfile
---
Jenkinsfile | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1a7877e..36c602a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,24 +1,27 @@
pipeline {
agent any
- tools {
- maven 'm1'
- }
stages {
- stage('Build') {
+ stage ('build') {
steps {
- sh 'mvn -B -DskipTests clean install'
+ sh 'mvn clean install -DskipTests'
}
+
}
- stage('Test') {
+ stage ('test') {
steps {
sh 'mvn test'
}
post {
always {
- junit 'target/surefire-reports/*.xml'
+ junit 'target/surefire-reports/*.*xml'
}
}
}
+ stage ('run') {
+ steps {
+ sh './scripts/deliver.sh'
+ }
+ }
}
}
From 3a8767ac4eb7eb1b485bc004eb4664335e9bb38d Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Fri, 17 Feb 2023 08:07:30 +0530
Subject: [PATCH 15/29] Update test
---
test | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/test b/test
index 1459e9c..76e579a 100644
--- a/test
+++ b/test
@@ -1,3 +1,2 @@
test
-1234
-124
+
From 6cf207bb2f5d3d0e1338b58b8150b3d6bc9fa60f Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Fri, 17 Feb 2023 08:42:44 +0530
Subject: [PATCH 16/29] Update test
---
test | 1 +
1 file changed, 1 insertion(+)
diff --git a/test b/test
index 76e579a..485d258 100644
--- a/test
+++ b/test
@@ -1,2 +1,3 @@
test
+123
From a7ecb8d80fdb1f135ac678ae1e2effbe5536158f Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Fri, 17 Feb 2023 08:52:38 +0530
Subject: [PATCH 17/29] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 19b006c..8133396 100644
--- a/README.md
+++ b/README.md
@@ -15,3 +15,5 @@ to run the application
scripts/deliver.sh
+
+
From 2e584ee133eba5bf180fc8acb0e58689a10a4910 Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Wed, 1 Mar 2023 08:30:08 +0530
Subject: [PATCH 18/29] Update Jenkinsfile
---
Jenkinsfile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 36c602a..cf24a11 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,8 @@
pipeline {
agent any
+ tools {
+ maven 'maven1'
+ }
stages {
stage ('build') {
steps {
From 429768e749a28cedae410239c07765cd0ea4143b Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Wed, 28 Jun 2023 08:17:14 +0530
Subject: [PATCH 19/29] Update Jenkinsfile
---
Jenkinsfile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index cf24a11..610e7c1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,7 @@
pipeline {
- agent any
+ agent {
+ label 'master'
+ }
tools {
maven 'maven1'
}
From 621557eb2bbe23d799d4c780d3b397beca5a262d Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Wed, 28 Jun 2023 08:18:16 +0530
Subject: [PATCH 20/29] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 610e7c1..5e92a48 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
label 'master'
}
tools {
- maven 'maven1'
+ maven 'm1'
}
stages {
stage ('build') {
From 21fc280fbf3adfac75e94d0a852262ec67c3294b Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Wed, 28 Jun 2023 08:19:43 +0530
Subject: [PATCH 21/29] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5e92a48..7bb505f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
pipeline {
agent {
- label 'master'
+ label 'slave'
}
tools {
maven 'm1'
From 015f069d4d5417af3798aaec661d239ec5209b54 Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Wed, 28 Jun 2023 08:26:18 +0530
Subject: [PATCH 22/29] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7bb505f..4a78e95 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
pipeline {
agent {
- label 'slave'
+ label 'web'
}
tools {
maven 'm1'
From 022348df8175e6422f2bb62e85d13ef5ca72a9bf Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Wed, 28 Jun 2023 08:27:10 +0530
Subject: [PATCH 23/29] Update Jenkinsfile
---
Jenkinsfile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4a78e95..1421938 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,5 @@
pipeline {
- agent {
- label 'web'
- }
+ agent None
tools {
maven 'm1'
}
From c9887802e480b0970a77acaa8410122a38a804fa Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Wed, 28 Jun 2023 08:27:50 +0530
Subject: [PATCH 24/29] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1421938..0df755c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,5 @@
pipeline {
- agent None
+ agent none
tools {
maven 'm1'
}
From e4d763e57bed7a2117e688b0b1761ae87e51771c Mon Sep 17 00:00:00 2001
From: adikarthik <33541222+adikarthik@users.noreply.github.com>
Date: Wed, 28 Jun 2023 08:28:34 +0530
Subject: [PATCH 25/29] Update Jenkinsfile
---
Jenkinsfile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0df755c..8b0a6e2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,7 @@
pipeline {
- agent none
+ agent {
+ label 'adi'
+ }
tools {
maven 'm1'
}
From b922c78eb091ea4d400fc9ca6a785aa880d610c7 Mon Sep 17 00:00:00 2001
From: Annapoorna-patil <134493860+Annapoorna-patil@users.noreply.github.com>
Date: Wed, 28 Jun 2023 13:06:36 +0530
Subject: [PATCH 26/29] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8b0a6e2..e2af3e3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
pipeline {
agent {
- label 'adi'
+ label 'ssh'
}
tools {
maven 'm1'
From 96aef2e2581c8bb246880561d15b66790a40aa3b Mon Sep 17 00:00:00 2001
From: Annapoorna-patil <134493860+Annapoorna-patil@users.noreply.github.com>
Date: Wed, 28 Jun 2023 18:02:22 +0530
Subject: [PATCH 27/29] Update Jenkinsfile
---
Jenkinsfile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e2af3e3..d5e7bd2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,5 @@
pipeline {
- agent {
- label 'ssh'
- }
+ agent any
tools {
maven 'm1'
}
From b560a2895727c78ab51034847a4018969c6d001e Mon Sep 17 00:00:00 2001
From: Annapoorna-patil <134493860+Annapoorna-patil@users.noreply.github.com>
Date: Wed, 28 Jun 2023 18:03:50 +0530
Subject: [PATCH 28/29] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 8133396..026124a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# java-maven-app
+# java-maven-app--test
From 8d1964de7e22387ccee20f9f511bd84fc6605728 Mon Sep 17 00:00:00 2001
From: Annapoorna-patil <134493860+Annapoorna-patil@users.noreply.github.com>
Date: Thu, 29 Jun 2023 12:07:17 +0530
Subject: [PATCH 29/29] Update Jenkinsfile
---
Jenkinsfile | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d5e7bd2..0eb7192 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,11 +14,7 @@ pipeline {
steps {
sh 'mvn test'
}
- post {
- always {
- junit 'target/surefire-reports/*.*xml'
- }
- }
+
}
stage ('run') {
steps {