Release

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

Jenkinsfile

@@ -0,0 +1,72 @@
+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("Quality Gate") {
+            steps {
+              timeout(time: 1, unit: 'HOURS') {
+                waitForQualityGate abortPipeline: true
+              }
+            }
+          }
+        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 "
+        }
+    } 
+
+}
+echo "Jenkinsfile"

README.md

@@ -1,5 +1,4 @@
 # maven-project
 
-Simple Maven Project
+Simple Maven Project conflict
 
-This is the release branch created by Me Serge

pom.xml

@@ -28,17 +28,13 @@
       <url>file:///tmp/maven-project-site</url>
     </site>
   </distributionManagement>
-
-  <build>
-    <plugins>
-      <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>

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"

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 Deugoue. !!   </h1>
+<h2> Deploying a war file to a Tomcat Server.  </h2>
+