Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/maven-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 9 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ under the License.

<properties>
<javaVersion>17</javaVersion>
<mavenVersion>4.0.0-rc-3</mavenVersion>
<mavenVersion>4.0.0-rc-4</mavenVersion>

<guiceVersion>6.0.0</guiceVersion>
<mavenAntrunPluginVersion>${version.maven-antrun-plugin}</mavenAntrunPluginVersion>
Expand Down Expand Up @@ -135,6 +135,13 @@ under the License.
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-xml</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>

<!-- Test -->
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
Expand Down Expand Up @@ -237,6 +244,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.9.1</version>
<configuration>
<debug>true</debug>
<showErrors>true</showErrors>
Expand Down
2 changes: 1 addition & 1 deletion src/it/deploy-attached-sources/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/it/deploy-attached-sources/test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/it/deploy-default-packaging/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions src/it/deploy-default-packaging/test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading