From 1c4419ea6f24ae5c59c1fd51a379261217a6004b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Nov 2025 15:57:34 +0000 Subject: [PATCH 1/3] Initial plan From 6aedcd96cd722d56850f0c9eaeb3fbb12bb2a687 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Nov 2025 16:01:48 +0000 Subject: [PATCH 2/3] Fix maven-release-plugin to pass -pl/-am to forked Maven invocations Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com> --- .github/workflows/maven-publish.yml | 4 +++- .github/workflows/release.yml | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index e5bcccce..8f919837 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -32,7 +32,9 @@ 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 -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am -batch-mode release:prepare release:perform --file pom.xml + # Pass -pl/-am to forked Maven invocations via -Darguments + mvn -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am -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 5f27ee3b..47bcfc6f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -95,10 +95,12 @@ jobs: # Run release:prepare with explicit release version # Maven will automatically calculate the next development version # Only prepare production modules, exclude all sample modules + # Pass -pl/-am to forked Maven invocations via -Darguments ./mvnw -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am release:prepare \ -DreleaseVersion="${VERSION}" \ -Dtag="${TAG_NAME}" \ - -DpushChanges=false + -DpushChanges=false \ + -Darguments="-pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am" env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} @@ -110,9 +112,11 @@ jobs: # Run release:perform to build and deploy # Only release production modules, exclude all sample modules + # Pass -pl/-am to forked Maven invocations via -Darguments ./mvnw -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am 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 }} From 09dca8e4a56d3f84ec69abff13342aaadb14731f Mon Sep 17 00:00:00 2001 From: Thomas Turrell-Croft Date: Mon, 17 Nov 2025 16:15:41 +0000 Subject: [PATCH 3/3] Apply suggestions from code review --- .github/workflows/maven-publish.yml | 2 +- .github/workflows/release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 8f919837..3c1ea8e2 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -33,7 +33,7 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" # Only release production modules, exclude all sample modules # Pass -pl/-am to forked Maven invocations via -Darguments - mvn -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am -batch-mode release:prepare release:perform --file pom.xml \ + 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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47bcfc6f..a7baea5a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -96,7 +96,7 @@ jobs: # Maven will automatically calculate the next development version # Only prepare production modules, exclude all sample modules # Pass -pl/-am to forked Maven invocations via -Darguments - ./mvnw -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am release:prepare \ + ./mvnw -B release:prepare \ -DreleaseVersion="${VERSION}" \ -Dtag="${TAG_NAME}" \ -DpushChanges=false \ @@ -113,7 +113,7 @@ jobs: # Run release:perform to build and deploy # Only release production modules, exclude all sample modules # Pass -pl/-am to forked Maven invocations via -Darguments - ./mvnw -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am release:perform \ + ./mvnw -B release:perform \ -DlocalCheckout=true \ -DeployAtEnd=true \ -Darguments="-pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am"