From 77e7e88a74fc5efab840810d257f45411467ad48 Mon Sep 17 00:00:00 2001 From: Ravi Date: Thu, 30 Jul 2020 21:10:26 +0530 Subject: [PATCH 01/25] Delete Jenkinsfile --- Jenkinsfile | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 79780d1d..00000000 --- a/Jenkinsfile +++ /dev/null @@ -1,35 +0,0 @@ -pipeline { - agent any - - stages { - stage('Validate') { - steps { - sh 'mvn compile' - } - } - stage('Unit Testing') { - steps { - sh 'mvn test' - } - } - stage('Sonar Analysis') { - steps { - sh 'sleep 5' - echo 'mvn sonar' - } - } - stage('Publish Nexus') { - steps { - sh 'sleep 5' - echo 'mvn deploy' - } - } - stage('Deploy') { - steps { - sh 'sleep 5' - echo 'mvn tomact7' - } - } - } -} - From eefec18f9725e608a6b1189c7b5582c9b42fc2e4 Mon Sep 17 00:00:00 2001 From: Ravi Date: Sat, 1 Aug 2020 11:04:55 +0530 Subject: [PATCH 02/25] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62167b9e..0f943a29 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ releases - http://35.168.113.172:8081/nexus/content/repositories/releases + http://52.204.135.48:8081/nexus/content/repositories/releases From f8e42e53596db331c4fc7585a4a72b66404a1cbb Mon Sep 17 00:00:00 2001 From: Ravi Date: Sat, 1 Aug 2020 11:19:10 +0530 Subject: [PATCH 03/25] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f943a29..b16a4fe4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.web.cal WebAppCal war - 0.0.3 + 0.0.4 WebAppCal Maven Webapp http://maven.apache.org From 1634a0e4812fc532ba4c4a480482ac9c909d3557 Mon Sep 17 00:00:00 2001 From: Ravi Date: Sat, 1 Aug 2020 11:21:24 +0530 Subject: [PATCH 04/25] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b16a4fe4..c2d76926 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.web.cal WebAppCal war - 0.0.4 + 0.0.5 WebAppCal Maven Webapp http://maven.apache.org From 6f927a29f3e56b059e1526edf479d1aa7dc19bf7 Mon Sep 17 00:00:00 2001 From: Ravi Date: Sat, 1 Aug 2020 11:22:04 +0530 Subject: [PATCH 05/25] Update index.jsp --- src/main/webapp/index.jsp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 908bb68c..42c2bc35 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -20,10 +20,7 @@ subtraction
- + From 693b74245575eb291fa5dde2b6146ff896cf34a1 Mon Sep 17 00:00:00 2001 From: Ravi Date: Sat, 1 Aug 2020 11:34:41 +0530 Subject: [PATCH 06/25] Update Calculator.java --- 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..0d9a129f 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -18,7 +18,7 @@ public long subFucn(long first, long second){ public long mulFucn(long first, long second){ - return first*second; + return first/second; } From 4c36afce24637cbf048b768d654ddacbc9cdafe1 Mon Sep 17 00:00:00 2001 From: Ravi Date: Sat, 1 Aug 2020 11:35:51 +0530 Subject: [PATCH 07/25] Update Calculator.java --- 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 0d9a129f..d49b7aca 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -18,7 +18,7 @@ public long subFucn(long first, long second){ public long mulFucn(long first, long second){ - return first/second; + return first*second; } From 8f209fb7738d7abde9523afbb0e5169139841e27 Mon Sep 17 00:00:00 2001 From: Ravi Date: Sat, 1 Aug 2020 11:37:41 +0530 Subject: [PATCH 08/25] Create Jenkinsfile --- Jenkinsfile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..70f6f591 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,24 @@ +pipeline { + agent any + + stages { + stage('Validate') { + steps { + echo '-----------------------Fetching Code-----------------------' + git 'https://github.com/ravi2krishna/JavaWebCalculator.git' + sh 'mvn compile' + } + } + stage('Test') { + steps { + echo '-----------------------Testing Code-----------------------' + sh 'mvn test' + } + } + stage('Deploy') { + steps { + echo 'Deploying....' + } + } + } +} From e7f0fb8cf8964395ef8708d7862dc83b95c3ac6f Mon Sep 17 00:00:00 2001 From: Ravi Date: Mon, 17 Aug 2020 07:49:32 +0530 Subject: [PATCH 09/25] Delete Jenkinsfile --- Jenkinsfile | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 70f6f591..00000000 --- a/Jenkinsfile +++ /dev/null @@ -1,24 +0,0 @@ -pipeline { - agent any - - stages { - stage('Validate') { - steps { - echo '-----------------------Fetching Code-----------------------' - git 'https://github.com/ravi2krishna/JavaWebCalculator.git' - sh 'mvn compile' - } - } - stage('Test') { - steps { - echo '-----------------------Testing Code-----------------------' - sh 'mvn test' - } - } - stage('Deploy') { - steps { - echo 'Deploying....' - } - } - } -} From 6b73839bf394844c3fac08224d9044640409c550 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 23 Oct 2020 10:01:33 +0530 Subject: [PATCH 10/25] added new function --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 42c2bc35..fdf31aa0 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -20,6 +20,7 @@ subtraction
+product From 6e037f68b751f5ca2d0b88e74cc2e4f53d1f39f0 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 23 Oct 2020 10:06:23 +0530 Subject: [PATCH 11/25] added new function --- src/main/webapp/index.jsp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index fdf31aa0..5cf11b1e 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -18,9 +18,14 @@ addition
+ + From 70508eef9ab2e573bd5045606ac8a20fa6bd03c8 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Thu, 5 Nov 2020 10:09:09 +0530 Subject: [PATCH 12/25] new version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2d76926..9e1759ec 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.web.cal WebAppCal war - 0.0.5 + 0.0.6 WebAppCal Maven Webapp http://maven.apache.org From 62bc8de1aded390aa009b21a3a308d77e1ab0ec7 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 6 Nov 2020 09:30:04 +0530 Subject: [PATCH 13/25] 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..0d9a129f 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -18,7 +18,7 @@ public long subFucn(long first, long second){ public long mulFucn(long first, long second){ - return first*second; + return first/second; } From 69dddda84df8cb9fda1e289abea90d58a9d5484a Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Fri, 6 Nov 2020 09:57:18 +0530 Subject: [PATCH 14/25] bug fixed --- 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 0d9a129f..d49b7aca 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -18,7 +18,7 @@ public long subFucn(long first, long second){ public long mulFucn(long first, long second){ - return first/second; + return first*second; } From b19ef62b09bf70e886f53a3c9e66d9779e36978e Mon Sep 17 00:00:00 2001 From: Ravi Date: Fri, 8 Jan 2021 09:42:43 +0530 Subject: [PATCH 15/25] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e1759ec..ccfe8f9c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.web.cal WebAppCal war - 0.0.6 + 0.0.1 WebAppCal Maven Webapp http://maven.apache.org From ec60a1cc791704713cfb1d1c38de18a892d8b33f Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Mon, 22 Feb 2021 11:56:32 +0530 Subject: [PATCH 16/25] 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..0d9a129f 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -18,7 +18,7 @@ public long subFucn(long first, long second){ public long mulFucn(long first, long second){ - return first*second; + return first/second; } From bdaf393e64b85831b6f0a20bf63d42b0470e4177 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Mon, 22 Feb 2021 11:58:30 +0530 Subject: [PATCH 17/25] bugfixed --- 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 0d9a129f..d49b7aca 100644 --- a/src/main/java/mypackage/Calculator.java +++ b/src/main/java/mypackage/Calculator.java @@ -18,7 +18,7 @@ public long subFucn(long first, long second){ public long mulFucn(long first, long second){ - return first/second; + return first*second; } From bab6e216825b300a452bef597b1012dc38f358d0 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Sun, 8 Aug 2021 11:18:39 +0530 Subject: [PATCH 18/25] 0.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ccfe8f9c..24d0a58b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.web.cal WebAppCal war - 0.0.1 + 0.0.2 WebAppCal Maven Webapp http://maven.apache.org From 7af5ea5fcf43bc143f6711b706f4c62943670927 Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Sun, 8 Aug 2021 11:23:15 +0530 Subject: [PATCH 19/25] pipeline --- Jenkinsfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..b9822500 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,21 @@ +pipeline { + agent any + + stages { + stage('Build') { + steps { + echo 'Building..' + } + } + stage('Test') { + steps { + echo 'Testing..' + } + } + stage('Deploy') { + steps { + echo 'Deploying....' + } + } + } +} From 1c2a73cd8cb1c1d1112c9898c68f6ac7db33375c Mon Sep 17 00:00:00 2001 From: ravi2krishna Date: Sun, 8 Aug 2021 11:27:02 +0530 Subject: [PATCH 20/25] build --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index b9822500..ed97e091 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,6 +5,7 @@ pipeline { stage('Build') { steps { echo 'Building..' + sh 'mvn package' } } stage('Test') { From c8e87b7746e9c8e3ee08bceb68d4ada85622d50b Mon Sep 17 00:00:00 2001 From: Ravi Date: Thu, 2 Sep 2021 09:02:41 +0530 Subject: [PATCH 21/25] Delete Jenkinsfile --- Jenkinsfile | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index ed97e091..00000000 --- a/Jenkinsfile +++ /dev/null @@ -1,22 +0,0 @@ -pipeline { - agent any - - stages { - stage('Build') { - steps { - echo 'Building..' - sh 'mvn package' - } - } - stage('Test') { - steps { - echo 'Testing..' - } - } - stage('Deploy') { - steps { - echo 'Deploying....' - } - } - } -} From 91e1839b90b70f23859681478876e0cb50544ff9 Mon Sep 17 00:00:00 2001 From: Ravi Date: Mon, 17 Jan 2022 14:44:14 +0530 Subject: [PATCH 22/25] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24d0a58b..66c58484 100644 --- a/pom.xml +++ b/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 com.web.cal - WebAppCal + webapp war 0.0.2 WebAppCal Maven Webapp From 5c270e027de77ff2a8432b519a6a0ac7b1be2bdc Mon Sep 17 00:00:00 2001 From: Ravi Date: Tue, 18 Jan 2022 16:43:36 +0530 Subject: [PATCH 23/25] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66c58484..3b763dcc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.web.cal webapp war - 0.0.2 + 0.2 WebAppCal Maven Webapp http://maven.apache.org From 8691d26516168473f09a285133d825c89ea0b9bb Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 19 Jan 2022 14:55:09 +0530 Subject: [PATCH 24/25] Update pom.xml --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b763dcc..53cd1947 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,8 @@ releases - http://52.204.135.48:8081/nexus/content/repositories/releases + + http://binary.ibm.com/nexus/content/repositories/releases From 7c7262972c4ae19ff2417de8f0903abc6181a523 Mon Sep 17 00:00:00 2001 From: Ravi Date: Tue, 4 Oct 2022 10:49:06 +0530 Subject: [PATCH 25/25] Update pom.xml --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 53cd1947..267d029d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,11 @@ 0.2 WebAppCal Maven Webapp http://maven.apache.org + + UTF-8 + 1.6 + 1.6 + junit