From 9444a7073f78d0e0692591961de5498f2560cfe7 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Tue, 14 Jul 2026 19:05:02 +0530
Subject: [PATCH 01/15] Modify cicd.yml for branch and job updates

Updated CI/CD workflow to change branch name and job structure.
---
 .github/workflows/cicd.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/cicd.yml

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
new file mode 100644
index 00000000..1252990f
--- /dev/null
+++ b/.github/workflows/cicd.yml
@@ -0,0 +1,24 @@
+name: Cicd Pipeline
+
+on:
+  push:
+    branches: [ "maain" ]
+
+jobs:
+  compile:
+      runs-on: ubuntu-latest
+      
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+    - name: Update dependency graph
+      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

From ce9d47578a3fe17705615986e1f92c9a6a7617eb Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Tue, 14 Jul 2026 19:07:43 +0530
Subject: [PATCH 02/15] Fix branch name in CI/CD workflow

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 1252990f..2049e2d8 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -2,7 +2,7 @@ name: Cicd Pipeline
 
 on:
   push:
-    branches: [ "maain" ]
+    branches: [ "master" ]
 
 jobs:
   compile:

From 95c68287071b912667eb1ffa7dbf03ccff86e041 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Tue, 14 Jul 2026 19:09:11 +0530
Subject: [PATCH 03/15] Rename pipeline from 'Cicd' to 'Ci/Cd'

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 2049e2d8..fc2e7e44 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -1,4 +1,4 @@
-name: Cicd Pipeline
+name: Ci/Cd Pipeline
 
 on:
   push:

From f08dddba7c19c708bf6f2f698beb02c9fdce2125 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Tue, 14 Jul 2026 19:10:43 +0530
Subject: [PATCH 04/15] Add compile job to CI/CD workflow

---
 .github/workflows/cicd.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index fc2e7e44..57768a57 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -5,6 +5,7 @@ on:
     branches: [ "master" ]
 
 jobs:
+
   compile:
       runs-on: ubuntu-latest
       

From c7aaabca54444d0c9da2ca571730e00a96a383f0 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Tue, 14 Jul 2026 19:13:00 +0530
Subject: [PATCH 05/15] Refactor CI/CD workflow for Maven build

---
 .github/workflows/cicd.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 57768a57..d171d123 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -5,8 +5,7 @@ on:
     branches: [ "master" ]
 
 jobs:
-
-  compile:
+   compile:
       runs-on: ubuntu-latest
       
     steps:
@@ -19,7 +18,3 @@ jobs:
         cache: maven
     - name: Build with Maven
       run: mvn -B package --file pom.xml
-
-    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-    - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

From 07551e86f9b3d6dc4cdf43224f1220e1ace4ac6b Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Tue, 14 Jul 2026 19:15:12 +0530
Subject: [PATCH 06/15] yaml syntax

Updated CI/CD pipeline configuration for better clarity and structure.
---
 .github/workflows/cicd.yml | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index d171d123..f975b45f 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -1,20 +1,23 @@
-name: Ci/Cd Pipeline
+name: CI/CD Pipeline
 
 on:
   push:
-    branches: [ "master" ]
+    branches:
+      - master
 
 jobs:
-   compile:
-      runs-on: ubuntu-latest
-      
+  compile:
+    runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      - name: Checkout Code
+        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 clean package

From 6fdb0144de4d35df6a29a83d777f623fa25104c7 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Tue, 14 Jul 2026 21:33:13 +0530
Subject: [PATCH 07/15] Replace Maven build step with test workflow

---
 .github/workflows/cicd.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index f975b45f..695dbfe7 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -19,5 +19,5 @@ jobs:
           distribution: temurin
           java-version: '17'
 
-      - name: Build with Maven
-        run: mvn clean package
+      - name: Test Workflow  
+      run: echo "GitHub Actions is working!" 

From a56cfd12d0d26eb254d95da7f8f0aa8f0990ad35 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Tue, 14 Jul 2026 21:36:34 +0530
Subject: [PATCH 08/15] Replace test workflow with Maven build step

---
 .github/workflows/cicd.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 695dbfe7..b131fe08 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -19,5 +19,5 @@ jobs:
           distribution: temurin
           java-version: '17'
 
-      - name: Test Workflow  
-      run: echo "GitHub Actions is working!" 
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml

From 5567d3a930e8f7a1307e296b286baabee6a7b23a Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Tue, 14 Jul 2026 21:39:47 +0530
Subject: [PATCH 09/15] Update CI/CD workflow to include test step

Replaced Maven build step with a test echo command.
---
 .github/workflows/cicd.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index b131fe08..0986b4db 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -19,5 +19,5 @@ jobs:
           distribution: temurin
           java-version: '17'
 
-      - name: Build with Maven
-        run: mvn -B package --file pom.xml
+      - name: Test Workflow
+        run: echo "GitHub Actions CI/CD is working successfully!" 

From 2a48a2d76962e74474766637ff7401cdaa46f6c8 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Wed, 15 Jul 2026 17:51:01 +0530
Subject: [PATCH 10/15] Enhance CI/CD with security scanning tools git leaks

Added Trivy and Gitleaks installation and scanning steps.
---
 .github/workflows/cicd.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 0986b4db..64fd839d 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -21,3 +21,23 @@ jobs:
 
       - name: Test Workflow
         run: echo "GitHub Actions CI/CD is working successfully!" 
+
+        steps:
+          - uses: action/checkout@v4
+          - name: Trivy Installation
+            run:  |
+                sudo apt-get install wget gnupg
+                wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | gpg --dearmor | sudo tee /usr/share/keyrings/trivy.gpg > /dev/null
+                echo "deb [signed-by=/usr/share/keyrings/trivy.gpg] https://aquasecurity.github.io/trivy-repo/deb generic main" | sudo tee -a /etc/apt/sources.list.d/trivy.list
+                sudo apt-get update -y
+                sudo apt-get install trivy -y
+
+          - name: Trivy Fs Scan
+            run:  trivy fs --format table -o fs-report.json .
+
+          - name: git leaks installation
+            run: sudo apt install gitleaks -y
+
+          - name: Gitleaks codescan 
+            run: gitleaks detect source . -r gitleaks-report.json -f json
+            

From a63f0d2b09c18b92199df8e6c953ef0d301b06d6 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Wed, 15 Jul 2026 17:57:39 +0530
Subject: [PATCH 11/15] Refactor CI/CD workflow for Trivy setup

Updated CI/CD workflow to streamline Trivy installation and added version check.
---
 .github/workflows/cicd.yml | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 64fd839d..1ca4f63e 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -20,24 +20,19 @@ jobs:
           java-version: '17'
 
       - name: Test Workflow
-        run: echo "GitHub Actions CI/CD is working successfully!" 
-
-        steps:
-          - uses: action/checkout@v4
-          - name: Trivy Installation
-            run:  |
-                sudo apt-get install wget gnupg
-                wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | gpg --dearmor | sudo tee /usr/share/keyrings/trivy.gpg > /dev/null
-                echo "deb [signed-by=/usr/share/keyrings/trivy.gpg] https://aquasecurity.github.io/trivy-repo/deb generic main" | sudo tee -a /etc/apt/sources.list.d/trivy.list
-                sudo apt-get update -y
-                sudo apt-get install trivy -y
-
-          - name: Trivy Fs Scan
-            run:  trivy fs --format table -o fs-report.json .
-
-          - name: git leaks installation
-            run: sudo apt install gitleaks -y
-
-          - name: Gitleaks codescan 
-            run: gitleaks detect source . -r gitleaks-report.json -f json
+        run: echo "GitHub Actions CI/CD is working successfully!"
+        
+      - name: Install Trivy
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y wget apt-transport-https gnupg lsb-release
+          wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | \
+          gpg --dearmor | sudo tee /usr/share/keyrings/trivy.gpg > /dev/null
+          echo "deb [signed-by=/usr/share/keyrings/trivy.gpg] https://aquasecurity.github.io/trivy-repo/deb $(lsb_release -sc) main" | \
+          sudo tee /etc/apt/sources.list.d/trivy.list
+          sudo apt-get update
+          sudo apt-get install -y trivy
+
+      - name: Check Trivy Version
+        run: trivy --version
             

From 6160f663b4d1ffd2bf3c8697b46ac5be842e3636 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Wed, 15 Jul 2026 19:35:46 +0530
Subject: [PATCH 12/15] Update CI/CD workflow to include Maven build-security

Replaced test workflow with Maven build step and added security check.
---
 .github/workflows/cicd.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 1ca4f63e..4be9d7bf 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -19,8 +19,12 @@ jobs:
           distribution: temurin
           java-version: '17'
 
-      - name: Test Workflow
-        run: echo "GitHub Actions CI/CD is working successfully!"
+      - name: Build with Maven
+        run: mvn compile
+
+       security-check:
+          runs-on: ubuntu-latest
+          needs: compile
         
       - name: Install Trivy
         run: |

From 505390bc840e6dee2a9a9aec472548f1b2ab1bc5 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Wed, 15 Jul 2026 19:38:48 +0530
Subject: [PATCH 13/15] Update CI/CD workflow for Maven and security checks 2

---
 .github/workflows/cicd.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 4be9d7bf..4a42ee2d 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -20,12 +20,15 @@ jobs:
           java-version: '17'
 
       - name: Build with Maven
-        run: mvn compile
+        run: mvn clean compile
+
+  security-check:
+    runs-on: ubuntu-latest
+    needs: compile
+
+    steps:
+      - uses: actions/checkout@v4
 
-       security-check:
-          runs-on: ubuntu-latest
-          needs: compile
-        
       - name: Install Trivy
         run: |
           sudo apt-get update
@@ -37,6 +40,5 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y trivy
 
-      - name: Check Trivy Version
-        run: trivy --version
-            
+      - name: Scan Filesystem
+        run: trivy fs .

From 9684328f9555791d642b34efe02744df92a01f85 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Wed, 15 Jul 2026 19:49:39 +0530
Subject: [PATCH 14/15] Add repository structure check step in CI workflow 3

Added a step to check the repository structure before building with Maven.
---
 .github/workflows/cicd.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 4a42ee2d..47722de3 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -19,6 +19,15 @@ jobs:
           distribution: temurin
           java-version: '17'
 
+      - name: Check Repository Structure
+        run: |
+            pwd
+            ls -R
+
+      - name: Build with Maven
+        working-directory: Java-App
+        run: mvn clean package
+
       - name: Build with Maven
         run: mvn clean compile
 

From ec250086150306098207d73967254ee07bf80ea4 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Chinipilli
 <116083124+Sravanreddy8413@users.noreply.github.com>
Date: Wed, 15 Jul 2026 20:21:13 +0530
Subject: [PATCH 15/15] Add initial Maven POM file for DevOps project

pom.xml files
---
 Jenkins_Jobs/pom.xml files | 60 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 Jenkins_Jobs/pom.xml files

diff --git a/Jenkins_Jobs/pom.xml files b/Jenkins_Jobs/pom.xml files
new file mode 100644
index 00000000..8954e771
--- /dev/null
+++ b/Jenkins_Jobs/pom.xml files	
@@ -0,0 +1,60 @@
+<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
+         https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.example</groupId>
+    <artifactId>Simple-DevOps-Project</artifactId>
+    <version>1.0.0</version>
+    <packaging>jar</packaging>
+
+    <name>Simple DevOps Project</name>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.2.5</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.1</version>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>