From 5cab02739f8765baf3e40db9e33f44098ebd97b8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Nov 2025 12:41:27 +0000 Subject: [PATCH 1/4] Initial plan From ae6795705efbe94a6644bc720a15c7ac651f62f6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Nov 2025 12:45:20 +0000 Subject: [PATCH 2/4] Remove release plugin arguments from pom.xml and update workflows Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com> --- .github/workflows/maven-publish.yml | 4 +++- .github/workflows/release.yml | 4 +++- pom.xml | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 934eef12..9bd353b6 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -31,7 +31,9 @@ jobs: run: | git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - mvn -B -batch-mode release:prepare release:perform --file pom.xml + # Only release production modules, exclude all sample modules + mvn -B -batch-mode release:prepare release:perform --file pom.xml \ + -Darguments="-pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am" env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index adf169ce..2f89753a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -108,9 +108,11 @@ jobs: echo "Performing release and deploying to Maven Central" # Run release:perform to build and deploy + # Only release production modules, exclude all sample modules ./mvnw -B release:perform \ -DlocalCheckout=true \ - -DeployAtEnd=true + -DeployAtEnd=true \ + -Darguments="-pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am" env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} diff --git a/pom.xml b/pom.xml index db35a478..cf2ade43 100644 --- a/pom.xml +++ b/pom.xml @@ -254,8 +254,6 @@ false release deploy - - -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am From a27f6ccbe16e5b7eabf7ada293c4997792aece05 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Nov 2025 14:06:15 +0000 Subject: [PATCH 3/4] Simplify Maven commands by using -pl directly instead of -Darguments Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com> --- .github/workflows/maven-publish.yml | 3 +-- .github/workflows/release.yml | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 9bd353b6..e5bcccce 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -32,8 +32,7 @@ jobs: git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" # Only release production modules, exclude all sample modules - mvn -B -batch-mode release:prepare release:perform --file pom.xml \ - -Darguments="-pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am" + mvn -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am -batch-mode release:prepare release:perform --file pom.xml env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2f89753a..357c327f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -94,7 +94,8 @@ jobs: # Run release:prepare with explicit release version # Maven will automatically calculate the next development version - ./mvnw -B release:prepare \ + # Only prepare production modules, exclude all sample modules + ./mvnw -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am release:prepare \ -DreleaseVersion="${VERSION}" \ -Dtag="${TAG_NAME}" \ -DpushChanges=false From 5799f93d3919b27545cf035f325ef93810fab113 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Nov 2025 14:19:50 +0000 Subject: [PATCH 4/4] Use consistent -pl syntax in release:perform step Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com> --- .github/workflows/release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 357c327f..5f27ee3b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -110,10 +110,9 @@ jobs: # Run release:perform to build and deploy # Only release production modules, exclude all sample modules - ./mvnw -B release:perform \ + ./mvnw -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am release:perform \ -DlocalCheckout=true \ - -DeployAtEnd=true \ - -Darguments="-pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am" + -DeployAtEnd=true env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}