team16flight · judiefriend · Jun 19, 2022 · Jun 19, 2022 · Jun 19, 2022 · Jun 21, 2022
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -0,0 +1,26 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -0,0 +1,26 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,2 @@
-FROM tomcat:8.0.20-jre8
-# Dummy text to test 
-COPY target/*.war /usr/local/tomcat/webapps/maven-web-app.war
+FROM tomcat:9.0.64-jre8-openjdk-slim-buster
+COPY target/*.war /usr/local/tomcat/webapps/td.war
diff --git a/JudithJenkinsDeclarativeScript b/JudithJenkinsDeclarativeScript
@@ -0,0 +1,23 @@
+pipeline{
+  agent any
+  tools{
+    maven "maven3.8.5"
+  }
+  stages{
+    stage("1.CodeClone"){
+      steps{
+        git credentialsId: 'GitHub-Cred', url: 'https://github.com/judiefriend/maven-web-app.git'
+      }
+    }
+    stage("2.Build"){
+      steps{
+        sh "mvn clean package"
+      }
+    }
+    stage("3.CodeQuality"){
+      steps{
+        sh "mvn sonar:sonar"
+      }
+    }
+  }
+}
diff --git a/pom.xml b/pom.xml
@@ -21,9 +21,9 @@
 		<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.host.url>http://54.177.31.189:5500/</sonar.host.url>
 		<sonar.login>admin</sonar.login>
-		<sonar.password>admin</sonar.password>
+		<sonar.password>admin123</sonar.password>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
@@ -97,13 +97,13 @@
 	    <repository>
 	      <id>nexus</id>
 	      <name>Acada Learning Releases Nexus Repository</name>
-	      <url>http://172.31.86.108:8081/repository/uba-release/</url>
+	      <url>http://172.31.4.21: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/uba-snapshot/</url>
+	      <url>http://172.31.4.21:8081/repository/rbc-app-snapshot/</url>
 	    </snapshotRepository>
 
 	</distributionManagement>

diff --git a/src/main/webapp/jsps/home.jsp b/src/main/webapp/jsps/home.jsp
@@ -10,10 +10,16 @@
 </head>
 <body>
 <h1 align="center">ACADA Learning</h1>
-<h2 align="center"> Welcome to ACADA Learning. 
+<h2 align="left"> Welcome to ACADA Learning. 
 	ACADA Learning is a an ideal online training  platform for DevOps and Cloud Engineers. 
 	We offer interview preparations and job assitance,
-	The shout of the King is in our midst. His name is JESUS.  HE IS OUR SUCCESS ACCESS KEY. Jesus is Lord</h2>
+	The shout of the King is in our midst. His name is JESUS.  HE IS OUR SUCCESS ACCESS KEY. Jesus is Lord.
+	I am ading this new after our first Jenkins class via git. I would run a build in Jenkins then check to see if its implemented in the Tomcat URL.
+	I am now using this line to test the poll SCM feature. Its been set to check every minute for new commits. If no new commits then it does nothing. If there is a new commit (What i am trying to do here) then it will do a build. 
+	This worked. Now I want to try out the Webhook function. Rather than having jenkins come at specified times to check for new commits to build, Github would be the one to push new commits to Jenkins to build. This is the difference between Poll SCM and Webhook function.
+	I have sucessfully intergrated my githib with Visual Studio and i am currently entering this line from my VS
+	Ayo collaborating on this file from a computer in the sky.
+	Ayo adding a second line from sky computer</h2>
 <hr>
 <div style="text-align: center;">
 	<span>