From aa72231e438fd49ac1b6d33a86a6e0c109b2dda5 Mon Sep 17 00:00:00 2001 From: sandeep Date: Thu, 20 Jul 2023 23:34:07 +0530 Subject: [PATCH 01/35] resolved pom issue to add plugin --- pom.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index eccd20688..1ba83328a 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 @@ -90,7 +90,10 @@ maven-checkstyle-plugin 2.8 - + + maven-war-plugin + 3.2.2 + maven-compiler-plugin 2.3.2 From 8bf1da0f355e9ae295b89c4d842a7bd67afbc16a Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Wed, 26 Jul 2023 22:37:22 +0530 Subject: [PATCH 02/35] Update index.jsp --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index bb784b798..5caebbeff 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,2 +1,2 @@ -

Hello, Welcome to Valaxy Technologies !!!

+

Hello, Welcome to my WebSite !!!

From 518e0b975c665ce268e7fbdddce4d25657b97a36 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Wed, 26 Jul 2023 22:49:13 +0530 Subject: [PATCH 03/35] Update index.jsp --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 5caebbeff..70c5f529c 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,2 +1,2 @@ -

Hello, Welcome to my WebSite !!!

+

Hello, Welcome to Sandeep WebSite !!!

From dce491174cacc7714060d5cdb2dce49d447d0754 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Wed, 26 Jul 2023 22:58:12 +0530 Subject: [PATCH 04/35] Update index.jsp --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 70c5f529c..068299b15 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,2 +1,2 @@ -

Hello, Welcome to Sandeep WebSite !!!

+

Hello, Welcome to Sandeep Tutorials !!!

From 72eb33c5dcf26593d1bc272703b5eabee5903366 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Thu, 3 Aug 2023 14:48:51 +0530 Subject: [PATCH 05/35] Update index.jsp --- webapp/src/main/webapp/index.jsp | 187 ++++++++++++++++++++++++++++++- 1 file changed, 186 insertions(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 068299b15..c2dd95e51 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,2 +1,187 @@ -

Hello, Welcome to Sandeep Tutorials !!!

+ + + + + + + + + +

Responsive Social Login Form

+

Resize the browser window to see the responsive effect. When the screen is less than 650px wide, make the two columns stack on top of each other instead of next to each other.

+ +
+
+
+

Login with Social Media or Manually

+
+ or +
+ +
+ + Login with Facebook + + + + Login with Google+ + +
+ +
+
+

Or sign in manually:

+
+ + + + +
+ +
+
+
+ +
+
+
+ Sign up +
+
+ Forgot password? +
+
+
+ + + From 8de37cf56f5e98110552038020eb67cafb2c86e1 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Thu, 11 Apr 2024 18:59:18 +0530 Subject: [PATCH 06/35] Update index.jsp --- webapp/src/main/webapp/index.jsp | 218 ++++++++++--------------------- 1 file changed, 68 insertions(+), 150 deletions(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index c2dd95e51..cde6c9aac 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,187 +1,105 @@ - - - - -

Responsive Social Login Form

-

Resize the browser window to see the responsive effect. When the screen is less than 650px wide, make the two columns stack on top of each other instead of next to each other.

- -
-
-
-

Login with Social Media or Manually

-
- or -
- -
- - Login with Facebook - - - - Login with Google+ - -
- -
-
-

Or sign in manually:

-
- - - - -
- -
-
-
- -
-
-
- Sign up -
-
- Forgot password? +
+
+

Sign Up

+

Please fill in this form to create an account.

+
+ + + + + + + + + + + + +

By creating an account you agree to our Terms & Privacy.

+ +
+ +
-
+ From 11242242945c9772c2ca97d399d2ab94d9b14644 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Thu, 11 Apr 2024 19:27:15 +0530 Subject: [PATCH 07/35] Update index.jsp --- webapp/src/main/webapp/index.jsp | 91 +++++++++++++++----------------- 1 file changed, 42 insertions(+), 49 deletions(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index cde6c9aac..9be644990 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,8 +1,22 @@ + + + -
+
-

Sign Up

+

Register

Please fill in this form to create an account.

- + - + - - - - -

By creating an account you agree to our Terms & Privacy.

+ +
+

By creating an account you agree to our Terms & Privacy.

-
- - -
+ +
+ +
From aca32dd5133e7ea46c46c4ec78ad4186affc06c2 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Thu, 11 Apr 2024 19:32:09 +0530 Subject: [PATCH 08/35] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8196d2013..47eedbab6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # maven-project -Simple Maven Project +Simple Maven Project. From c3b574beb05f34a6ada3cfc8138ccdcc6e69e432 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Fri, 12 Apr 2024 19:01:06 +0530 Subject: [PATCH 09/35] Create Jenkinfile --- Jenkinfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Jenkinfile diff --git a/Jenkinfile b/Jenkinfile new file mode 100644 index 000000000..15c33757c --- /dev/null +++ b/Jenkinfile @@ -0,0 +1,14 @@ +pipeline { + agent any + tools { + maven "maven" + } + stages { + stage('github checkout') { + steps { + sh 'git changelog: false, poll: false, url: 'https://github.com/sandeepsingh07/hello-world-1.git'' + } + } + + } +} From b1bfc796c057498099d13a560752a5e20225d232 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Fri, 12 Apr 2024 19:04:43 +0530 Subject: [PATCH 10/35] Update Jenkinfile --- Jenkinfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinfile b/Jenkinfile index 15c33757c..451d8c689 100644 --- a/Jenkinfile +++ b/Jenkinfile @@ -11,4 +11,4 @@ pipeline { } } -} + From 21f537de74cde2832f10ad02b8ba477f4502dad7 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Fri, 12 Apr 2024 19:06:08 +0530 Subject: [PATCH 11/35] Update Jenkinfile --- Jenkinfile | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/Jenkinfile b/Jenkinfile index 451d8c689..26015644f 100644 --- a/Jenkinfile +++ b/Jenkinfile @@ -1,14 +1,24 @@ pipeline { - agent any - tools { - maven "maven" - } - stages { - stage('github checkout') { + agent any + stages { + stage('Build') { steps { - sh 'git changelog: false, poll: false, url: 'https://github.com/sandeepsingh07/hello-world-1.git'' - } - } - - } - + // compile code + // if successful, move build artifacts to the desired location + } + } + stage('Test') { + steps { + // check if artifacts are present in the correct location + // load test data into the database + // execute the test case + // continue only if tests passed + } + }uio + stage('Deploy') { + steps { + // Fetch tested code and deploy it to production + } + } + } +} From 7181b81811daf501490c7dee9d8e6ce1372f542a Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Fri, 12 Apr 2024 19:08:33 +0530 Subject: [PATCH 12/35] Update Jenkinfile --- Jenkinfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinfile b/Jenkinfile index 26015644f..8a90e94e7 100644 --- a/Jenkinfile +++ b/Jenkinfile @@ -1,10 +1,9 @@ pipeline { agent any stages { - stage('Build') { + stage('Checkout') { steps { - // compile code - // if successful, move build artifacts to the desired location + sh 'git changelog: false, poll: false, url: 'https://github.com/sandeepsingh07/hello-world-1.git'' } } stage('Test') { From 113dda084ea87cd0bd5c133dfd8cb783c954d9ef Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Fri, 12 Apr 2024 19:10:06 +0530 Subject: [PATCH 13/35] Update Jenkinfile --- Jenkinfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinfile b/Jenkinfile index 8a90e94e7..b5214a380 100644 --- a/Jenkinfile +++ b/Jenkinfile @@ -3,7 +3,7 @@ pipeline { stages { stage('Checkout') { steps { - sh 'git changelog: false, poll: false, url: 'https://github.com/sandeepsingh07/hello-world-1.git'' + git changelog: false, poll: false, url: 'https://github.com/sandeepsingh07/hello-world-1.git' } } stage('Test') { From 5817369ac8147c9d5117264d44da0978c22daa44 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Fri, 12 Apr 2024 19:13:19 +0530 Subject: [PATCH 14/35] Update Jenkinfile --- Jenkinfile | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/Jenkinfile b/Jenkinfile index b5214a380..ee251204a 100644 --- a/Jenkinfile +++ b/Jenkinfile @@ -1,23 +1,22 @@ -pipeline { - agent any - stages { - stage('Checkout') { - steps { - git changelog: false, poll: false, url: 'https://github.com/sandeepsingh07/hello-world-1.git' - } - } - stage('Test') { - steps { - // check if artifacts are present in the correct location - // load test data into the database - // execute the test case - // continue only if tests passed - } - }uio - stage('Deploy') { - steps { - // Fetch tested code and deploy it to production - } - } - } +pipeline { + agent any + + tools { + // Install the Maven version configured as "M3" and add it to the path. + maven "maven" + } + + stages { + stage('Git Clone') { + steps { + git credentialsId: 'git', url: 'https://github.com/sandeepsingh07/hello-world-1.git' + } + } + stage('Build'){ + steps{ + sh "mvn clean install" + } + } + + } } From 490c83367e074ddaf4c8fb841c058d3610af3009 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Fri, 12 Apr 2024 19:15:07 +0530 Subject: [PATCH 15/35] Update Jenkinfile --- Jenkinfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinfile b/Jenkinfile index ee251204a..ed0b2973d 100644 --- a/Jenkinfile +++ b/Jenkinfile @@ -14,7 +14,7 @@ pipeline { } stage('Build'){ steps{ - sh "mvn clean install" + sh "mvn clean package" } } From be1bc9eea3411dfecce8525a239abe704ba0d66b Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Fri, 12 Apr 2024 19:21:13 +0530 Subject: [PATCH 16/35] Update Jenkinfile --- Jenkinfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Jenkinfile b/Jenkinfile index ed0b2973d..4cf995e89 100644 --- a/Jenkinfile +++ b/Jenkinfile @@ -17,6 +17,11 @@ pipeline { sh "mvn clean package" } } + stage('Deploy to tomcat'){ + steps{ + sh "deploy adapters: [tomcat8(credentialsId: 'tomcat-user', path: '', url: 'http://3.109.54.152:8080/')], contextPath: null, war: '**/*.war'" + } + } } } From 77b26db2431a969d46961a8662104a304679c4f2 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Fri, 12 Apr 2024 19:23:02 +0530 Subject: [PATCH 17/35] Update Jenkinfile --- Jenkinfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Jenkinfile b/Jenkinfile index 4cf995e89..5c4e58efb 100644 --- a/Jenkinfile +++ b/Jenkinfile @@ -17,11 +17,7 @@ pipeline { sh "mvn clean package" } } - stage('Deploy to tomcat'){ - steps{ - sh "deploy adapters: [tomcat8(credentialsId: 'tomcat-user', path: '', url: 'http://3.109.54.152:8080/')], contextPath: null, war: '**/*.war'" - } - } + } } From 757d8420ed646ba4b374a351200a7e2eced1331e Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Fri, 12 Apr 2024 19:25:30 +0530 Subject: [PATCH 18/35] Update Jenkinfile --- Jenkinfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinfile b/Jenkinfile index 5c4e58efb..33dd4e60f 100644 --- a/Jenkinfile +++ b/Jenkinfile @@ -17,7 +17,11 @@ pipeline { sh "mvn clean package" } } - + stage('Deploy to tomcat'){ + steps{ + deploy adapters: [tomcat8(credentialsId: 'tomcat-user', path: '', url: 'http://3.109.54.152:8080/')], contextPath: null, war: '**/*.war' + } + } } } From 54a3efece2e1070f09d36ee7d473d4467383635d Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Tue, 23 Apr 2024 08:24:18 +0530 Subject: [PATCH 19/35] Update index.jsp --- webapp/src/main/webapp/index.jsp | 120 +++++++++++++++---------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 9be644990..425a13119 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -3,94 +3,94 @@ -
-
-

Register

-

Please fill in this form to create an account.

-
- - - +

Login Form

- - + +
+ Avatar +
- - -
-

By creating an account you agree to our Terms & Privacy.

+
+ + - + + + + +
- -