diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index c62636b5..c39f0942 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 6c855982..d08370c5 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} @@ -135,6 +135,13 @@ under the License. provided + + org.apache.maven + maven-xml + ${mavenVersion} + provided + + org.apache.maven.plugin-testing @@ -237,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 f366f27e..a9151a19 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-attached-sources/test.properties b/src/it/deploy-attached-sources/test.properties index d9700072..cdf87c5b 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/invoker.properties b/src/it/deploy-default-packaging/invoker.properties index 95ec3347..6fbe2458 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 diff --git a/src/it/deploy-default-packaging/test.properties b/src/it/deploy-default-packaging/test.properties index 5e05d5fa..a695b305 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 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 63c269ec..72d5bb5f 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);