Merge pull request #7 from DefinitelyNotTzeJing/branch1

Update master with branch1

Author: Alison0309

.github/workflows/build.yml

@@ -0,0 +1,23 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - branch1
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Build with Maven
+      run: mvn package

.github/workflows/deploy.yml

@@ -0,0 +1,32 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - branch1
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+
+    - name: Build with Maven
+      run: mvn package
+
+    - name: Set up Docker
+      uses: docker/setup-buildx-action@v3
+
+    - name: Build Docker image
+      run: docker build -t my-java-app .
+
+    - name: Run Docker container
+      run: docker run -d -p 8081:8081 my-java-app

.github/workflows/test.yml

@@ -0,0 +1,23 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - branch1
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Run Tests with Maven
+      run: mvn test

Jenkinsfile

@@ -0,0 +1,44 @@
+pipeline {
+    agent any
+    stages {
+        stage('Checkout') {
+            steps {
+                git branch: 'branch3', url: 'https://github.com/Vanny253/simple-java-maven-app.git'
+            }
+        }
+        stage('Build') {
+            steps {
+                bat 'mvn clean package -DskipTests'
+            }
+        }
+        stage('Test') {
+            steps {
+                bat 'mvn test'
+            }
+            post {
+                always {
+                    junit 'target/surefire-reports/*.xml'  // This will show test results in Jenkins
+                }
+            }
+        }
+        stage('Deliver') {
+            steps {
+                bat 'jenkins\\scripts\\deliver.bat'
+            }
+        }
+    }
+    post {
+        always {
+            echo 'Cleaning up workspace'
+            deleteDir() // Clean up the workspace after the build
+        }
+        success {
+            echo 'Build succeeded!!!'
+        }
+        failure {
+            echo 'Build failed!'
+        }
+    }
+}
+
+

jenkins/Jenkinsfile

@@ -0,0 +1,12 @@
+@echo off
+REM Install your Maven-built JAR into the local repo
+echo Running Maven install into Jenkins's local repository…
+mvn jar:jar install:install help:evaluate -Dexpression=project.name
+
+REM Read project name and version from the POM
+for /f "delims=" %%N in ('mvn -q -DforceStdout help:evaluate -Dexpression=project.name') do set "NAME=%%N"
+for /f "delims=" %%V in ('mvn -q -DforceStdout help:evaluate -Dexpression=project.version') do set "VERSION=%%V"
+
+REM Run the built JAR so you can see its output in the console
+echo Launching JAR target\%NAME%-%VERSION%.jar…
+java -jar target\%NAME%-%VERSION%.jar

jenkins/scripts/deliver.bat

@@ -5,7 +5,7 @@
 
 public class App {
 
-    private static final String MESSAGE = "Hello from Spark Web Server!!!";
+    private static final String MESSAGE = "Hello from Spark Web Server!!!Come";
 
     public App() {}
 

jenkins/scripts/deliver.sh

@@ -1,8 +1,7 @@
 package com.mycompany.app;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for simple App.
@@ -20,6 +19,6 @@ public void testAppConstructor() {
     public void testAppMessage()
     {
         App app = new App();
-        assertEquals("Hello from Spark Web Server!!!", app.getMessage());
+        assertEquals("Hello from Spark Web Server!!!Come", app.getMessage());
     }
 }