From d30a04cc8aabb3aec6c6410fa0d9aae528e168ff Mon Sep 17 00:00:00 2001 From: venkateswarlu Date: Wed, 17 Sep 2025 03:50:07 -0400 Subject: [PATCH 1/7] chenges made --- .github/dco.yml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/dco.yml b/.github/dco.yml index 37e411e1bee..61ce7989ce7 100644 --- a/.github/dco.yml +++ b/.github/dco.yml @@ -1,2 +1,23 @@ -require: - members: false \ No newline at end of file +name: Manual maven steps for ci +on: + pull_request: + branches: + - main + workflow_dispatch: + +jobs: + manual: + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v5 + - uses: actions/setup-java@v5 + with: + distribution: 'temurin' + java-version: '21' + - name: build package + run: mvn package + - name: publish test results + uses: EnricoMi/publish-unit-test-result-action@v2 + with: + files: | + **/target/surefire-reports/*.xml From 45ee0dca2b3e5a31566b179e96cea4288d0435be Mon Sep 17 00:00:00 2001 From: venkateswarlu Date: Wed, 17 Sep 2025 04:06:01 -0400 Subject: [PATCH 2/7] commits changed --- .github/dco.yml | 1 + pom.xml | 4 ++-- src/main/java/org/springframework/s25/s26/helloworld.java | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/springframework/s25/s26/helloworld.java diff --git a/.github/dco.yml b/.github/dco.yml index 61ce7989ce7..025bfcfc15e 100644 --- a/.github/dco.yml +++ b/.github/dco.yml @@ -21,3 +21,4 @@ jobs: with: files: | **/target/surefire-reports/*.xml + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8576c22ba59..360e65f4b4c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ - org.springframework.samples - spring-petclinic + s25.s26 + helloworld 3.5.0-SNAPSHOT petclinic diff --git a/src/main/java/org/springframework/s25/s26/helloworld.java b/src/main/java/org/springframework/s25/s26/helloworld.java new file mode 100644 index 00000000000..e982a2610f6 --- /dev/null +++ b/src/main/java/org/springframework/s25/s26/helloworld.java @@ -0,0 +1,7 @@ +package com.example; + +public class App { + public static void main(String[] args) { + System.out.println("Hello, World!"); + } +} From dcc346f93015619655380424bc970ab80de3dad3 Mon Sep 17 00:00:00 2001 From: venkateswarlu Date: Wed, 17 Sep 2025 04:12:50 -0400 Subject: [PATCH 3/7] new changes added --- .github/dco.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dco.yml b/.github/dco.yml index 025bfcfc15e..1d5f6ab57c3 100644 --- a/.github/dco.yml +++ b/.github/dco.yml @@ -21,4 +21,5 @@ jobs: with: files: | **/target/surefire-reports/*.xml + \ No newline at end of file From ad82b07f98c7445ed713145873fe98a3663a5e9d Mon Sep 17 00:00:00 2001 From: venkateswarlu Date: Wed, 17 Sep 2025 04:19:39 -0400 Subject: [PATCH 4/7] new commit --- .github/dco.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dco.yml b/.github/dco.yml index 1d5f6ab57c3..cf88bbcebcb 100644 --- a/.github/dco.yml +++ b/.github/dco.yml @@ -22,4 +22,4 @@ jobs: files: | **/target/surefire-reports/*.xml - \ No newline at end of file + From e5878c1d7a7901f9e36ced0d010780db7662f082 Mon Sep 17 00:00:00 2001 From: venkateswarlu Date: Wed, 17 Sep 2025 04:25:58 -0400 Subject: [PATCH 5/7] changes added java --- src/main/java/org/springframework/s25/s26/helloworld.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/s25/s26/helloworld.java b/src/main/java/org/springframework/s25/s26/helloworld.java index e982a2610f6..e77c181fbd7 100644 --- a/src/main/java/org/springframework/s25/s26/helloworld.java +++ b/src/main/java/org/springframework/s25/s26/helloworld.java @@ -1,6 +1,6 @@ package com.example; -public class App { +public class helloworld { public static void main(String[] args) { System.out.println("Hello, World!"); } From 4ff0e74056a77a6fd2dcc835635c4e4a0fa14b40 Mon Sep 17 00:00:00 2001 From: venkateswarlu Date: Wed, 17 Sep 2025 04:29:01 -0400 Subject: [PATCH 6/7] changes --- .github/workflows/deploy-and-test-cluster.yml | 31 ------------------- .github/workflows/gradle-build.yml | 31 ------------------- .github/workflows/maven-build.yml | 29 ----------------- 3 files changed, 91 deletions(-) delete mode 100644 .github/workflows/deploy-and-test-cluster.yml delete mode 100644 .github/workflows/gradle-build.yml delete mode 100644 .github/workflows/maven-build.yml diff --git a/.github/workflows/deploy-and-test-cluster.yml b/.github/workflows/deploy-and-test-cluster.yml deleted file mode 100644 index 7353a604bba..00000000000 --- a/.github/workflows/deploy-and-test-cluster.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Deploy and Test Cluster - -on: - push: - branches: [main] - paths: - - 'k8s/**' - pull_request: - branches: [main] - paths: - - 'k8s/**' - -jobs: - deploy-and-test-cluster: - runs-on: ubuntu-latest - steps: - - name: Check out the repository - uses: actions/checkout@v2 - - - name: Create k8s Kind Cluster - uses: helm/kind-action@v1 - - - name: Deploy application - run: | - kubectl apply -f k8s/ - - - name: Wait for Pods to be ready - run: | - kubectl wait --for=condition=ready pod -l app=demo-db --timeout=180s - kubectl wait --for=condition=ready pod -l app=petclinic --timeout=180s - diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml deleted file mode 100644 index c24c121b1e6..00000000000 --- a/.github/workflows/gradle-build.yml +++ /dev/null @@ -1,31 +0,0 @@ -# This workflow will build a Java project with Gradle, and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://docs.github.com/en/actions/use-cases-and-examples/building-and-testing/building-and-testing-java-with-gradle - -name: Java CI with Gradle - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ubuntu-latest - strategy: - matrix: - java: [ '17' ] - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK ${{matrix.java}} - uses: actions/setup-java@v4 - with: - java-version: ${{matrix.java}} - distribution: 'adopt' - cache: maven - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 - - name: Build with Gradle - run: ./gradlew build diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml deleted file mode 100644 index a1ec4dab78c..00000000000 --- a/.github/workflows/maven-build.yml +++ /dev/null @@ -1,29 +0,0 @@ -# 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://docs.github.com/en/actions/use-cases-and-examples/building-and-testing/building-and-testing-java-with-maven - -name: Java CI with Maven - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ubuntu-latest - strategy: - matrix: - java: [ '17' ] - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK ${{matrix.java}} - uses: actions/setup-java@v4 - with: - java-version: ${{matrix.java}} - distribution: 'adopt' - cache: maven - - name: Build with Maven Wrapper - run: ./mvnw -B verify From da487039b495660b15487ee362103097ae249eda Mon Sep 17 00:00:00 2001 From: venkateswarlu Date: Wed, 17 Sep 2025 04:35:36 -0400 Subject: [PATCH 7/7] new --- .github/dco.yml | 24 +----------------------- .github/workflows/v.yml/v2.yml | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/v.yml/v2.yml diff --git a/.github/dco.yml b/.github/dco.yml index cf88bbcebcb..c0f53d75c71 100644 --- a/.github/dco.yml +++ b/.github/dco.yml @@ -1,25 +1,3 @@ -name: Manual maven steps for ci -on: - pull_request: - branches: - - main - workflow_dispatch: -jobs: - manual: - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v5 - - uses: actions/setup-java@v5 - with: - distribution: 'temurin' - java-version: '21' - - name: build package - run: mvn package - - name: publish test results - uses: EnricoMi/publish-unit-test-result-action@v2 - with: - files: | - **/target/surefire-reports/*.xml - + diff --git a/.github/workflows/v.yml/v2.yml b/.github/workflows/v.yml/v2.yml new file mode 100644 index 00000000000..b0a65cced6d --- /dev/null +++ b/.github/workflows/v.yml/v2.yml @@ -0,0 +1,23 @@ +name: Manual maven steps for ci +on: + pull_request: + branches: + - main + workflow_dispatch: + +jobs: + manual: + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v5 + - uses: actions/setup-java@v5 + with: + distribution: 'temurin' + java-version: '21' + - name: build package + run: mvn package + - name: publish test results + uses: EnricoMi/publish-unit-test-result-action@v2 + with: + files: | + **/target/surefire-reports/*.xml \ No newline at end of file