From 368954fb5b9eae787e8cbc7f05f5abfd1ed16459 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Nov 2025 17:04:30 +0000 Subject: [PATCH 1/2] Bump mavenVersion from 4.0.0-rc-3 to 4.0.0-rc-5 Bumps `mavenVersion` from 4.0.0-rc-3 to 4.0.0-rc-5. Updates `org.apache.maven:maven-api-core` from 4.0.0-rc-3 to 4.0.0-rc-5 Updates `org.apache.maven:maven-api-di` from 4.0.0-rc-3 to 4.0.0-rc-5 Updates `org.apache.maven:maven-api-annotations` from 4.0.0-rc-3 to 4.0.0-rc-5 Updates `org.apache.maven:maven-api-model` from 4.0.0-rc-3 to 4.0.0-rc-5 Updates `org.apache.maven:maven-core` from 4.0.0-rc-3 to 4.0.0-rc-5 Updates `org.apache.maven:maven-impl` from 4.0.0-rc-3 to 4.0.0-rc-5 --- updated-dependencies: - dependency-name: org.apache.maven:maven-api-core dependency-version: 4.0.0-rc-5 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-api-di dependency-version: 4.0.0-rc-5 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-api-annotations dependency-version: 4.0.0-rc-5 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-api-model dependency-version: 4.0.0-rc-5 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-core dependency-version: 4.0.0-rc-5 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-impl dependency-version: 4.0.0-rc-5 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e9b2e41..40e3b0d 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ under the License. 17 - 4.0.0-rc-3 + 4.0.0-rc-5 6.0.0 ${version.maven-antrun-plugin} From 167424874d60dc0bb0f42a58ea2c8477691bd5b5 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Fri, 14 Nov 2025 21:50:39 +0100 Subject: [PATCH 2/2] Adjust to rc5 --- .github/workflows/maven-verify.yml | 1 - pom.xml | 6 ++++++ .../org/apache/maven/plugins/deploy/DeployFileMojo.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index c62636b..c39f094 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -27,4 +27,3 @@ jobs: uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4 with: maven4-build: true - maven4-version: '4.0.0-rc-3' # as in project, rc-4 needs some work diff --git a/pom.xml b/pom.xml index 40e3b0d..0d0f399 100644 --- a/pom.xml +++ b/pom.xml @@ -134,6 +134,12 @@ under the License. ${mavenVersion} provided + + org.apache.maven + maven-xml + ${mavenVersion} + provided + diff --git a/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java b/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java index 63c269e..72d5bb5 100644 --- a/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java +++ b/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java @@ -368,7 +368,7 @@ public void execute() throws MojoException { ProducedArtifact deployable = session.createProducedArtifact( artifact.getGroupId(), artifact.getArtifactId(), - artifact.getVersion().asString(), + artifact.getVersion().toString(), classifiers.substring(ci, nci).trim(), extension, type);