From cfd0f7d690dbd6506dac730766f6bf5753917c77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Aug 2025 13:10:40 +0000 Subject: [PATCH 1/5] Bump mavenVersion from 4.0.0-rc-3 to 4.0.0-rc-4 Bumps `mavenVersion` from 4.0.0-rc-3 to 4.0.0-rc-4. Updates `org.apache.maven:maven-api-core` from 4.0.0-rc-3 to 4.0.0-rc-4 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-3...maven-4.0.0-rc-4) Updates `org.apache.maven:maven-api-di` from 4.0.0-rc-3 to 4.0.0-rc-4 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-3...maven-4.0.0-rc-4) Updates `org.apache.maven:maven-api-annotations` from 4.0.0-rc-3 to 4.0.0-rc-4 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-3...maven-4.0.0-rc-4) Updates `org.apache.maven:maven-api-model` from 4.0.0-rc-3 to 4.0.0-rc-4 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-3...maven-4.0.0-rc-4) Updates `org.apache.maven:maven-core` from 4.0.0-rc-3 to 4.0.0-rc-4 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-3...maven-4.0.0-rc-4) Updates `org.apache.maven:maven-impl` from 4.0.0-rc-3 to 4.0.0-rc-4 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-3...maven-4.0.0-rc-4) --- updated-dependencies: - dependency-name: org.apache.maven:maven-api-core dependency-version: 4.0.0-rc-4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-api-di dependency-version: 4.0.0-rc-4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-api-annotations dependency-version: 4.0.0-rc-4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-api-model dependency-version: 4.0.0-rc-4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-core dependency-version: 4.0.0-rc-4 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-impl dependency-version: 4.0.0-rc-4 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- .../java/org/apache/maven/plugins/deploy/DeployFileMojo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6c85598..56c027c 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ under the License. 17 - 4.0.0-rc-3 + 4.0.0-rc-4 6.0.0 ${version.maven-antrun-plugin} 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); From 65e88eecc6ba6d3953134482737ea369a6310625 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 10 Aug 2025 11:52:43 +0200 Subject: [PATCH 2/5] fix api --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 56c027c..95b7d27 100644 --- a/pom.xml +++ b/pom.xml @@ -135,6 +135,13 @@ under the License. provided + + org.apache.maven + maven-xml + ${mavenVersion} + provided + + org.apache.maven.plugin-testing From f4d1fc0037727980ef9993c5e490ecd8a9092f37 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 10 Aug 2025 12:27:06 +0200 Subject: [PATCH 3/5] fix something and use newer plugin --- pom.xml | 1 + src/it/deploy-attached-sources/invoker.properties | 2 +- src/it/deploy-default-packaging/invoker.properties | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 95b7d27..d08370c 100644 --- a/pom.xml +++ b/pom.xml @@ -244,6 +244,7 @@ under the License. org.apache.maven.plugins maven-invoker-plugin + 3.9.1 true true diff --git a/src/it/deploy-attached-sources/invoker.properties b/src/it/deploy-attached-sources/invoker.properties index f366f27..a9151a1 100644 --- a/src/it/deploy-attached-sources/invoker.properties +++ b/src/it/deploy-attached-sources/invoker.properties @@ -16,7 +16,7 @@ # under the License. # Clean build of the jars -invoker.goals = clean package +invoker.goals = clean package # Deploy the jars in a separate step invoker.goals.2 = ${project.groupId}:${project.artifactId}:${project.version}:deploy-file diff --git a/src/it/deploy-default-packaging/invoker.properties b/src/it/deploy-default-packaging/invoker.properties index 95ec334..6fbe245 100644 --- a/src/it/deploy-default-packaging/invoker.properties +++ b/src/it/deploy-default-packaging/invoker.properties @@ -16,4 +16,4 @@ # under the License. # Clean build of the jars -invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:deploy-file +invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:deploy-file From 216c89f48927126c84b45d38ba907b44fbec327f Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 10 Aug 2025 12:45:23 +0200 Subject: [PATCH 4/5] issue? --- src/it/deploy-attached-sources/test.properties | 2 +- src/it/deploy-default-packaging/test.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/it/deploy-attached-sources/test.properties b/src/it/deploy-attached-sources/test.properties index d970007..cdf87c5 100644 --- a/src/it/deploy-attached-sources/test.properties +++ b/src/it/deploy-attached-sources/test.properties @@ -21,5 +21,5 @@ pomFile = ${project.basedir}/pom.xml file = ${project.basedir}/target/${project.artifactId}-${project.version}.jar sources = ${project.basedir}/target/${project.artifactId}-${project.version}-sources.jar javadoc = ${project.basedir}/target/${project.artifactId}-${project.version}-javadoc.jar - +# not interpolated? url = file://${project.basedir}/target/repo diff --git a/src/it/deploy-default-packaging/test.properties b/src/it/deploy-default-packaging/test.properties index 5e05d5f..a695b30 100644 --- a/src/it/deploy-default-packaging/test.properties +++ b/src/it/deploy-default-packaging/test.properties @@ -20,4 +20,5 @@ groupId = org.apache.maven.test artifactId = test version = 1.1 file = ${project.basedir}/lib/test-1.1.jar +## this property is not interpolated? url = file://${project.basedir}/target/repo From d7b3d7a3f2d547426ebe5cdafcfffe3b1bba0f76 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 10 Aug 2025 21:05:50 +0200 Subject: [PATCH 5/5] Use default rc-4 --- .github/workflows/maven-verify.yml | 1 - 1 file changed, 1 deletion(-) 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