From 0c76047a5d5e25091da2c8016b5f200ff0e221ea Mon Sep 17 00:00:00 2001
From: root <root@ip-172-31-84-162.ec2.internal>
Date: Mon, 3 Feb 2020 06:21:18 +0000
Subject: [PATCH 01/32] new changes

---
 webapp/src/main/webapp/index.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index 0a1ab21..aec606c 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -1,4 +1,4 @@
-<h1> Hello, Welcome to Simple DevOps Project Serge !!   </h1>
+<h1> Hello, Welcome to Simple DevOps Project !!   </h1>
 <h2> Data Service Group is your learning partner </h2>
 <h2> Glad to see you here </h2>
-<h1> Good job Serge on learning Devops</h1>
+<h1> Good job on learning Devops</h1>

From 71008649393bb4ef6a422c45e76f976ada211819 Mon Sep 17 00:00:00 2001
From: root <root@ip-172-31-84-162.ec2.internal>
Date: Mon, 3 Feb 2020 06:37:02 +0000
Subject: [PATCH 02/32] new change

---
 webapp/src/main/webapp/index.jsp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index aec606c..d6ba896 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -2,3 +2,4 @@
 <h2> Data Service Group is your learning partner </h2>
 <h2> Glad to see you here </h2>
 <h1> Good job on learning Devops</h1>
+<h1> I cant wait for you to start making big $$$$ doing this</h1>

From 050c7182cbc323ba0fd1ff62368d1764068d65b2 Mon Sep 17 00:00:00 2001
From: kserge2001 <kserge2001@yahoo.fr>
Date: Sun, 19 Apr 2020 13:53:50 -0400
Subject: [PATCH 03/32] Create Jenkinsfile

---
 Jenkinsfile | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..ac8886b
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,64 @@
+pipeline {
+    agent any
+    triggers {
+        cron('H */1 * * * ')
+     }
+    tools {
+        maven 'M2_HOME'
+      
+    }
+    stages {
+      stage('Build'){
+        steps {
+          echo "Build step"
+          sh 'mvn clean'
+          sh 'mvn install'
+          sh 'mvn package
+        }
+      
+      
+      }
+      stage('sonaqube analys'){
+         steps{
+         withSonarQubeEnv('sonar') {
+                 sh 'mvn sonar:sonar'
+              }
+         }
+      }
+        stage('test '){
+        steps {
+            retry(4){
+          echo  "test step"
+            }
+          sh 'mvn test'
+        }
+      
+      
+      }
+        stage('deploy'){
+        steps {
+            
+         sshPublisher(publishers: [sshPublisherDesc(configName: 'Docker-host', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: 'docker rmi pcontact:v.${BUILD_NUMBER}; docker build -t pcontact:v.${BUILD_NUMBER} .; docker tag pcontact:v.${BUILD_NUMBER} kserge2001/pcontact:v.${BUILD_NUMBER}; docker push kserge2001/pcontact:v.${BUILD_NUMBER};', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '', remoteDirectorySDF: false, removePrefix: 'webapp/target', sourceFiles: '**/*.war')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)]) 
+           
+        }
+      
+      
+      }
+    
+    }
+    post {
+        always {
+            echo "Always display this message "
+        }
+        failure {
+            echo "Job failed "
+        }
+        success {
+            echo "Successful run "
+        }
+        unstable {
+            echo "The job is unstable "
+        }
+    } 
+
+}

From 0ce893dfa6c76c9ae3e25f2211a39f80fc9e985e Mon Sep 17 00:00:00 2001
From: kserge2001 <kserge2001@yahoo.fr>
Date: Sun, 19 Apr 2020 13:55:32 -0400
Subject: [PATCH 04/32] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ac8886b..fe6305a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
           echo "Build step"
           sh 'mvn clean'
           sh 'mvn install'
-          sh 'mvn package
+          sh 'mvn package'
         }
       
       

From 2588383c6711531880afd978f53fbbfa49cf347c Mon Sep 17 00:00:00 2001
From: kserge2001 <kserge2001@yahoo.fr>
Date: Sun, 19 Apr 2020 14:09:42 -0400
Subject: [PATCH 05/32] Update Jenkinsfile

---
 Jenkinsfile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index fe6305a..aaec9a0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,6 +25,14 @@ pipeline {
               }
          }
       }
+        stage("Quality Gate status check"){
+          timeout(time: 1, unit: 'HOURS') {
+              def qg = waitForQualityGate()
+              if (qg.status != 'OK') {
+                  error "Pipeline aborted due to quality gate failure: ${qg.status}"
+              }
+          }
+      }        
         stage('test '){
         steps {
             retry(4){

From ec39df90ebd2017bcac256cfc4139564cc192e13 Mon Sep 17 00:00:00 2001
From: kserge2001 <kserge2001@yahoo.fr>
Date: Sun, 19 Apr 2020 14:12:47 -0400
Subject: [PATCH 06/32] Update Jenkinsfile

---
 Jenkinsfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index aaec9a0..d44e5f8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,14 +25,13 @@ pipeline {
               }
          }
       }
-        stage("Quality Gate status check"){
-          timeout(time: 1, unit: 'HOURS') {
-              def qg = waitForQualityGate()
-              if (qg.status != 'OK') {
-                  error "Pipeline aborted due to quality gate failure: ${qg.status}"
+       stage("Quality Gate") {
+            steps {
+              timeout(time: 1, unit: 'HOURS') {
+                waitForQualityGate abortPipeline: true
               }
+            }
           }
-      }        
         stage('test '){
         steps {
             retry(4){

From 34404141e13acdd94509c23be55a74185e9f9499 Mon Sep 17 00:00:00 2001
From: kserge2001 <kserge2001@yahoo.fr>
Date: Fri, 17 Jul 2020 15:48:42 -0400
Subject: [PATCH 07/32] Update Dockerfile

path
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7974651..e83ea8b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,4 +3,4 @@ From tomcat:8-jre8
 
 # Maintainer 
 MAINTAINER "kserge2001@yahoo.fr" 
-COPY ./webapp.war /usr/local/tomcat/webapps
+COPY ./webapp/target/webapp.war /usr/local/tomcat/webapps

From 987593f80d21566a74201134da5116f4ed057783 Mon Sep 17 00:00:00 2001
From: root <root@ip-172-31-42-178.ec2.internal>
Date: Mon, 20 Jul 2020 18:38:00 +0000
Subject: [PATCH 08/32] docker

---
 webapp/src/main/webapp/index.jsp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index d6ba896..0a79ebd 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -3,3 +3,4 @@
 <h2> Glad to see you here </h2>
 <h1> Good job on learning Devops</h1>
 <h1> I cant wait for you to start making big $$$$ doing this</h1>
+<h1> this line is for docker test</h1>

From 7c6fe6c0ce637c5ae757f740ee02dea81c959a4a Mon Sep 17 00:00:00 2001
From: kserge2001 <kserge2001@yahoo.fr>
Date: Mon, 20 Jul 2020 17:05:09 -0400
Subject: [PATCH 09/32] Update TestGreeter.java

---
 server/src/test/java/com/example/TestGreeter.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/src/test/java/com/example/TestGreeter.java b/server/src/test/java/com/example/TestGreeter.java
index 46c9b53..c13c979 100644
--- a/server/src/test/java/com/example/TestGreeter.java
+++ b/server/src/test/java/com/example/TestGreeter.java
@@ -31,3 +31,4 @@ public void greetShouldIncludeGreetingPhrase() {
     assertThat(greeter.greet(someone).length(), is(greaterThan(someone.length())));
   }
 }
+echo "good job"

From 08b9e33cc51222d9b173f62224633b3ad5dac404 Mon Sep 17 00:00:00 2001
From: serge <kserge2001@yahoo.fr>
Date: Mon, 20 Jul 2020 17:06:23 -0400
Subject: [PATCH 10/32] jdnjfjf

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index d44e5f8..eaed994 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -69,3 +69,4 @@ pipeline {
     } 
 
 }
+echo "Jenkinsfile"

From ab93be4763021799006b8a53430062f0a808a09c Mon Sep 17 00:00:00 2001
From: kserge2001 <kserge2001@yahoo.fr>
Date: Mon, 20 Jul 2020 17:09:14 -0400
Subject: [PATCH 11/32] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8196d20..6d26033 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # maven-project
 
-Simple Maven Project
+Simple and sweet project  Maven Project

From 5d8393b9ca8735b2e308a084929d78aee03c9139 Mon Sep 17 00:00:00 2001
From: serge <kserge2001@yahoo.fr>
Date: Mon, 20 Jul 2020 17:09:34 -0400
Subject: [PATCH 12/32] jfjdhfdh

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8196d20..23ab704 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
 # maven-project
 
-Simple Maven Project
+Simple Maven Project conflict
+

From 3337a46e719110f9936620d0d8af3f3a959b5314 Mon Sep 17 00:00:00 2001
From: kserge2001 <kserge2001@yahoo.fr>
Date: Tue, 21 Jul 2020 00:06:34 -0400
Subject: [PATCH 13/32] Update pom.xml

---
 pom.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eccd206..38ff04b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,15 @@
           <target>1.6</target>
         </configuration>
       </plugin>
-
+<plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-compiler-plugin</artifactId>
+      <configuration>
+        <compilerVersion>1.5</compilerVersion>
+        <source>1.5</source>
+        <target>1.5</target>
+      </configuration>
+    </plugin>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>

From 712abee4aa25013a1544277ecb11fea0dd9215b0 Mon Sep 17 00:00:00 2001
From: kserge2001 <kserge2001@yahoo.fr>
Date: Tue, 21 Jul 2020 00:11:41 -0400
Subject: [PATCH 14/32] Update pom.xml

---
 pom.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 38ff04b..047b947 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,14 +31,7 @@
 
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-<plugin>
+             <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-compiler-plugin</artifactId>
       <configuration>
@@ -47,6 +40,14 @@
         <target>1.5</target>
       </configuration>
     </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>

From 598feee5f0f9de1174b208c1b2f4ec03199d9714 Mon Sep 17 00:00:00 2001
From: kserge2001 <kserge2001@yahoo.fr>
Date: Tue, 28 Jul 2020 00:45:24 -0400
Subject: [PATCH 15/32] Update pom.xml

---
 pom.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 047b947..4fed338 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,14 +31,7 @@
 
   <build>
     <plugins>
-             <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-compiler-plugin</artifactId>
-      <configuration>
-        <compilerVersion>1.5</compilerVersion>
-        <source>1.5</source>
-        <target>1.5</target>
-      </configuration>
+             
     </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

From ded7ac6a9b582e4ea745ed0f5e7ff4109fafffb1 Mon Sep 17 00:00:00 2001
From: kserge2001 <kserge2001@yahoo.fr>
Date: Tue, 28 Jul 2020 00:47:28 -0400
Subject: [PATCH 16/32] Update pom.xml

---
 pom.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4fed338..2b93dc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,9 +30,7 @@
   </distributionManagement>
 
   <build>
-    <plugins>
-             
-    </plugin>
+    
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>

From a5339b1401c74d5d6cba98b29192f4615807779c Mon Sep 17 00:00:00 2001
From: kserge2001 <kserge2001@yahoo.fr>
Date: Tue, 28 Jul 2020 00:49:04 -0400
Subject: [PATCH 17/32] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2b93dc9..b20868e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     </site>
   </distributionManagement>
 
-  <build>
+  
     
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

From dc7a31f28efb7a5a4902c9a6aee340ffeb821156 Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sat, 27 Feb 2021 00:22:49 -0500
Subject: [PATCH 18/32] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b20868e..be4aeba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     </site>
   </distributionManagement>
 
-  
+<build>  
     
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

From 398034078f61e06de83d1bcee87087e089c17e17 Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sat, 27 Feb 2021 14:55:22 -0500
Subject: [PATCH 19/32] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index be4aeba..eeac301 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     </site>
   </distributionManagement>
 
-<build>  
+ 
     
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

From cf903b58c4b89d51799b4639818f472c433d2862 Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sun, 28 Feb 2021 19:53:43 -0500
Subject: [PATCH 20/32] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eeac301..a8254fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     </site>
   </distributionManagement>
 
- 
+ <build>
     
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

From cc0d9ab51edd5e5587e94678a6eeb640209b5ea8 Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sun, 28 Feb 2021 21:32:33 -0500
Subject: [PATCH 21/32] Update index.jsp

---
 webapp/src/main/webapp/index.jsp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index 0a1ab21..3d267c9 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -1,4 +1,3 @@
-<h1> Hello, Welcome to Simple DevOps Project Serge !!   </h1>
-<h2> Data Service Group is your learning partner </h2>
-<h2> Glad to see you here </h2>
-<h1> Good job Serge on learning Devops</h1>
+<h1> Hello, Welcome to Simple DevOps Project done by Serges D. !!   </h1>
+<h2> Deploying a war file to a Tomcat Server.  </h2>
+

From 40729c0928c87d6f6635839a374808b4e4527fd6 Mon Sep 17 00:00:00 2001
From: Serges <s_deugoue@hotmail.com>
Date: Sun, 28 Feb 2021 21:49:12 -0500
Subject: [PATCH 22/32] change index.jsp

---
 webapp/src/main/webapp/index.jsp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index 0a79ebd..a5a7084 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -1,6 +1,2 @@
 <h1> Hello, Welcome to Simple DevOps Project !!   </h1>
-<h2> Data Service Group is your learning partner </h2>
-<h2> Glad to see you here </h2>
-<h1> Good job on learning Devops</h1>
-<h1> I cant wait for you to start making big $$$$ doing this</h1>
 <h1> this line is for docker test</h1>

From 62540096e71f233779706867bb03c764d15ff690 Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sun, 28 Feb 2021 22:15:53 -0500
Subject: [PATCH 23/32] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a8254fb..be85437 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     </site>
   </distributionManagement>
 
- <build>
+
     
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

From 93e340cb5aa81512536c6c62582969444186a207 Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sun, 28 Feb 2021 22:18:05 -0500
Subject: [PATCH 24/32] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index be85437..b20868e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     </site>
   </distributionManagement>
 
-
+  
     
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

From 12ff333c8d03b27369910ce369ca71ae57a9dec0 Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sun, 28 Feb 2021 22:51:57 -0500
Subject: [PATCH 25/32] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b20868e..b731846 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
   
     
       <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
+         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>

From 41d3d881643124cfba53d94e02c33c19a9353c5d Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sun, 28 Feb 2021 23:00:30 -0500
Subject: [PATCH 26/32] Update pom.xml

---
 pom.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b731846..9846f8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,9 +28,7 @@
       <url>file:///tmp/maven-project-site</url>
     </site>
   </distributionManagement>
-
-  
-    
+         
       <plugin>
          <artifactId>maven-compiler-plugin</artifactId>
         <configuration>

From 83b5f8050236b2d9f1939b142458f67c0d9f8e8a Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sun, 28 Feb 2021 23:02:39 -0500
Subject: [PATCH 27/32] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9846f8b..79d3d20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     </site>
   </distributionManagement>
          
-      <plugin>
+ <plugin>
          <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.6</source>

From c6bb5f3995b173057d2ce5b53f9dad89c0d5e684 Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sun, 28 Feb 2021 23:12:30 -0500
Subject: [PATCH 28/32] Update pom.xml

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 79d3d20..7fe246c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,15 +28,15 @@
       <url>file:///tmp/maven-project-site</url>
     </site>
   </distributionManagement>
-         
- <plugin>
+   <build>      
+      <plugin>
          <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
         </configuration>
       </plugin>
-
+   </build>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>

From c5e160efd64dc24edf20d24676a883654e6d261f Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sun, 28 Feb 2021 23:13:53 -0500
Subject: [PATCH 29/32] Update pom.xml

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7fe246c..339c4de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,13 +29,13 @@
     </site>
   </distributionManagement>
    <build>      
-      <plugin>
+     
          <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
         </configuration>
-      </plugin>
+     
    </build>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>

From 6c59a4190741167d6469e75cb0f24b8833c147a7 Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sun, 28 Feb 2021 23:15:45 -0500
Subject: [PATCH 30/32] Update pom.xml

---
 pom.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 339c4de..0587f17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,15 +28,13 @@
       <url>file:///tmp/maven-project-site</url>
     </site>
   </distributionManagement>
-   <build>      
-     
+   <plugin>     
          <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
         </configuration>
-     
-   </build>
+   </plugin>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>

From 91b694be4a283094e5f79ae4266e2bc832b6afc3 Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sun, 28 Feb 2021 23:20:31 -0500
Subject: [PATCH 31/32] Update pom.xml

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0587f17..49697e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,13 +28,13 @@
       <url>file:///tmp/maven-project-site</url>
     </site>
   </distributionManagement>
-   <plugin>     
+  <plugin>     
          <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
         </configuration>
-   </plugin>
+  </plugin>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>

From c2ca351d33436341f4138c42c9540bed88bebeab Mon Sep 17 00:00:00 2001
From: deugouegithub2020 <77032261+deugouegithub2020@users.noreply.github.com>
Date: Sun, 28 Feb 2021 23:47:16 -0500
Subject: [PATCH 32/32] Update pom.xml

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 49697e1..931bc43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,13 +28,13 @@
       <url>file:///tmp/maven-project-site</url>
     </site>
   </distributionManagement>
-  <plugin>     
-         <artifactId>maven-compiler-plugin</artifactId>
+  <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
         </configuration>
-  </plugin>
+      </plugin>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>