From 792db8df814f68de988205ac9f018baf0fd755ae Mon Sep 17 00:00:00 2001 From: sahooashok709 <55545642+sahooashok709@users.noreply.github.com> Date: Sun, 17 Nov 2019 12:33:56 +0530 Subject: [PATCH 01/19] Update Tracker.java --- .../src/main/java/training/taylor/timetracker/core/Tracker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/training/taylor/timetracker/core/Tracker.java b/core/src/main/java/training/taylor/timetracker/core/Tracker.java index 74ee98ce3..1305e18ca 100644 --- a/core/src/main/java/training/taylor/timetracker/core/Tracker.java +++ b/core/src/main/java/training/taylor/timetracker/core/Tracker.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Component; import training.taylor.timetracker.core.dao.TimeEntry; -import java.util.List; + java.util.List; @Component public class Tracker { From 6b7c36fe0603e1023482922b3087d073e2b681c0 Mon Sep 17 00:00:00 2001 From: sahooashok709 <55545642+sahooashok709@users.noreply.github.com> Date: Sun, 17 Nov 2019 12:35:06 +0530 Subject: [PATCH 02/19] Update Tracker.java --- .../src/main/java/training/taylor/timetracker/core/Tracker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/training/taylor/timetracker/core/Tracker.java b/core/src/main/java/training/taylor/timetracker/core/Tracker.java index 1305e18ca..3b954823e 100644 --- a/core/src/main/java/training/taylor/timetracker/core/Tracker.java +++ b/core/src/main/java/training/taylor/timetracker/core/Tracker.java @@ -1,6 +1,6 @@ package training.taylor.timetracker.core; -import org.springframework.beans.factory.annotation.Autowired; +import springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import training.taylor.timetracker.core.dao.TimeEntry; From f1d0fe322bb7686e7690792200ac77df9445a18b Mon Sep 17 00:00:00 2001 From: sahooashok709 <55545642+sahooashok709@users.noreply.github.com> Date: Sun, 17 Nov 2019 12:39:13 +0530 Subject: [PATCH 03/19] Update Tracker.java --- .../src/main/java/training/taylor/timetracker/core/Tracker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/training/taylor/timetracker/core/Tracker.java b/core/src/main/java/training/taylor/timetracker/core/Tracker.java index 3b954823e..a5ca49e60 100644 --- a/core/src/main/java/training/taylor/timetracker/core/Tracker.java +++ b/core/src/main/java/training/taylor/timetracker/core/Tracker.java @@ -1,7 +1,7 @@ package training.taylor.timetracker.core; import springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; +importspringframework.stereotype.Component; import training.taylor.timetracker.core.dao.TimeEntry; java.util.List; From 021a91cafa81ba5489a38219a25e43bb0e015f9c Mon Sep 17 00:00:00 2001 From: sahooashok709 <55545642+sahooashok709@users.noreply.github.com> Date: Sun, 17 Nov 2019 12:43:24 +0530 Subject: [PATCH 04/19] Update Tracker.java --- .../main/java/training/taylor/timetracker/core/Tracker.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/training/taylor/timetracker/core/Tracker.java b/core/src/main/java/training/taylor/timetracker/core/Tracker.java index a5ca49e60..74ee98ce3 100644 --- a/core/src/main/java/training/taylor/timetracker/core/Tracker.java +++ b/core/src/main/java/training/taylor/timetracker/core/Tracker.java @@ -1,10 +1,10 @@ package training.taylor.timetracker.core; -import springframework.beans.factory.annotation.Autowired; -importspringframework.stereotype.Component; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import training.taylor.timetracker.core.dao.TimeEntry; - java.util.List; +import java.util.List; @Component public class Tracker { From 94f8d6e124207588e9be232038b4fd104c09c487 Mon Sep 17 00:00:00 2001 From: ashok Date: Tue, 27 Apr 2021 19:29:19 +0530 Subject: [PATCH 05/19] added jenkins demo file --- Jenkinsfile | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..e36ed2799 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,10 @@ +pipeline{ + agent any + stages{ + stage("git checkout"){ + steps{ + git 'https://github.com/sahooashok709/time-tracker.git' + } + } + } +} \ No newline at end of file From 69f704c866f14eed741b3e279f33640f2bbc028c Mon Sep 17 00:00:00 2001 From: ashok Date: Tue, 27 Apr 2021 19:41:20 +0530 Subject: [PATCH 06/19] jenkinsfile for maven build --- Jenkinsfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index e36ed2799..797257a90 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,5 +6,10 @@ pipeline{ git 'https://github.com/sahooashok709/time-tracker.git' } } + stage(build in maven){ + steps{ + sh "mvn clean package" + } + } } } \ No newline at end of file From 61e86fb6e0cc598ae62bdcff7e0f411c31896ffa Mon Sep 17 00:00:00 2001 From: ashok Date: Tue, 27 Apr 2021 19:43:19 +0530 Subject: [PATCH 07/19] jenkinsfile for maven build 2nd --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 797257a90..469d05060 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline{ git 'https://github.com/sahooashok709/time-tracker.git' } } - stage(build in maven){ + stage("build in maven"){ steps{ sh "mvn clean package" } From 8d849e6f429f03590712a8aedb090cc3b05aef84 Mon Sep 17 00:00:00 2001 From: ashok Date: Tue, 27 Apr 2021 20:49:31 +0530 Subject: [PATCH 08/19] jenkinsfile for tomcat --- Jenkinsfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 469d05060..65b2c2cc1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,5 +11,16 @@ pipeline{ sh "mvn clean package" } } + stage("deploy in tomcat"){ + steps{ + sshagent(['tomcat_server']) { + sh """ + -o StrictHostKeyChecking=no + ssh ec2-user@172.31.45.158 /opt/tomcat8/bin/shutdown.sh + ssh ec2-user@172.31.45.158 /opt/tomcat8/bin/startup.sh + """ + } + } + } } } \ No newline at end of file From 9f3636b08f815e29f99aacda1b6c2bcb8bcedec4 Mon Sep 17 00:00:00 2001 From: ashok Date: Tue, 27 Apr 2021 21:16:28 +0530 Subject: [PATCH 09/19] jenkinsfile for tomcat 2nd --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 65b2c2cc1..c77c469c9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline{ steps{ sshagent(['tomcat_server']) { sh """ - -o StrictHostKeyChecking=no + 'ssh -o StrictHostKeyChecking=no -l cloudbees 172.31.45.158 uname -ec2-user' ssh ec2-user@172.31.45.158 /opt/tomcat8/bin/shutdown.sh ssh ec2-user@172.31.45.158 /opt/tomcat8/bin/startup.sh """ From 03c847b4f2420d328148131b39e54c5f8fc5fb71 Mon Sep 17 00:00:00 2001 From: ashok Date: Tue, 27 Apr 2021 21:20:19 +0530 Subject: [PATCH 10/19] jenkinsfile for tomcat 3rd --- Jenkinsfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c77c469c9..888942b65 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,11 +6,6 @@ pipeline{ git 'https://github.com/sahooashok709/time-tracker.git' } } - stage("build in maven"){ - steps{ - sh "mvn clean package" - } - } stage("deploy in tomcat"){ steps{ sshagent(['tomcat_server']) { From adb44cd3aa27b2b0e526de72b40324714fa0abec Mon Sep 17 00:00:00 2001 From: ashok Date: Tue, 27 Apr 2021 21:29:09 +0530 Subject: [PATCH 11/19] jenkinsfile for tomcat 4th --- Jenkinsfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 888942b65..983037e1a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,11 +6,17 @@ pipeline{ git 'https://github.com/sahooashok709/time-tracker.git' } } + stage("build in maven"){ + steps{ + sh "mvn clean package" + sh "mv target/*.war target/myweb.war" + } + } stage("deploy in tomcat"){ steps{ sshagent(['tomcat_server']) { sh """ - 'ssh -o StrictHostKeyChecking=no -l cloudbees 172.31.45.158 uname -ec2-user' + ssh -o StrictHostKeyChecking=no target/myweb.war ec2-user@172.31.45.158:/opt/tomcat8/webapps/ ssh ec2-user@172.31.45.158 /opt/tomcat8/bin/shutdown.sh ssh ec2-user@172.31.45.158 /opt/tomcat8/bin/startup.sh """ From aa40f34a8995c91252f97e9e6f4f933491e825d6 Mon Sep 17 00:00:00 2001 From: ashok Date: Tue, 27 Apr 2021 22:26:00 +0530 Subject: [PATCH 12/19] jenkinsfile for tomcat 5th --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 983037e1a..4b4c71e21 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,14 +9,14 @@ pipeline{ stage("build in maven"){ steps{ sh "mvn clean package" - sh "mv target/*.war target/myweb.war" + sh "mv C:\JENKINS_HOME\workspace\jenkins_declarative_pipeline\web\target\*.war C:\JENKINS_HOME\workspace\jenkins_declarative_pipeline\web\target\myweb.war" } } stage("deploy in tomcat"){ steps{ sshagent(['tomcat_server']) { sh """ - ssh -o StrictHostKeyChecking=no target/myweb.war ec2-user@172.31.45.158:/opt/tomcat8/webapps/ + ssh -o StrictHostKeyChecking=no C:\JENKINS_HOME\workspace\jenkins_declarative_pipeline\web\target\myweb.war ec2-user@172.31.45.158:/opt/tomcat8/webapps/ ssh ec2-user@172.31.45.158 /opt/tomcat8/bin/shutdown.sh ssh ec2-user@172.31.45.158 /opt/tomcat8/bin/startup.sh """ From cc2f4760dd56595891ad8876f0db8e2efa4942f8 Mon Sep 17 00:00:00 2001 From: ashok Date: Wed, 28 Apr 2021 19:32:28 +0530 Subject: [PATCH 13/19] build1st --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4b4c71e21..584e59418 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,12 +9,11 @@ pipeline{ stage("build in maven"){ steps{ sh "mvn clean package" - sh "mv C:\JENKINS_HOME\workspace\jenkins_declarative_pipeline\web\target\*.war C:\JENKINS_HOME\workspace\jenkins_declarative_pipeline\web\target\myweb.war" } } - stage("deploy in tomcat"){ + /* stage("deploy in tomcat"){ steps{ - sshagent(['tomcat_server']) { + sshagent(['jenkins_declarative']) { sh """ ssh -o StrictHostKeyChecking=no C:\JENKINS_HOME\workspace\jenkins_declarative_pipeline\web\target\myweb.war ec2-user@172.31.45.158:/opt/tomcat8/webapps/ ssh ec2-user@172.31.45.158 /opt/tomcat8/bin/shutdown.sh @@ -22,6 +21,7 @@ pipeline{ """ } } - } + } + */ } } \ No newline at end of file From 75880ffbc90a0436384797072965ae0dabb8bd1b Mon Sep 17 00:00:00 2001 From: sahooashok709 <55545642+sahooashok709@users.noreply.github.com> Date: Fri, 21 May 2021 00:13:04 +0530 Subject: [PATCH 14/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c5026e56c..f250b4300 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ Java (Maven) application for tracking time on the job Time tracker -Good Afn!!! +Good Afn!! From 6020cdce96c4cb08b38abfaab1b199832058cf84 Mon Sep 17 00:00:00 2001 From: ashok Date: Mon, 2 Aug 2021 15:42:28 +0530 Subject: [PATCH 15/19] newjenkinsfile --- Jenkinsfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 584e59418..07ec7e7a3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,17 +11,17 @@ pipeline{ sh "mvn clean package" } } - /* stage("deploy in tomcat"){ + stage("deploy in tomcat"){ steps{ - sshagent(['jenkins_declarative']) { + sshagent(['tomcat']) { sh """ - ssh -o StrictHostKeyChecking=no C:\JENKINS_HOME\workspace\jenkins_declarative_pipeline\web\target\myweb.war ec2-user@172.31.45.158:/opt/tomcat8/webapps/ - ssh ec2-user@172.31.45.158 /opt/tomcat8/bin/shutdown.sh - ssh ec2-user@172.31.45.158 /opt/tomcat8/bin/startup.sh + scp -o StrictHostKeyChecking=no /var/lib/jenkins/workspace/new_pipeline/web/target/time-tracker-web-0.5.0-SNAPSHOT.war ec2-user@172.31.10.239:/opt/tomcat8/webapps + ssh ec2-user@172.31.10.239 /opt/tomcat8/bin/shutdown.sh + ssh ec2-user@172.31.10.239 /opt/tomcat8/bin/startup.sh """ } } } - */ + } -} \ No newline at end of file +} From d1d909fa6af3efcfd3d54a625501dff628eb2c3b Mon Sep 17 00:00:00 2001 From: sahooashok709 <55545642+sahooashok709@users.noreply.github.com> Date: Mon, 2 Aug 2021 16:00:13 +0530 Subject: [PATCH 16/19] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7690fbd4..85d85e30b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 0.5.0-SNAPSHOT Time Tracker (Parent) - This is a simple Maven / Java web project. + This is a simple Maven / Java web project. 2017 http://taylor.training/ From 3a12769414af802b133f0d12ab58e1d293a4c4d1 Mon Sep 17 00:00:00 2001 From: sahooashok709 <55545642+sahooashok709@users.noreply.github.com> Date: Mon, 2 Aug 2021 16:01:02 +0530 Subject: [PATCH 17/19] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 8dada3eda..3c0abca23 100644 --- a/LICENSE +++ b/LICENSE @@ -23,7 +23,7 @@ "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - "Source" form shall mean the preferred form for making modifications, + "Source" form shall mean the prefered form for making modifications, including but not limited to software source code, documentation source, and configuration files. From 3515389b8721da19c3e892af2bcb293ba1cf28a7 Mon Sep 17 00:00:00 2001 From: sahooashok709 <55545642+sahooashok709@users.noreply.github.com> Date: Mon, 2 Aug 2021 16:01:33 +0530 Subject: [PATCH 18/19] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4eb0cb06f..961e56108 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ release.properties dependency-reduced-pom.xml buildNumber.properties .idea -*.iml \ No newline at end of file +*.iml From 9c23d384da6389979214384d91a0ffcca4182639 Mon Sep 17 00:00:00 2001 From: sahooashok709 <55545642+sahooashok709@users.noreply.github.com> Date: Mon, 2 Aug 2021 16:02:34 +0530 Subject: [PATCH 19/19] Update pom.xml --- web/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/pom.xml b/web/pom.xml index b4620fdaf..96a2db75e 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - + training.taylor.time-tracker time-tracker-parent 0.5.0-SNAPSHOT