From fd4ab0b872730984be3382f0c83b046680c2704c Mon Sep 17 00:00:00 2001 From: muqeeth23 <46218921+muqeeth23@users.noreply.github.com> Date: Tue, 14 Dec 2021 15:55:29 +0530 Subject: [PATCH 01/78] Create README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..e4b0a943 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +# Java Project +Build tool is Maven + +when we build the code using command $mvn package it will generate war file. that war can be placed in tomcat server to see application web page + +code is integrated with sonarqube plugin which help us in static code analysis + From 37a82fc7206ceed8e10b4a6f1b4a84ed2d716604 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Wed, 15 Dec 2021 10:59:47 +0530 Subject: [PATCH 02/78] starting point --- Jenkinsfile | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f49a41bf..db75e161 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,23 +1,63 @@ pipeline { agent any - +################### stages { - stage('CODE-VALIDATION') { - steps { + stage('sonarQualityCheck') { + agent{ + docker { + image 'openjdk:11' + } + } + + steps { echo 'validate code..' - sh 'mvn validate compile' + sh 'mvn sonar:sonar \ + -Dsonar.host.url=http://52.66.247.59:9000 \ + -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' + } + } + + +#################### + stage('Unit Test') { + steps { + echo 'Testing..' + sh 'mvn test' } } +#################### + stage('Unit Test') { steps { echo 'Testing..' sh 'mvn test' } } +#################### + + stage('Deploy') { + steps { + echo 'Deploying....' + } + } + +#################### + + stage('Unit Test') { + steps { + echo 'Testing..' + sh 'mvn test' + } + } +################### stage('Deploy') { steps { echo 'Deploying....' } } + + + + } } From ef3718b0e7ab9747d843164a8db92ced756fb408 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Wed, 15 Dec 2021 17:56:50 +0530 Subject: [PATCH 03/78] added qualitygate --- Jenkinsfile | 28 ++++++++++++++++++++-------- test | 0 2 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 test diff --git a/Jenkinsfile b/Jenkinsfile index db75e161..3e5469b3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,19 +10,31 @@ pipeline { } steps { - echo 'validate code..' - sh 'mvn sonar:sonar \ - -Dsonar.host.url=http://52.66.247.59:9000 \ - -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' + {scrip { + withSonarQubeEnv(credentialsId: 'sonarqube') { + echo 'validatining code..' + sh 'mvn sonar:sonar' + + } + + } } + + timeout(time: 1, unit: 'HOURS'){ + def qg = waitForQualityGate() + if (qg.status != 'OK'){ + error "Pipeline aborted due to quality gate failure: ${qg.status}" + } + } + } } #################### - stage('Unit Test') { + stage('sonarqualitygate') { steps { echo 'Testing..' - sh 'mvn test' + #sh 'mvn test' } } #################### @@ -30,7 +42,7 @@ pipeline { stage('Unit Test') { steps { echo 'Testing..' - sh 'mvn test' + #sh 'mvn test' } } #################### @@ -46,7 +58,7 @@ pipeline { stage('Unit Test') { steps { echo 'Testing..' - sh 'mvn test' + #sh 'mvn test' } } ################### diff --git a/test b/test new file mode 100644 index 00000000..e69de29b From 9d8ad6ce9880d2cf3c3dd34e19f96791ab0163ff Mon Sep 17 00:00:00 2001 From: muqeeth Date: Wed, 15 Dec 2021 17:59:03 +0530 Subject: [PATCH 04/78] removed comments --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3e5469b3..46f03aee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ pipeline { agent any -################### + stages { stage('sonarQualityCheck') { agent{ @@ -30,14 +30,14 @@ pipeline { } -#################### + stage('sonarqualitygate') { steps { echo 'Testing..' #sh 'mvn test' } } -#################### + stage('Unit Test') { steps { @@ -45,7 +45,7 @@ pipeline { #sh 'mvn test' } } -#################### + stage('Deploy') { steps { @@ -53,7 +53,7 @@ pipeline { } } -#################### + stage('Unit Test') { steps { @@ -61,7 +61,7 @@ pipeline { #sh 'mvn test' } } -################### + stage('Deploy') { steps { echo 'Deploying....' From 105e93ca8a6be5c9fc795e11e563856ec3686aab Mon Sep 17 00:00:00 2001 From: muqeeth Date: Wed, 15 Dec 2021 18:01:08 +0530 Subject: [PATCH 05/78] bug fixed --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 46f03aee..1cb41c81 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { } steps { - {scrip { + {script { withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' sh 'mvn sonar:sonar' From f0da37bdff4cb403442e30d8065f76e0553a39fa Mon Sep 17 00:00:00 2001 From: muqeeth Date: Wed, 15 Dec 2021 18:04:04 +0530 Subject: [PATCH 06/78] bug fixed --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1cb41c81..c1bdf850 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { } steps { - {script { + script { withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' sh 'mvn sonar:sonar' @@ -18,7 +18,7 @@ pipeline { } } - } + timeout(time: 1, unit: 'HOURS'){ def qg = waitForQualityGate() From 58682af7ef9127d305c9a384a58cbea44b8eebd5 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Wed, 15 Dec 2021 18:05:45 +0530 Subject: [PATCH 07/78] bug fixed --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c1bdf850..64fae2b3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ pipeline { stage('sonarqualitygate') { steps { echo 'Testing..' - #sh 'mvn test' + } } @@ -42,7 +42,7 @@ pipeline { stage('Unit Test') { steps { echo 'Testing..' - #sh 'mvn test' + } } @@ -58,7 +58,7 @@ pipeline { stage('Unit Test') { steps { echo 'Testing..' - #sh 'mvn test' + } } From 0992fd1d5cdfbc5d46c1d51bb5314808fae9769d Mon Sep 17 00:00:00 2001 From: muqeeth Date: Wed, 15 Dec 2021 18:13:53 +0530 Subject: [PATCH 08/78] checking --- Jenkinsfile | 4 ++-- test | 0 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 test diff --git a/Jenkinsfile b/Jenkinsfile index 64fae2b3..13528bb4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,14 +55,14 @@ pipeline { - stage('Unit Test') { + stage('Unit Test1') { steps { echo 'Testing..' } } - stage('Deploy') { + stage('Deploy1') { steps { echo 'Deploying....' } diff --git a/test b/test deleted file mode 100644 index e69de29b..00000000 From 97d5e21017e74e0da369e3bd3b36d7cbf9f9a04f Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 10:18:16 +0530 Subject: [PATCH 09/78] check --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 13528bb4..8ad6c838 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,6 +2,9 @@ pipeline { agent any stages { + + + stage('sonarQualityCheck') { agent{ docker { @@ -17,7 +20,6 @@ pipeline { } - } timeout(time: 1, unit: 'HOURS'){ @@ -28,7 +30,7 @@ pipeline { } } } - + } stage('sonarqualitygate') { From 22cc911939bda70d8c08ef3a7036bebb34e281e1 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 10:42:13 +0530 Subject: [PATCH 10/78] check --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8ad6c838..ac37f002 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { stage('sonarQualityCheck') { agent{ docker { - image 'openjdk:11' + image 'maven' } } From 3a769604acea555f8a6d7256f6208e3ff722d517 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 11:02:19 +0530 Subject: [PATCH 11/78] removed agent docker --- Jenkinsfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ac37f002..c952bb13 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,11 +6,7 @@ pipeline { stage('sonarQualityCheck') { - agent{ - docker { - image 'maven' - } - } + steps { script { From 020e239028f124144fa1d9189e7aa719af1bc494 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 11:05:45 +0530 Subject: [PATCH 12/78] introduced a bug --- src/main/java/mypackage/Calculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index d49b7aca..0c0c6732 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -1,8 +1,8 @@ package mypackage; import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +//import javax.servlet.*; +#import javax.servlet.http.*; public class Calculator extends HttpServlet { From 882904a49a0047ef27d8a9a6352e123dd7f4ddc9 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 11:07:48 +0530 Subject: [PATCH 13/78] check --- src/main/java/mypackage/Calculator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 0c0c6732..a4b0a5d8 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -1,10 +1,10 @@ package mypackage; import java.io.*; -//import javax.servlet.*; -#import javax.servlet.http.*; +import javax.servlet.*; +import javax.servlet.http.*; + -public class Calculator extends HttpServlet { public long addFucn(long first, long second){ From 9cd57c3268ef0f180cbe39a14eaef3ff33998647 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 11:33:29 +0530 Subject: [PATCH 14/78] check --- src/main/java/mypackage/Calculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index a4b0a5d8..f953ebfa 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -6,12 +6,12 @@ { - public long addFucn(long first, long second){ + publiiic long addFucn(long first, long second){ return first+second; } - public long subFucn(long first, long second){ + publiiic long subFucn(long first, long second){ return second-first; } From ba1811249d1128383bb0e24e1f4f015cfb5902dd Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 11:43:04 +0530 Subject: [PATCH 15/78] check --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c952bb13..9cad77ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { script { withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' - sh 'mvn sonar:sonar' + sh 'mvn clean package sonar:sonar' } From e77cd74c55679e5b70c2f947646b5ea8e9be4f47 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 11:58:00 +0530 Subject: [PATCH 16/78] test mvn command --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9cad77ff..8521add2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { script { withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' - sh 'mvn clean package sonar:sonar' + sh 'mvn clean mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' } From 87fc7b0dd7b7d011c28047cba5b06197af2062af Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 12:01:21 +0530 Subject: [PATCH 17/78] test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8521add2..c1c0230f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { script { withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' - sh 'mvn clean mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' + sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' } From 4541a5bac62f1c8b50950779284ad8d974db0a5e Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 12:03:25 +0530 Subject: [PATCH 18/78] test --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c1c0230f..0c76bcfc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,10 @@ pipeline { script { withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' - sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' + //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' + sh 'mvn sonar:sonar \ + -Dsonar.host.url=http://52.66.247.59:9000 \ + -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' } From c6c7a35114668a1385ac590cf5b42d9ef5b3c750 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 12:32:42 +0530 Subject: [PATCH 19/78] check --- src/main/java/mypackage/Calculator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index f953ebfa..d49b7aca 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -4,14 +4,14 @@ import javax.servlet.*; import javax.servlet.http.*; - +public class Calculator extends HttpServlet { - publiiic long addFucn(long first, long second){ + public long addFucn(long first, long second){ return first+second; } - publiiic long subFucn(long first, long second){ + public long subFucn(long first, long second){ return second-first; } From 6293c558fb5f5a9bff0014dc60986ccd849a5ff8 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 12:38:26 +0530 Subject: [PATCH 20/78] bug --- src/main/java/mypackage/Calculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index d49b7aca..fe361040 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -8,7 +8,7 @@ public class Calculator extends HttpServlet { public long addFucn(long first, long second){ - return first+second; + return firstttttttt+second; } public long subFucn(long first, long second){ From 0954447ca11581f04904ce7fab30f95809986f8a Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 12:39:48 +0530 Subject: [PATCH 21/78] bug --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0c76bcfc..722e1f5c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,9 +13,9 @@ pipeline { withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' - sh 'mvn sonar:sonar \ - -Dsonar.host.url=http://52.66.247.59:9000 \ - -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' + mvn sonar:sonar \ + -Dsonar.host.url=http://172.31.4.113:9000 \ + -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89 } From 023325632283d6c3b1b1404389161c8a9b8bfde3 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 12:41:44 +0530 Subject: [PATCH 22/78] bug1 --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 722e1f5c..16bc6011 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,9 +13,9 @@ pipeline { withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' - mvn sonar:sonar \ + sh 'mvn sonar:sonar \ -Dsonar.host.url=http://172.31.4.113:9000 \ - -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89 + -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' } From 40d7f855e2d724088e65390472bae5626687dcdc Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 12:47:15 +0530 Subject: [PATCH 23/78] bug2 --- src/main/java/mypackage/Calculator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index fe361040..ac9c236e 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -2,13 +2,13 @@ import java.io.*; import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlettt.http.*; public class Calculator extends HttpServlet { public long addFucn(long first, long second){ - return firstttttttt+second; + return first+second; } public long subFucn(long first, long second){ @@ -48,7 +48,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro RequestDispatcher rd=request.getRequestDispatcher("/index.jsp"); rd.include(request, response); } - catch(Exception e) + catch(Exc eption e) { } From cbd4126fb71430a977cd9ce7c5caa2e63228622b Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 12:50:02 +0530 Subject: [PATCH 24/78] bug3 --- src/main/java/mypackage/Calculator.java | 4 ++-- src/test/java/mypackage/CalculatorTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index ac9c236e..d49b7aca 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -2,7 +2,7 @@ import java.io.*; import javax.servlet.*; -import javax.servlettt.http.*; +import javax.servlet.http.*; public class Calculator extends HttpServlet { @@ -48,7 +48,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro RequestDispatcher rd=request.getRequestDispatcher("/index.jsp"); rd.include(request, response); } - catch(Exc eption e) + catch(Exception e) { } diff --git a/src/test/java/mypackage/CalculatorTest.java b/src/test/java/mypackage/CalculatorTest.java index 9e6f3d27..93fbd062 100644 --- a/src/test/java/mypackage/CalculatorTest.java +++ b/src/test/java/mypackage/CalculatorTest.java @@ -7,7 +7,7 @@ public class CalculatorTest { @Test public void twoAndThreeIsFive() throws Exception { - final long result = new Calculator().addFucn(2, 3); + final long result = new Calculator().adddddddFucn(2, 3); assertThat(result, is(5L)); } From 3efd27ba6cdb2137ab34b5d6592366fddec30b67 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 12:59:26 +0530 Subject: [PATCH 25/78] bug4 --- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 16bc6011..7176aa6e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,9 +13,7 @@ pipeline { withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' - sh 'mvn sonar:sonar \ - -Dsonar.host.url=http://172.31.4.113:9000 \ - -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' + sh 'mvn sonar:sonar' } From 7cbdf8909c8dae84cc05bfc702aff525edf68c83 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 13:07:40 +0530 Subject: [PATCH 26/78] bug5 --- Jenkinsfile | 2 +- src/test/java/mypackage/CalculatorTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7176aa6e..93524d3d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { script { - withSonarQubeEnv(credentialsId: 'sonarqube') { + withSonarQubeEnv('sonarQube') { echo 'validatining code..' //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' sh 'mvn sonar:sonar' diff --git a/src/test/java/mypackage/CalculatorTest.java b/src/test/java/mypackage/CalculatorTest.java index 93fbd062..795410b2 100644 --- a/src/test/java/mypackage/CalculatorTest.java +++ b/src/test/java/mypackage/CalculatorTest.java @@ -7,13 +7,13 @@ public class CalculatorTest { @Test public void twoAndThreeIsFive() throws Exception { - final long result = new Calculator().adddddddFucn(2, 3); + final long result = new Calculator().adddddFucn(2, 3); assertThat(result, is(5L)); } @Test public void threeMinusTwoIsOne() throws Exception { - final long result = new Calculator().subFucn(2, 3); + final long result = new Calculator().subbbbFucn(2, 3); assertThat(result, is(1L)); } From ef3df77f09cd4f7efd273505a514de7feffbe647 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 13:11:00 +0530 Subject: [PATCH 27/78] bug6 --- src/test/java/mypackage/CalculatorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/mypackage/CalculatorTest.java b/src/test/java/mypackage/CalculatorTest.java index 795410b2..aa97e0b4 100644 --- a/src/test/java/mypackage/CalculatorTest.java +++ b/src/test/java/mypackage/CalculatorTest.java @@ -8,7 +8,7 @@ public class CalculatorTest { @Test public void twoAndThreeIsFive() throws Exception { final long result = new Calculator().adddddFucn(2, 3); - assertThat(result, is(5L)); + assertThat(resultttttttt, is(5L)); } @Test From 47b0d3fa292cae1837e67f10cf901853039cbb68 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 13:15:08 +0530 Subject: [PATCH 28/78] bug7 --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 93524d3d..23dc1603 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,10 @@ pipeline { withSonarQubeEnv('sonarQube') { echo 'validatining code..' //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' - sh 'mvn sonar:sonar' + //sh 'mvn sonar:sonar' + mvn sonar:sonar \ + -Dsonar.host.url=http://172.31.4.113:9000 \ + -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89 } From 31ce01961a5edb84bf125c55c43c74ffe4fff068 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 13:16:17 +0530 Subject: [PATCH 29/78] bug8 --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 23dc1603..7494f081 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,9 +14,9 @@ pipeline { echo 'validatining code..' //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' //sh 'mvn sonar:sonar' - mvn sonar:sonar \ + sh 'mvn sonar:sonar \ -Dsonar.host.url=http://172.31.4.113:9000 \ - -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89 + -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' } From 720c055295f855cb4992cf9a7d6be6498ebdf0a9 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 13:36:16 +0530 Subject: [PATCH 30/78] bug9 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7494f081..488a826b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { script { - withSonarQubeEnv('sonarQube') { + withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' //sh 'mvn sonar:sonar' From eadc189d6e38014aaac5eb8c859d5f27bf7c7470 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 13:41:26 +0530 Subject: [PATCH 31/78] testing --- Jenkinsfile | 4 +--- src/main/java/mypackage/Calculator.java | 2 +- src/test/java/mypackage/CalculatorTest.java | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 488a826b..c89c156e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,9 +14,7 @@ pipeline { echo 'validatining code..' //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' //sh 'mvn sonar:sonar' - sh 'mvn sonar:sonar \ - -Dsonar.host.url=http://172.31.4.113:9000 \ - -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' + sh 'mvn sonar:sonar -Dsonar.host.url=http://172.31.4.113:9000 -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' } diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index d49b7aca..317cb374 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -4,7 +4,7 @@ import javax.servlet.*; import javax.servlet.http.*; -public class Calculator extends HttpServlet +public classsss Calculator extends HttpServlet { public long addFucn(long first, long second){ diff --git a/src/test/java/mypackage/CalculatorTest.java b/src/test/java/mypackage/CalculatorTest.java index aa97e0b4..9e6f3d27 100644 --- a/src/test/java/mypackage/CalculatorTest.java +++ b/src/test/java/mypackage/CalculatorTest.java @@ -7,13 +7,13 @@ public class CalculatorTest { @Test public void twoAndThreeIsFive() throws Exception { - final long result = new Calculator().adddddFucn(2, 3); - assertThat(resultttttttt, is(5L)); + final long result = new Calculator().addFucn(2, 3); + assertThat(result, is(5L)); } @Test public void threeMinusTwoIsOne() throws Exception { - final long result = new Calculator().subbbbFucn(2, 3); + final long result = new Calculator().subFucn(2, 3); assertThat(result, is(1L)); } From 5d36763d59de8a61eb00c5a58e19987582892188 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 13:43:37 +0530 Subject: [PATCH 32/78] new test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c89c156e..c0b3c90a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { script { - withSonarQubeEnv(credentialsId: 'sonarqube') { + withSonarQubeEnv(credentialsId: 'sonarQube') { echo 'validatining code..' //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' //sh 'mvn sonar:sonar' From ed4c3d6c2a5f3a69611028d031d721da099903a4 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 13:44:58 +0530 Subject: [PATCH 33/78] retest --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c0b3c90a..8b81ccc4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,8 +13,8 @@ pipeline { withSonarQubeEnv(credentialsId: 'sonarQube') { echo 'validatining code..' //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' - //sh 'mvn sonar:sonar' - sh 'mvn sonar:sonar -Dsonar.host.url=http://172.31.4.113:9000 -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' + sh 'mvn sonar:sonar' + //sh 'mvn sonar:sonar -Dsonar.host.url=http://172.31.4.113:9000 -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' } From 1bd1f426ae98ab2344dfa9c8d3309f645795f340 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 13:48:32 +0530 Subject: [PATCH 34/78] test2 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8b81ccc4..2e37254c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { script { - withSonarQubeEnv(credentialsId: 'sonarQube') { + withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' sh 'mvn sonar:sonar' From 3be7665735bbcdec3005907c1671fd49ea897278 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 13:52:59 +0530 Subject: [PATCH 35/78] test3 --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2e37254c..69ec2e8f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,8 +12,8 @@ pipeline { script { withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' - //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' - sh 'mvn sonar:sonar' + sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' + //sh 'mvn sonar:sonar' //sh 'mvn sonar:sonar -Dsonar.host.url=http://172.31.4.113:9000 -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' } @@ -21,7 +21,7 @@ pipeline { timeout(time: 1, unit: 'HOURS'){ - def qg = waitForQualityGate() + def qg = waitForQualityGate('SonarQube way') if (qg.status != 'OK'){ error "Pipeline aborted due to quality gate failure: ${qg.status}" } From e79be79aee5abd7dc53ba16ae47d40a8ec1cf6c2 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 14:02:12 +0530 Subject: [PATCH 36/78] random test --- Jenkinsfile | 4 ++-- src/main/java/mypackage/Calculator.java | 2 +- src/test/java/mypackage/CalculatorTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 69ec2e8f..f8dab0c1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,9 +12,9 @@ pipeline { script { withSonarQubeEnv(credentialsId: 'sonarqube') { echo 'validatining code..' - sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' + //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' //sh 'mvn sonar:sonar' - //sh 'mvn sonar:sonar -Dsonar.host.url=http://172.31.4.113:9000 -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' + sh 'mvn sonar:sonar -Dsonar.host.url=http://172.31.4.113:9000 -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' } diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 317cb374..d49b7aca 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -4,7 +4,7 @@ import javax.servlet.*; import javax.servlet.http.*; -public classsss Calculator extends HttpServlet +public class Calculator extends HttpServlet { public long addFucn(long first, long second){ diff --git a/src/test/java/mypackage/CalculatorTest.java b/src/test/java/mypackage/CalculatorTest.java index 9e6f3d27..121bf72c 100644 --- a/src/test/java/mypackage/CalculatorTest.java +++ b/src/test/java/mypackage/CalculatorTest.java @@ -7,7 +7,7 @@ public class CalculatorTest { @Test public void twoAndThreeIsFive() throws Exception { - final long result = new Calculator().addFucn(2, 3); + final long result = new Calculator().adddddFucn(2, 3); assertThat(result, is(5L)); } From 5517b27f909d080ab806141d2980314c48d109d2 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 14:07:12 +0530 Subject: [PATCH 37/78] testing --- src/test/java/mypackage/CalculatorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/mypackage/CalculatorTest.java b/src/test/java/mypackage/CalculatorTest.java index 121bf72c..9e6f3d27 100644 --- a/src/test/java/mypackage/CalculatorTest.java +++ b/src/test/java/mypackage/CalculatorTest.java @@ -7,7 +7,7 @@ public class CalculatorTest { @Test public void twoAndThreeIsFive() throws Exception { - final long result = new Calculator().adddddFucn(2, 3); + final long result = new Calculator().addFucn(2, 3); assertThat(result, is(5L)); } From b255ef1580b91d01daa707f7bf21baf97c8c86e3 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 14:09:15 +0530 Subject: [PATCH 38/78] test again --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f8dab0c1..c89c156e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,7 @@ pipeline { timeout(time: 1, unit: 'HOURS'){ - def qg = waitForQualityGate('SonarQube way') + def qg = waitForQualityGate() if (qg.status != 'OK'){ error "Pipeline aborted due to quality gate failure: ${qg.status}" } From 47493356bba1dca3f1c62c56a674035b065940c3 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 14:10:58 +0530 Subject: [PATCH 39/78] add function --- src/test/java/mypackage/CalculatorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/mypackage/CalculatorTest.java b/src/test/java/mypackage/CalculatorTest.java index 9e6f3d27..93fbd062 100644 --- a/src/test/java/mypackage/CalculatorTest.java +++ b/src/test/java/mypackage/CalculatorTest.java @@ -7,7 +7,7 @@ public class CalculatorTest { @Test public void twoAndThreeIsFive() throws Exception { - final long result = new Calculator().addFucn(2, 3); + final long result = new Calculator().adddddddFucn(2, 3); assertThat(result, is(5L)); } From bf161e222e012e5a6a292c7b67c03d8009c1219d Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 14:12:54 +0530 Subject: [PATCH 40/78] check --- src/main/java/mypackage/Calculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index d49b7aca..a8ea4be0 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -4,7 +4,7 @@ import javax.servlet.*; import javax.servlet.http.*; -public class Calculator extends HttpServlet +publiccccc class Calculator extends HttpServlet { public long addFucn(long first, long second){ @@ -28,7 +28,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro { response.setContentType("text/html"); PrintWriter out= response.getWriter(); - int a1= Integer.parseInt(request.getParameter("n1")); + iiiiint a1= Integer.parseInt(request.getParameter("n1")); int a2= Integer.parseInt(request.getParameter("n2")); From d0f6f3958d0228d4fa96d2e719b4bb8e0879c4a7 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 14:15:15 +0530 Subject: [PATCH 41/78] added bug code --- src/main/java/mypackage/Calculator.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index a8ea4be0..cfeef8aa 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -21,7 +21,23 @@ public long mulFucn(long first, long second){ return first*second; } - + main() { + Record city; + lnode *list = NULL; + + while (data_to_read()) { + Readin_data(&city); + insert(&city, &list); + } +} + +void insert(Record*& city, lnode*& list) { + lnode* ptr = new lnode; + ptr->next = list; + list = ptr; + prt->data = city; +} + public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try From 696b94651f750a134731b156a484c5a7985fefdc Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 18:49:45 +0530 Subject: [PATCH 42/78] new sonar server --- Jenkinsfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c89c156e..b6f5c873 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,12 +10,10 @@ pipeline { steps { script { - withSonarQubeEnv(credentialsId: 'sonarqube') { + withSonarQubeEnv('sonar-server') { echo 'validatining code..' - //sh 'mvn clean org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.0.2155:sonar' - //sh 'mvn sonar:sonar' - sh 'mvn sonar:sonar -Dsonar.host.url=http://172.31.4.113:9000 -Dsonar.login=28f447710c54b726adc659d96c8ebcae3decff89' - + sh 'mvn clean verify sonar:sonar' + } From b90aa21e844d4f44406251f5f996932ca10f8202 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 18:53:54 +0530 Subject: [PATCH 43/78] check --- src/main/java/mypackage/Calculator.java | 4 ++-- src/test/java/mypackage/CalculatorTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index cfeef8aa..3f19cb2d 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -4,7 +4,7 @@ import javax.servlet.*; import javax.servlet.http.*; -publiccccc class Calculator extends HttpServlet +public class Calculator extends HttpServlet { public long addFucn(long first, long second){ @@ -44,7 +44,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro { response.setContentType("text/html"); PrintWriter out= response.getWriter(); - iiiiint a1= Integer.parseInt(request.getParameter("n1")); + int a1= Integer.parseInt(request.getParameter("n1")); int a2= Integer.parseInt(request.getParameter("n2")); diff --git a/src/test/java/mypackage/CalculatorTest.java b/src/test/java/mypackage/CalculatorTest.java index 93fbd062..9e6f3d27 100644 --- a/src/test/java/mypackage/CalculatorTest.java +++ b/src/test/java/mypackage/CalculatorTest.java @@ -7,7 +7,7 @@ public class CalculatorTest { @Test public void twoAndThreeIsFive() throws Exception { - final long result = new Calculator().adddddddFucn(2, 3); + final long result = new Calculator().addFucn(2, 3); assertThat(result, is(5L)); } From f3ca2a10d9204e0ae6178fbfd48c112f2523d076 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 18:56:01 +0530 Subject: [PATCH 44/78] removed bug --- src/main/java/mypackage/Calculator.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 3f19cb2d..794c8916 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -21,22 +21,6 @@ public long mulFucn(long first, long second){ return first*second; } - main() { - Record city; - lnode *list = NULL; - - while (data_to_read()) { - Readin_data(&city); - insert(&city, &list); - } -} - -void insert(Record*& city, lnode*& list) { - lnode* ptr = new lnode; - ptr->next = list; - list = ptr; - prt->data = city; -} public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { From a0d1e3e970afc3c15186a2b5c2eb8196259fbcc9 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 19:23:46 +0530 Subject: [PATCH 45/78] test --- src/main/java/mypackage/Calculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 794c8916..de4ee188 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -4,9 +4,9 @@ import javax.servlet.*; import javax.servlet.http.*; -public class Calculator extends HttpServlet +public classss Calculator extends HttpServlet { - public long addFucn(long first, long second){ + public loooong addFucn(long first, long second){ return first+second; } From 107d2650841e262b4322a528137927100d1e97b3 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 19:25:56 +0530 Subject: [PATCH 46/78] check --- Jenkinsfile | 2 +- src/main/java/mypackage/Calculator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b6f5c873..7447022d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { script { withSonarQubeEnv('sonar-server') { echo 'validatining code..' - sh 'mvn clean verify sonar:sonar' + sh 'mvn clean sonar:sonar' } diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index de4ee188..bf86abee 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -4,7 +4,7 @@ import javax.servlet.*; import javax.servlet.http.*; -public classss Calculator extends HttpServlet +public classsss Calculator extends HttpServlet { public loooong addFucn(long first, long second){ From adec097ede1558944fc8b0991e281293f5c808ee Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 19:31:52 +0530 Subject: [PATCH 47/78] test --- src/main/java/mypackage/Calculator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index bf86abee..a2928b2a 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -4,16 +4,16 @@ import javax.servlet.*; import javax.servlet.http.*; -public classsss Calculator extends HttpServlet +public class Calculator extends HttpServlet { - public loooong addFucn(long first, long second){ + public long addFucn(long first, long second){ return first+second; } public long subFucn(long first, long second){ - return second-first; + return second/(first*0); } public long mulFucn(long first, long second){ From 2c3d102ea053b97bfcb84a4319d0a6c69db4da2d Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 20:14:40 +0530 Subject: [PATCH 48/78] nexus --- Jenkinsfile | 11 ++--------- pom.xml | 2 +- src/main/java/mypackage/Calculator.java | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7447022d..ce50d08e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,17 +29,10 @@ pipeline { } - stage('sonarqualitygate') { - steps { - echo 'Testing..' - - } - } - - stage('Unit Test') { + stage('Nexus Release') { steps { - echo 'Testing..' + nexusArtifactUploader artifacts: [[artifactId: 'WebAppCal', classifier: '', file: 'JavaWebCalculator/target/WebAppCal-0.0.2.war', type: 'war']], credentialsId: 'nexus', groupId: 'com.web.cal', nexusUrl: '172.31.44.35:8081/', nexusVersion: 'nexus3', protocol: 'http', repository: 'maven-releases', version: '1.3.2' } } diff --git a/pom.xml b/pom.xml index c7c44528..e3ccea9f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ releases - http://52.53.153.183:8081/nexus/content/repositories/releases + diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index a2928b2a..02cb51e8 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -13,7 +13,7 @@ public long addFucn(long first, long second){ public long subFucn(long first, long second){ - return second/(first*0); + return second/first; } public long mulFucn(long first, long second){ From 6e381fa48755649577e71ef5382bd3d0440e0911 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 20:20:09 +0530 Subject: [PATCH 49/78] bug fixes --- src/main/java/mypackage/Calculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 02cb51e8..2b90f69d 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -21,7 +21,7 @@ public long mulFucn(long first, long second){ return first*second; } - + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try @@ -50,7 +50,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro } catch(Exception e) { - + out.println("

error

"); } } } From 63a29bc344b39eb9d5c2129ff417872c7d9ab659 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 20:23:29 +0530 Subject: [PATCH 50/78] building war file --- Jenkinsfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ce50d08e..457ed67e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,11 @@ pipeline { } } - + stage('Build war file') { + steps { + sh 'mvn clean package' + } + } stage('Nexus Release') { steps { From 63b3f5d4fa21e951aed4214174fb84ffe405066f Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 20:29:00 +0530 Subject: [PATCH 51/78] fixed compilation error --- src/main/java/mypackage/Calculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 2b90f69d..b3f88e18 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -50,7 +50,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro } catch(Exception e) { - out.println("

error

"); + System.out.println("Something went wrong."); } } } From bc25a8e5fd5d667009a9c9c63718d3457a2ff033 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 20:30:50 +0530 Subject: [PATCH 52/78] fixed compilation error --- src/main/java/mypackage/Calculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index b3f88e18..40322d46 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -50,7 +50,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro } catch(Exception e) { - System.out.println("Something went wrong."); + logger.log("Some thing went wrong"); } } } From ddf686c04502e5b0037ca9c9fa1418a01fc60399 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 20:34:55 +0530 Subject: [PATCH 53/78] try --- src/main/java/mypackage/Calculator.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 40322d46..d9ca1224 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -1,4 +1,6 @@ package mypackage; +import java.util.logging.LogRecord; +import java.util.logging.StreamHandler; import java.io.*; import javax.servlet.*; From d46929818f26ec643f6778d281e36daaab069b53 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 21:29:34 +0530 Subject: [PATCH 54/78] mesS --- src/main/java/mypackage/Calculator.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index d9ca1224..b9fe16d8 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -1,6 +1,4 @@ package mypackage; -import java.util.logging.LogRecord; -import java.util.logging.StreamHandler; import java.io.*; import javax.servlet.*; @@ -52,7 +50,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro } catch(Exception e) { - logger.log("Some thing went wrong"); - } + System.out.println("exception occured"); + } } } From 96810e5be02b5ce2ae0e18cb2cd0d2b0b78776df Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 21:41:10 +0530 Subject: [PATCH 55/78] message --- src/main/java/mypackage/Calculator.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index b9fe16d8..205fe3d2 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -1,4 +1,6 @@ package mypackage; +import org.apache.log4j.Logger; + import java.io.*; import javax.servlet.*; @@ -6,6 +8,7 @@ public class Calculator extends HttpServlet { + Logger logger = Logger.getLogger(Calculator.class); public long addFucn(long first, long second){ return first+second; From cca43107a59e64916c7e8bed29e3de9ceab22820 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 21:58:11 +0530 Subject: [PATCH 56/78] bug fix --- src/main/java/mypackage/Calculator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 205fe3d2..9e4d01c9 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -8,7 +8,7 @@ public class Calculator extends HttpServlet { - Logger logger = Logger.getLogger(Calculator.class); + public long addFucn(long first, long second){ return first+second; @@ -27,6 +27,7 @@ public long mulFucn(long first, long second){ @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + Logger logger = Logger.getLogger(Calculator.class); try { response.setContentType("text/html"); From 1102c694a9245baaff2e6caf1b3f4eccce8d314f Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 22:04:35 +0530 Subject: [PATCH 57/78] fix --- src/main/java/mypackage/Calculator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 9e4d01c9..045c4aea 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -8,7 +8,7 @@ public class Calculator extends HttpServlet { - + Logger logger = Logger.getLogger(Calculator.class); public long addFucn(long first, long second){ return first+second; @@ -27,7 +27,7 @@ public long mulFucn(long first, long second){ @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - Logger logger = Logger.getLogger(Calculator.class); + try { response.setContentType("text/html"); @@ -54,7 +54,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro } catch(Exception e) { - System.out.println("exception occured"); + logger.error("exception occurred "); } } } From 0566f3ffc6f0e75194d075817d4fe798392a19db Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 22:07:26 +0530 Subject: [PATCH 58/78] fix --- src/main/java/mypackage/Calculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 045c4aea..ea01fcce 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -8,7 +8,7 @@ public class Calculator extends HttpServlet { - Logger logger = Logger.getLogger(Calculator.class); + public static final Logger logger = Logger.getLogger(Calculator.class); public long addFucn(long first, long second){ return first+second; From 6e62cd6d96f3284c7fb9dc69a2c44ff30d523046 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 22:14:10 +0530 Subject: [PATCH 59/78] bug fix --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index e3ccea9f..d02438bc 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,11 @@ servlet-api 2.5 + + org.apache.logging.log4j + log4j + 2.14.0 + From 34435c985074a683f284a87b960f992858b9f1cb Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 22:20:21 +0530 Subject: [PATCH 60/78] dependancy added --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d02438bc..9a1adb79 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.logging.log4j log4j - 2.14.0 + 2.15.0 From ec55a96bf0b7af27ddbfa35339ed8ff67294d6b1 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 22:22:25 +0530 Subject: [PATCH 61/78] message --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 9a1adb79..20b764bf 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ org.apache.logging.log4j log4j 2.15.0 + pom From 367240c47941b775990669c903825e852df2cd6b Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 22:59:43 +0530 Subject: [PATCH 62/78] message --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 20b764bf..e296f7d7 100644 --- a/pom.xml +++ b/pom.xml @@ -24,12 +24,14 @@ servlet-api 2.5 + org.apache.logging.log4j log4j - 2.15.0 + 2.13.0 pom + From 929ccd0b4ed705915c7b9e70724079b3421555e6 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 23:07:52 +0530 Subject: [PATCH 63/78] message --- pom.xml | 8 +------- src/main/java/mypackage/Calculator.java | 11 +++++++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index e296f7d7..a1927373 100644 --- a/pom.xml +++ b/pom.xml @@ -24,13 +24,7 @@ servlet-api 2.5 - - - org.apache.logging.log4j - log4j - 2.13.0 - pom - + diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index ea01fcce..6bd22dd1 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -1,6 +1,8 @@ package mypackage; -import org.apache.log4j.Logger; - +package com.javacodegeeks.corejava.util.logging; + +import java.util.logging.Level; +import java.util.logging.Logger; import java.io.*; import javax.servlet.*; @@ -8,7 +10,8 @@ public class Calculator extends HttpServlet { - public static final Logger logger = Logger.getLogger(Calculator.class); + public static final Logger LOGGER = Logger.getLogger(Calculator.class.getName()); + //public static final Logger logger = Logger.getLogger(Calculator.class); public long addFucn(long first, long second){ return first+second; @@ -54,7 +57,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro } catch(Exception e) { - logger.error("exception occurred "); + LOGGER.log(Level.SEVERE, "Exception occur", ex); } } } From 4d698f8211a6fdc79af8ab383d91f2447defbe43 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 23:12:21 +0530 Subject: [PATCH 64/78] test --- src/main/java/mypackage/Calculator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 6bd22dd1..1134453f 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -10,7 +10,7 @@ public class Calculator extends HttpServlet { - public static final Logger LOGGER = Logger.getLogger(Calculator.class.getName()); + //public static final Logger logger = Logger.getLogger(Calculator.class); public long addFucn(long first, long second){ @@ -28,6 +28,7 @@ public long mulFucn(long first, long second){ } @Override + public static final Logger LOGGER = Logger.getLogger(Calculator.class.getName()); public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { From 6d36703fab54f6efb40afd4aa45748244e12d409 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Thu, 16 Dec 2021 23:16:00 +0530 Subject: [PATCH 65/78] test1 --- src/main/java/mypackage/Calculator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 1134453f..84a919c9 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -28,9 +28,12 @@ public long mulFucn(long first, long second){ } @Override - public static final Logger LOGGER = Logger.getLogger(Calculator.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Calculator.class.getName()); public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + LOGGER.info("Logger Name: "+LOGGER.getName()); + + LOGGER.warning("Can cause ArrayIndexOutOfBoundsException"); try { From facd12ba984b581b481da9364fdaec7b18d9ac38 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Fri, 17 Dec 2021 00:01:00 +0530 Subject: [PATCH 66/78] test2 --- src/main/java/mypackage/Calculator.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/mypackage/Calculator.java b/src/main/java/mypackage/Calculator.java index 84a919c9..0f10fad6 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -1,9 +1,6 @@ package mypackage; -package com.javacodegeeks.corejava.util.logging; - -import java.util.logging.Level; -import java.util.logging.Logger; +import static java.lang.System.*; import java.io.*; import javax.servlet.*; import javax.servlet.http.*; @@ -11,7 +8,6 @@ public class Calculator extends HttpServlet { - //public static final Logger logger = Logger.getLogger(Calculator.class); public long addFucn(long first, long second){ return first+second; @@ -28,12 +24,10 @@ public long mulFucn(long first, long second){ } @Override - private static final Logger LOGGER = Logger.getLogger(Calculator.class.getName()); + public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - LOGGER.info("Logger Name: "+LOGGER.getName()); - - LOGGER.warning("Can cause ArrayIndexOutOfBoundsException"); + try { @@ -61,7 +55,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro } catch(Exception e) { - LOGGER.log(Level.SEVERE, "Exception occur", ex); + out.println("something went wrong"); } } } From faa36fcf09654e206219fb6174d92acf9c8696b7 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Fri, 17 Dec 2021 00:06:41 +0530 Subject: [PATCH 67/78] test3 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 457ed67e..f6618bb4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { stage('Nexus Release') { steps { - nexusArtifactUploader artifacts: [[artifactId: 'WebAppCal', classifier: '', file: 'JavaWebCalculator/target/WebAppCal-0.0.2.war', type: 'war']], credentialsId: 'nexus', groupId: 'com.web.cal', nexusUrl: '172.31.44.35:8081/', nexusVersion: 'nexus3', protocol: 'http', repository: 'maven-releases', version: '1.3.2' + nexusArtifactUploader artifacts: [[artifactId: 'WebAppCal', classifier: '', file: 'JavaWebCalculator/target/WebAppCal-1.3.2.war', type: 'war']], credentialsId: 'nexus', groupId: 'com.web.cal', nexusUrl: '172.31.44.35:8081/', nexusVersion: 'nexus3', protocol: 'http', repository: 'maven-releases', version: '1.3.2' } } From 229f709ee4c9a6ca0c275771746003c98625d08b Mon Sep 17 00:00:00 2001 From: muqeeth Date: Fri, 17 Dec 2021 00:08:55 +0530 Subject: [PATCH 68/78] test4 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f6618bb4..47e4b678 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { stage('Nexus Release') { steps { - nexusArtifactUploader artifacts: [[artifactId: 'WebAppCal', classifier: '', file: 'JavaWebCalculator/target/WebAppCal-1.3.2.war', type: 'war']], credentialsId: 'nexus', groupId: 'com.web.cal', nexusUrl: '172.31.44.35:8081/', nexusVersion: 'nexus3', protocol: 'http', repository: 'maven-releases', version: '1.3.2' + nexusArtifactUploader artifacts: [[artifactId: 'WebAppCal', classifier: '', file: 'target/WebAppCal-1.3.2.war', type: 'war']], credentialsId: 'nexus', groupId: 'com.web.cal', nexusUrl: '172.31.44.35:8081/', nexusVersion: 'nexus3', protocol: 'http', repository: 'maven-releases', version: '1.3.2' } } From e2b570bc0baf322575deba84b19ab1d4d0db8cdb Mon Sep 17 00:00:00 2001 From: muqeeth Date: Fri, 17 Dec 2021 12:55:52 +0530 Subject: [PATCH 69/78] added docker stage --- Jenkinsfile | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 47e4b678..8dc14224 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,13 +1,11 @@ pipeline { agent any + environment{ + VERSION = "${env.BUILD_ID}" + } stages { - - - - stage('sonarQualityCheck') { - - + stage('sonarQualityCheck') { steps { script { withSonarQubeEnv('sonar-server') { @@ -16,9 +14,7 @@ pipeline { } - - - timeout(time: 1, unit: 'HOURS'){ + timeout(time: 1, unit: 'HOURS'){ def qg = waitForQualityGate() if (qg.status != 'OK'){ error "Pipeline aborted due to quality gate failure: ${qg.status}" @@ -41,10 +37,19 @@ pipeline { } } - - stage('Deploy') { + stage('docker build and docker push') { steps { - echo 'Deploying....' + script{ + withCredentials([string(credentialsId: 'registry_pw', variable: 'registry_password')]) { + sh ''' + docker build -t 172.31.44.35:8082/webappcal:${VERSION} . + docker login -u admin -p $registry_password 172.31.44.35:8082 + docker push 172.31.44.35:8082/webappcal:${VERSION} + docker rmi 172.31.44.35:8082/webappcal:${VERSION} + ''' + } + + } } } From 830795ee85b232e27ff4f1043d3fa3960858104a Mon Sep 17 00:00:00 2001 From: muqeeth Date: Fri, 17 Dec 2021 13:01:44 +0530 Subject: [PATCH 70/78] added dockerfile --- src/Dockerfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/Dockerfile diff --git a/src/Dockerfile b/src/Dockerfile new file mode 100644 index 00000000..4d79d421 --- /dev/null +++ b/src/Dockerfile @@ -0,0 +1,16 @@ +#build war file +FROM maven:3.8-openjdk-8-slim as buildstage +RUN mkdir /app +WORKDIR /app +COPY src /app/src +COPY pom.xml /app +RUN mvn -f /app/pom.xml clean package + + + +#Deploying into tomcat +FROM tomcat:9.0 +RUN mv webapps webapps2 +RUN cp -r webapps.dist/ webapps + +COPY --from=buildstage /app/target/WebAppCal-1.3.2.war /usr/local/tomcat/webapps/webappcal.war \ No newline at end of file From 1e7177eadd1dcb374a7809806264a8508b3a8306 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Fri, 17 Dec 2021 13:05:41 +0530 Subject: [PATCH 71/78] modified --- src/Dockerfile => Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Dockerfile => Dockerfile (100%) diff --git a/src/Dockerfile b/Dockerfile similarity index 100% rename from src/Dockerfile rename to Dockerfile From b47ad1153e325fde06563d3c5e57d61fff91cb1a Mon Sep 17 00:00:00 2001 From: muqeeth Date: Fri, 17 Dec 2021 14:14:59 +0530 Subject: [PATCH 72/78] email notification --- Jenkinsfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8dc14224..53e1899e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,6 +43,7 @@ pipeline { withCredentials([string(credentialsId: 'registry_pw', variable: 'registry_password')]) { sh ''' docker build -t 172.31.44.35:8082/webappcal:${VERSION} . + docker tag 172.31.44.35:8082/webappcal:${VERSION} 172.31.44.35:8082/webappcal:latest docker login -u admin -p $registry_password 172.31.44.35:8082 docker push 172.31.44.35:8082/webappcal:${VERSION} docker rmi 172.31.44.35:8082/webappcal:${VERSION} @@ -55,7 +56,7 @@ pipeline { - stage('Unit Test1') { + stage('Unit Test1') { steps { echo 'Testing..' @@ -68,6 +69,12 @@ pipeline { } } + post { + always { + mail bcc: '', body: '
Project: ${env.JOB_NAME}
Build Number: ${env.BUILD_NUMBER}
URL de build: ${env.BUILD_URL}', cc: '', from: '', replyTo: '', subject: '${currentBuild.result} CI: Project name -> ${env.JOB_NAME}', to: 'muqeeth.23@gmail.com' + } + } + From c6b05ac2840913772ee741ea1fcca0b957ab4a74 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Fri, 17 Dec 2021 14:16:20 +0530 Subject: [PATCH 73/78] fix --- Jenkinsfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 53e1899e..7dbfe197 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,14 +69,15 @@ pipeline { } } - post { - always { - mail bcc: '', body: '
Project: ${env.JOB_NAME}
Build Number: ${env.BUILD_NUMBER}
URL de build: ${env.BUILD_URL}', cc: '', from: '', replyTo: '', subject: '${currentBuild.result} CI: Project name -> ${env.JOB_NAME}', to: 'muqeeth.23@gmail.com' - } - } + + } + post { + always { + mail bcc: '', body: '
Project: ${env.JOB_NAME}
Build Number: ${env.BUILD_NUMBER}
URL de build: ${env.BUILD_URL}', cc: '', from: '', replyTo: '', subject: '${currentBuild.result} CI: Project name -> ${env.JOB_NAME}', to: 'muqeeth.23@gmail.com' + } } } From ac3d4585c22a4a56e8f3e58b816421d2cef80144 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Fri, 17 Dec 2021 22:38:08 +0530 Subject: [PATCH 74/78] post step --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7dbfe197..5fc5c60c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -75,9 +75,9 @@ pipeline { } - post { - always { - mail bcc: '', body: '
Project: ${env.JOB_NAME}
Build Number: ${env.BUILD_NUMBER}
URL de build: ${env.BUILD_URL}', cc: '', from: '', replyTo: '', subject: '${currentBuild.result} CI: Project name -> ${env.JOB_NAME}', to: 'muqeeth.23@gmail.com' - } - } + post { + always { + mail bcc: '', body: "
Project: ${env.JOB_NAME}
Build Number: ${env.BUILD_NUMBER}
URL de build: ${env.BUILD_URL}", cc: '', charset: 'UTF-8', from: '', mimeType: 'text/html', replyTo: '', subject: "${currentBuild.result} CI: Project name -> ${env.JOB_NAME}", to: "muqeeth.23@gmail.com"; + } + } } From 155e60adcc50aea0bf66fe50e79d18d32e16ef51 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Mon, 27 Dec 2021 20:53:59 +0530 Subject: [PATCH 75/78] added manifest --- Jenkinsfile | 30 ++++++++++++++++-------------- k8smanifest/deployment.yml | 0 2 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 k8smanifest/deployment.yml diff --git a/Jenkinsfile b/Jenkinsfile index 5fc5c60c..84580d7c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { } stages { - stage('sonarQualityCheck') { + stage('sonarQualityCheck') { steps { script { withSonarQubeEnv('sonar-server') { @@ -53,27 +53,29 @@ pipeline { } } } - - - - stage('Unit Test1') { + stage('Manual approval') { steps { - echo 'Testing..' - + timeout(10) { + mail bcc: '', body: "Please click on the below link to review and approve deployment http://13.233.214.250:8080/job/pipeline_test/${env.BUILD_NUMBER}/console ", cc: '', from: '', replyTo: '', subject: 'Need approval to deploy', to: 'muqeeth.23@gmail.com' + input id: 'Deploygate', message: "Deploy ${env.JOB_NAME}?", ok: 'deploy' + } } } - stage('Deploy1') { + stage('Deploy with approval') { steps { - echo 'Deploying....' + script{ + withCredentials([kubeconfigFile(credentialsId: '7f2f53d9-632b-46e9-a7fc-ab7349cdf007', variable: 'KUBECONFIG')]) { + dir('k8smanifest') { + kubectl apply -f deployment.yml + } + + } + } + } } - - - - - } post { always { diff --git a/k8smanifest/deployment.yml b/k8smanifest/deployment.yml new file mode 100644 index 00000000..e69de29b From 1ffbd3d53efc1730426cbc4f8894b2fcc6d66390 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Mon, 27 Dec 2021 21:00:07 +0530 Subject: [PATCH 76/78] added dockerignore file --- .dockerignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..b02de25e --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +k8smanifest/* +.gitignore +Jenkinsfile +README.md \ No newline at end of file From b6fa377573e21317bc78bbf322ffae7ae09c41fd Mon Sep 17 00:00:00 2001 From: muqeeth Date: Mon, 27 Dec 2021 21:27:09 +0530 Subject: [PATCH 77/78] added service file --- Jenkinsfile | 2 ++ k8smanifest/deployment.yml | 21 +++++++++++++++++++++ k8smanifest/service.yml | 14 ++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 k8smanifest/service.yml diff --git a/Jenkinsfile b/Jenkinsfile index 84580d7c..d07eee89 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,7 +67,9 @@ pipeline { script{ withCredentials([kubeconfigFile(credentialsId: '7f2f53d9-632b-46e9-a7fc-ab7349cdf007', variable: 'KUBECONFIG')]) { dir('k8smanifest') { + kubectl create secret docker-registry registry-secret --docker-username=admin --docker-password=admin123 --docker-email=admin@test.com --docker-server=http://172.31.44.35:8082 kubectl apply -f deployment.yml + kubectl apply -f service.yml } } diff --git a/k8smanifest/deployment.yml b/k8smanifest/deployment.yml index e69de29b..f0ed0522 100644 --- a/k8smanifest/deployment.yml +++ b/k8smanifest/deployment.yml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: webappcal + name: webappcal +spec: + replicas: 2 + selector: + matchLabels: + app: webappcal + template: + metadata: + labels: + app: webappcal + spec: + imagePullSecrets: + - name: registry-secret + containers: + - image: 172.31.44.35:8082/webappcal + name: webappcal diff --git a/k8smanifest/service.yml b/k8smanifest/service.yml new file mode 100644 index 00000000..462d12ec --- /dev/null +++ b/k8smanifest/service.yml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: webappcal + name: webappcal +spec: + ports: + - port: 8080 + protocol: TCP + targetPort: 8080 + selector: + app: webappcal + type: LoadBalancer \ No newline at end of file From f3286952e4db5926b51a0dd722618ac2a2557f16 Mon Sep 17 00:00:00 2001 From: muqeeth Date: Mon, 27 Dec 2021 21:33:02 +0530 Subject: [PATCH 78/78] added secret manifest --- Jenkinsfile | 2 +- k8smanifest/registrysecret.yml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 k8smanifest/registrysecret.yml diff --git a/Jenkinsfile b/Jenkinsfile index d07eee89..226eb64c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,7 +67,7 @@ pipeline { script{ withCredentials([kubeconfigFile(credentialsId: '7f2f53d9-632b-46e9-a7fc-ab7349cdf007', variable: 'KUBECONFIG')]) { dir('k8smanifest') { - kubectl create secret docker-registry registry-secret --docker-username=admin --docker-password=admin123 --docker-email=admin@test.com --docker-server=http://172.31.44.35:8082 + kubectl apply -f registrysecret.yml kubectl apply -f deployment.yml kubectl apply -f service.yml } diff --git a/k8smanifest/registrysecret.yml b/k8smanifest/registrysecret.yml new file mode 100644 index 00000000..e955f0f0 --- /dev/null +++ b/k8smanifest/registrysecret.yml @@ -0,0 +1,7 @@ +apiVersion: v1 +data: + .dockerconfigjson: eyJhdXRocyI6eyJodHRwOi8vMTcyLjMxLjQ0LjM1OjgwODIiOnsidXNlcm5hbWUiOiJhZG1pbiIsInBhc3N3b3JkIjoiYWRtaW4xMjMiLCJlbWFpbCI6ImFkbWluQHRlc3QuY29tIiwiYXV0aCI6IllXUnRhVzQ2WVdSdGFXNHhNak09In19fQ== +kind: Secret +metadata: + name: registry-secret +type: kubernetes.io/dockerconfigjson \ No newline at end of file