From a6f01e6ab6329c88d98eeca806d1b3791baefd4c Mon Sep 17 00:00:00 2001 From: Arpitha JK <150835585+ArpithaJK4@users.noreply.github.com> Date: Sun, 6 Jul 2025 22:20:49 +0530 Subject: [PATCH 01/11] Create build.yml --- .github/workflows/build.yml | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..9ea459e1 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,44 @@ +name: CI - Build and Compose Up + +on: + push: + branches: [ main ] + pull_request: + workflow_dispatch: + inputs: + compose_file: + description: 'Choose docker-compose file' + required: true + default: 'docker-compose.yml' + type: choice + options: + - docker-compose.yml + - docker-compose.kafka.yml + - docker-compose-partitions.yml + +jobs: + build-and-compose: + runs-on: ubuntu-latest + + steps: + - name: Checkout source code + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Create .env file + run: | + echo "CONFIG_SERVER_USR=admin" >> .env + echo "CONFIG_SERVER_PWD=admin123" >> .env + echo "CONFIG_SERVER_ENCRYPT_KEY=testkey123" >> .env + + - name: Show selected compose file + run: echo "Selected Compose File: ${{ github.event.inputs.compose_file || 'docker-compose.yml' }}" + + - name: Docker Compose Build and Up + run: | + docker compose -f ${{ github.event.inputs.compose_file || 'docker-compose.yml' }} up --build -d + + - name: Check running containers + run: docker ps -a From 5beeddcb1d47a46665fca2895b8e2c6d1a606a4f Mon Sep 17 00:00:00 2001 From: Arpitha JK <150835585+ArpithaJK4@users.noreply.github.com> Date: Sun, 6 Jul 2025 22:25:21 +0530 Subject: [PATCH 02/11] Update build.yml --- .github/workflows/build.yml | 39 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ea459e1..dba44568 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,43 +2,24 @@ name: CI - Build and Compose Up on: push: - branches: [ main ] + branches: [main, master] pull_request: - workflow_dispatch: - inputs: - compose_file: - description: 'Choose docker-compose file' - required: true - default: 'docker-compose.yml' - type: choice - options: - - docker-compose.yml - - docker-compose.kafka.yml - - docker-compose-partitions.yml + branches: [main, master] jobs: - build-and-compose: + build: runs-on: ubuntu-latest steps: - - name: Checkout source code - uses: actions/checkout@v4 + - name: Checkout code + uses: actions/checkout@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v2 - - name: Create .env file - run: | - echo "CONFIG_SERVER_USR=admin" >> .env - echo "CONFIG_SERVER_PWD=admin123" >> .env - echo "CONFIG_SERVER_ENCRYPT_KEY=testkey123" >> .env - - - name: Show selected compose file - run: echo "Selected Compose File: ${{ github.event.inputs.compose_file || 'docker-compose.yml' }}" + - name: Set up Docker Compose + run: sudo apt-get update && sudo apt-get install -y docker-compose - - name: Docker Compose Build and Up + - name: Build and run containers run: | - docker compose -f ${{ github.event.inputs.compose_file || 'docker-compose.yml' }} up --build -d - - - name: Check running containers - run: docker ps -a + docker-compose -f docker-compose.yml up --build -d From 61a8d4e0a5d515257dd2a219c5a5afa356767728 Mon Sep 17 00:00:00 2001 From: Arpitha JK <150835585+ArpithaJK4@users.noreply.github.com> Date: Sun, 6 Jul 2025 22:26:41 +0530 Subject: [PATCH 03/11] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dba44568..11b2f8ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,9 @@ name: CI - Build and Compose Up on: push: - branches: [main, master] + branches: [main, master,patch-1] pull_request: - branches: [main, master] + branches: [main, master,patch-1] jobs: build: From 3b4f4cfb9bceffce6e1dac5a167af3c8fa50f361 Mon Sep 17 00:00:00 2001 From: Arpitha JK <150835585+ArpithaJK4@users.noreply.github.com> Date: Sun, 6 Jul 2025 22:30:11 +0530 Subject: [PATCH 04/11] Update build.yml --- .github/workflows/build.yml | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11b2f8ba..76ed3572 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,22 @@ -name: CI - Build and Compose Up +name: CI - Multi Compose Builder on: + workflow_dispatch: + inputs: + compose_file: + description: 'Choose docker-compose file' + required: true + default: 'docker-compose.yml' + type: choice + options: + - docker-compose.yml + - docker-compose-partitions.yml + - dockercompose.kafka.yml + push: - branches: [main, master,patch-1] + branches: [main, master, patch-1] pull_request: - branches: [main, master,patch-1] + branches: [main, master, patch-1] jobs: build: @@ -14,12 +26,17 @@ jobs: - name: Checkout code uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + + - name: Build Spring Boot apps + run: mvn clean package -DskipTests + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Set up Docker Compose - run: sudo apt-get update && sudo apt-get install -y docker-compose - - - name: Build and run containers - run: | - docker-compose -f docker-compose.yml up --build -d + - name: Build & Run Docker Compose + run: docker-compose -f ${{ github.event.inputs.compose_file || 'docker-compose.yml' }} up --build -d From ab2e3f584a8b845ab07815804cae99569563dd9f Mon Sep 17 00:00:00 2001 From: Arpitha JK <150835585+ArpithaJK4@users.noreply.github.com> Date: Sun, 6 Jul 2025 22:36:19 +0530 Subject: [PATCH 05/11] Update build.yml --- .github/workflows/build.yml | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76ed3572..dde4a6a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,7 @@ on: push: branches: [main, master, patch-1] + pull_request: branches: [main, master, patch-1] @@ -32,11 +33,40 @@ jobs: distribution: 'temurin' java-version: '17' - - name: Build Spring Boot apps - run: mvn clean package -DskipTests + - name: Configure Maven Central Mirror + run: | + mkdir -p ~/.m2 + cat > ~/.m2/settings.xml < + + + central + + + central + https://repo.maven.apache.org/maven2 + true + false + + + + + + central + + + EOF + + - name: Build Spring Boot apps (skip tests) + run: mvn clean package -DskipTests --no-transfer-progress - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Build & Run Docker Compose - run: docker-compose -f ${{ github.event.inputs.compose_file || 'docker-compose.yml' }} up --build -d + run: | + COMPOSE_FILE="${{ github.event.inputs.compose_file }}" + if [ -z "$COMPOSE_FILE" ]; then + COMPOSE_FILE="docker-compose.yml" + fi + docker-compose -f "$COMPOSE_FILE" up --build -d From 2d3ef1696ad46a038ac7a1953618f39df9f5f143 Mon Sep 17 00:00:00 2001 From: Arpitha JK <150835585+ArpithaJK4@users.noreply.github.com> Date: Sun, 6 Jul 2025 22:40:03 +0530 Subject: [PATCH 06/11] Update build.yml --- .github/workflows/build.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dde4a6a5..84dbce9f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,6 @@ on: push: branches: [main, master, patch-1] - pull_request: branches: [main, master, patch-1] @@ -57,7 +56,12 @@ jobs: EOF - - name: Build Spring Boot apps (skip tests) + - name: Force remove SNAPSHOT of springfox-swagger2 + run: | + mvn dependency:purge-local-repository \ + -DmanualInclude="io.springfox:springfox-swagger2" + + - name: Build Spring Boot apps run: mvn clean package -DskipTests --no-transfer-progress - name: Set up Docker Buildx @@ -65,8 +69,5 @@ jobs: - name: Build & Run Docker Compose run: | - COMPOSE_FILE="${{ github.event.inputs.compose_file }}" - if [ -z "$COMPOSE_FILE" ]; then - COMPOSE_FILE="docker-compose.yml" - fi + COMPOSE_FILE="${{ github.event.inputs.compose_file || 'docker-compose.yml' }}" docker-compose -f "$COMPOSE_FILE" up --build -d From 379a92534fe1bc322eabee2f03046fa8f1b8814b Mon Sep 17 00:00:00 2001 From: Arpitha JK <150835585+ArpithaJK4@users.noreply.github.com> Date: Sun, 6 Jul 2025 22:43:26 +0530 Subject: [PATCH 07/11] Update pom.xml --- store-common/store-api/pom.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/store-common/store-api/pom.xml b/store-common/store-api/pom.xml index 9a3dcd84..323bbcc4 100644 --- a/store-common/store-api/pom.xml +++ b/store-common/store-api/pom.xml @@ -20,6 +20,7 @@ 2.3.0.M4 + 3.0.0 @@ -39,6 +40,13 @@ io.springfox springfox-swagger2 + ${springfox.version} + + io.springfox + springfox-swagger-ui + ${springfox.version} + + - \ No newline at end of file + From f09d5285ad748978dd45cbd64a7c4ae55e4cff96 Mon Sep 17 00:00:00 2001 From: Arpitha JK <150835585+ArpithaJK4@users.noreply.github.com> Date: Mon, 7 Jul 2025 22:25:07 +0530 Subject: [PATCH 08/11] Update pom.xml --- store-common/store-api/pom.xml | 135 ++++++++++++++++++++------------- 1 file changed, 83 insertions(+), 52 deletions(-) diff --git a/store-common/store-api/pom.xml b/store-common/store-api/pom.xml index 323bbcc4..43237975 100644 --- a/store-common/store-api/pom.xml +++ b/store-common/store-api/pom.xml @@ -1,52 +1,83 @@ - - - 4.0.0 - - - com.siriusxi.ms.store - store-build-chassis - 1.0-SNAPSHOT - ../../store-base/store-build-chassis/pom.xml - - - store-api - 1.0-SNAPSHOT - Store APIs - Project that define all Springy Store DTOs and REST APIs contracts - jar - - - - 2.3.0.M4 - 3.0.0 - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.dependencies.version} - import - pom - - - - - - - - io.springfox - springfox-swagger2 - ${springfox.version} - - - io.springfox - springfox-swagger-ui - ${springfox.version} - - - - +name: CI - Multi Compose Builder + +on: + workflow_dispatch: + inputs: + compose_file: + description: 'Choose docker-compose file' + required: true + default: 'docker-compose.yml' + type: choice + options: + - docker-compose.yml + - docker-compose-partitions.yml + - dockercompose.kafka.yml + + push: + branches: [main, master, patch-1] + pull_request: + branches: [main, master, patch-1] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + + - name: Configure Maven Central Mirror + run: | + mkdir -p ~/.m2 + cat > ~/.m2/settings.xml < + + + central + + + central + https://repo.maven.apache.org/maven2 + true + false + + + + + + central + + + EOF + + - name: Force remove invalid SNAPSHOT of springfox-swagger2 + run: | + mvn dependency:purge-local-repository \ + -DmanualInclude="io.springfox:springfox-swagger2" + + - name: Fix Springfox version in pom.xml + run: | + find . -name "pom.xml" -exec sed -i 's/3.0.0-SNAPSHOT<\/version>/3.0.0<\/version>/g' {} \; + + - name: Ensure Java 17 compatibility in compiler plugin + run: | + find . -name "pom.xml" -exec sed -i 's/15<\/source>/17<\/source>/g' {} \; + find . -name "pom.xml" -exec sed -i 's/15<\/target>/17<\/target>/g' {} \; + find . -name "pom.xml" -exec sed -i '/--enable-preview/d' {} \; + + - name: Build Spring Boot apps + run: mvn clean package -DskipTests --no-transfer-progress + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Build & Run Docker Compose + run: | + COMPOSE_FILE="${{ github.event.inputs.compose_file || 'docker-compose.yml' }}" + docker-compose -f "$COMPOSE_FILE" up --build -d From fbd3eff1e485604b1851d53bcb4bc7ed9f046227 Mon Sep 17 00:00:00 2001 From: Arpitha JK <150835585+ArpithaJK4@users.noreply.github.com> Date: Mon, 7 Jul 2025 22:27:37 +0530 Subject: [PATCH 09/11] Update build.yml --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84dbce9f..207a536d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,6 +56,10 @@ jobs: EOF + - name: Fix malformed pom.xml headers + run: | + find . -name "pom.xml" -exec sed -i '1s/^[^<]*//' {} \; + - name: Force remove SNAPSHOT of springfox-swagger2 run: | mvn dependency:purge-local-repository \ From 8cea3bb852e977ea6a79fcc1ec1cffe56b19bc9a Mon Sep 17 00:00:00 2001 From: Arpitha JK <150835585+ArpithaJK4@users.noreply.github.com> Date: Mon, 7 Jul 2025 22:29:09 +0530 Subject: [PATCH 10/11] Update build.yml --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 207a536d..f6fc5eb8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,5 +73,8 @@ jobs: - name: Build & Run Docker Compose run: | - COMPOSE_FILE="${{ github.event.inputs.compose_file || 'docker-compose.yml' }}" + COMPOSE_FILE="${{ github.event.inputs.compose_file }}" + if [ -z "$COMPOSE_FILE" ]; then + COMPOSE_FILE="docker-compose.yml" + fi docker-compose -f "$COMPOSE_FILE" up --build -d From 1245681559594ff92e469d67a63a348c2b6aeb7c Mon Sep 17 00:00:00 2001 From: Arpitha JK <150835585+ArpithaJK4@users.noreply.github.com> Date: Mon, 7 Jul 2025 22:31:22 +0530 Subject: [PATCH 11/11] Update build.yml --- .github/workflows/build.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6fc5eb8..5a3b9747 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,9 +56,11 @@ jobs: EOF - - name: Fix malformed pom.xml headers + - name: 🧹 Auto-fix malformed pom.xml files run: | - find . -name "pom.xml" -exec sed -i '1s/^[^<]*//' {} \; + find . -name "pom.xml" | while read file; do + awk 'BEGIN{fixed=0} NR==1 && $0 !~ /^<\?xml/{fixed=1; next} {if(!fixed || $0 ~ /^<\?xml/){print}}' "$file" > "$file.fixed" && mv "$file.fixed" "$file" + done - name: Force remove SNAPSHOT of springfox-swagger2 run: | @@ -73,8 +75,5 @@ jobs: - name: Build & Run Docker Compose run: | - COMPOSE_FILE="${{ github.event.inputs.compose_file }}" - if [ -z "$COMPOSE_FILE" ]; then - COMPOSE_FILE="docker-compose.yml" - fi + COMPOSE_FILE="${{ github.event.inputs.compose_file || 'docker-compose.yml' }}" docker-compose -f "$COMPOSE_FILE" up --build -d