team16flight · jakhibi · Jul 8, 2022 · Jul 8, 2022 · Sep 1, 2022 · Sep 3, 2022
diff --git a/Dockerfile b/Dockerfile
@@ -1,2 +1,2 @@
 FROM tomcat:8.0.20-jre8
-COPY target/*.war /usr/local/tomcat/webapps/td.war
+COPY target/*.war /usr/local/tomcat/webapps/cohort7.war
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
 # web-app
 # new commit
-
+# commit
+# Done
diff --git a/cohort9 b/cohort9
@@ -0,0 +1,51 @@
+  pipeline{
+  agent any
+  tools{
+    maven "maven3.8.5"
+  }
+  stages{
+    stage("1.CodeClone"){
+      steps{
+        git credentialsId: 'Github-Cred', url: 'https://github.com/acadalearning/web-app.git'
+    }
+    }
+    stage("2. build"){
+      steps{
+        sh "echo start of maven build"
+        sh "mvn clean package"
+      }
+    }
+    stage("3. Code Quality"){
+      steps{
+        sh "echo start of code quality"
+        sh "mvn sonar:sonar"
+      }
+    }
+    stage("4. Backup"){
+      steps{
+        sh "echo backup to nexus"
+        sh "mvn deploy"
+      }
+    }
+    stage("5. Deploy to UAT"){
+      steps{
+        sh "echo deploy to UAT Environment"
+        deploy adapters: [tomcat9(credentialsId: 'tomcat-cred2', path: '', url: 'http://172.31.12.185:7000/')], contextPath: null, war: 'target/*.war'
+      }
+    }
+    stage("6. Approval"){
+      steps{
+        sh "echo approval needed"
+        timeout(time:2, unit:'DAYS'){
+          input message:'Approval for Production eni'
+  }
+  }
+}
+    stage("5. Deploy to Prod"){
+      steps{
+        sh "echo deploy to Prod Environment"
+        deploy adapters: [tomcat9(credentialsId: 'tomcat-cred2', path: '', url: 'http://172.31.12.185:7000/')], contextPath: null, war: 'target/*.war'
+      }
+    }
+}
+}
diff --git a/jenkins-cohort8 b/jenkins-cohort8
@@ -0,0 +1,34 @@
+//scripted
+node(""){
+def MHD = tool name: "maven3.8.6"
+stage('GitClone'){
+sh "echo this is git clone"
+git credentialsId: 'Github-Cred', url: 'https://github.com/acadalearning/web-app.git'
+}
+stage('Build'){
+sh "echo start of build process"
+sh "${MHD}/bin/mvn package"
+}
+stage('CodeQuality'){
+sh "echo performing SonarQube Test"
+//sh "${MHD}/bin/mvn sonar:sonar"
+}
+stage('BackupArtifacts'){
+sh "echo backup to Nexus"
+sh "${MHD}/bin/mvn deploy"
+}
+stage('DeploytoStaging'){
+sh "echo Deploy to Tomcat server"
+deploy adapters: [tomcat9(credentialsId: 'Tomcat-cred', path: '', url: 'http://54.196.234.205:7000/')], contextPath: null, war: 'target/*war'
+}
+stage('Approval'){
+sh "echo approval for Jenkins-file-app"
+timeout(time:5, UNIT:'DAYS'){
+input message:'Approval for Prod'
+}
+}
+stage('DeploytoProd'){
+sh "echo Deploy to Tomcat server"
+deploy adapters: [tomcat9(credentialsId: 'Tomcat-cred', path: '', url: 'http://54.196.234.205:7000/')], contextPath: null, war: 'target/*war'
+}
+}
diff --git a/pom.xml b/pom.xml
@@ -1,153 +1,115 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.mt</groupId>
-	<artifactId>maven-web-application</artifactId>
-	<packaging>war</packaging>
-	<version>2.0.5-SNAPSHOT</version>
-
-	<name>maven-web-application</name>
-
-	<description>Maven Web Project for Java Project</description>
-
-	<organization>
-		<name>ACADA Learning</name>
-		<url>http://acadalearning.com/</url>
-	</organization>
-
-	<properties>
-		<jdk.version>1.8</jdk.version>
-		<spring.version>5.1.2.RELEASE</spring.version>
-		<junit.version>4.11</junit.version>
-		<log4j.version>1.2.17</log4j.version>
-		<sonar.host.url>http://172.31.81.112:7000/</sonar.host.url>
-		<sonar.login>admin</sonar.login>
-		<sonar.password>admin</sonar.password>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-	</properties>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20160212</version>
-		</dependency>
-
-		<!-- test dependencies -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>1.9.5</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- compile dependencies -->
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-    		<groupId>org.springframework</groupId>
-    		<artifactId>spring-web</artifactId>
-    		<version>${spring.version}</version>
-  		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-
-		<!-- provided dependencies -->
-
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-
-	</dependencies>
-
-	<distributionManagement>
-	    <repository>
-	      <id>nexus</id>
-	      <name>ACADA Learning Releases Nexus Repository</name>
-	      <url>http://172.31.86.108:8081/repository/rbc-app-release/</url>
-	    </repository>
-
-	    <snapshotRepository>
-	      <id>nexus</id>
-	      <name>ACADA Learning Snapshot Nexus Repository </name>
-	      <url>http://172.31.86.108:8081/repository/shared-lib-snapshot/</url>
-	    </snapshotRepository>
-
-	</distributionManagement>
-
-	<build>
-		<finalName>web-app</finalName>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.3</version>
-				<configuration>
-					<source>${jdk.version}</source>
-					<target>${jdk.version}</target>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-maven-plugin</artifactId>
-				<version>9.2.11.v20150529</version>
-				<configuration>
-					<scanIntervalSeconds>10</scanIntervalSeconds>
-					<webApp>
-						<contextPath>/maven-web-application</contextPath>
-					</webApp>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.9</version>
-				<configuration>
-					<downloadSources>true</downloadSources>
-					<downloadJavadocs>true</downloadJavadocs>
-					<wtpversion>2.0</wtpversion>
-					<wtpContextName>maven-web-application</wtpContextName>
-				</configuration>
-			</plugin>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<modelVersion>4.0.0</modelVersion>
+
+<groupId>com.mt</groupId>
+<artifactId>maven-web-application</artifactId>
+<version>2.0.7-SNAPSHOT</version>
+<packaging>war</packaging>
+
+<name>maven-web-application</name>
+
+<properties>
+
+<java.version>17</java.version>
+<spring.version>5.3.34</spring.version>
+<junit.version>4.13.2</junit.version>
+
+<maven.compiler.source>${java.version}</maven.compiler.source>
+<maven.compiler.target>${java.version}</maven.compiler.target>
+
+</properties>
+
+<dependencies>
+
+<!-- JSON -->
+<dependency>
+<groupId>org.json</groupId>
+<artifactId>json</artifactId>
+<version>20240303</version>
+</dependency>
+
+<!-- Servlet API -->
+<dependency>
+<groupId>jakarta.servlet</groupId>
+<artifactId>jakarta.servlet-api</artifactId>
+<version>5.0.0</version>
+<scope>provided</scope>
+</dependency>
+
+<!-- Spring -->
+<dependency>
+<groupId>org.springframework</groupId>
+<artifactId>spring-core</artifactId>
+<version>${spring.version}</version>
+</dependency>
+
+<dependency>
+<groupId>org.springframework</groupId>
+<artifactId>spring-context</artifactId>
+<version>${spring.version}</version>
+</dependency>
+
+<dependency>
+<groupId>org.springframework</groupId>
+<artifactId>spring-web</artifactId>
+<version>${spring.version}</version>
+</dependency>
+
+<dependency>
+<groupId>org.springframework</groupId>
+<artifactId>spring-webmvc</artifactId>
+<version>${spring.version}</version>
+</dependency>
+
+<!-- Testing -->
+
+<dependency>
+<groupId>junit</groupId>
+<artifactId>junit</artifactId>
+<version>${junit.version}</version>
+<scope>test</scope>
+</dependency>
+
+<dependency>
+<groupId>org.mockito</groupId>
+<artifactId>mockito-core</artifactId>
+<version>5.12.0</version>
+<scope>test</scope>
+</dependency>
+
+</dependencies>
+
+
+<build>
+
+<finalName>web-app</finalName>
+
+<plugins>
+
+<plugin>
+<groupId>org.apache.maven.plugins</groupId>
+<artifactId>maven-compiler-plugin</artifactId>
+<version>3.11.0</version>
+</plugin>
+
+<plugin>
+<groupId>org.eclipse.jetty</groupId>
+<artifactId>jetty-maven-plugin</artifactId>
+<version>11.0.20</version>
+
+<configuration>
+<contextPath>/maven-web-application</contextPath>
+<scanIntervalSeconds>10</scanIntervalSeconds>
+</configuration>
+
+</plugin>
+
 </plugins>
-	</build>
-	
-	
+
+</build>
+
 </project>
diff --git a/src/main/webapp/jsps/home.jsp b/src/main/webapp/jsps/home.jsp
@@ -11,7 +11,7 @@
 <body>
 <h1 align="center">Welcome to Acada Learning, Calgary, Canada Office.</h1>
 <h1 align="center">We are developing and supporting quality Software Solutions to millions of clients.
-	We offer Training for DevOps with Linux and Cloud equipping IT Engineers for best performance. God Loves you. Everyone will be hired </h1>
+	We offer Training for DevOps with Linux and Cloud equipping IT Engineers for best performance. God Loves you. Everyone will be hired with multiple job offers, Amen</h1>
 <hr>
 <br>
 	<h1><h3> Server Side IP Address </h3><br>