Skip to content

Upgrade to Maven 4.0.0-rc-2 #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slawekjaranowski merged 1 commit into from
Feb 12, 2025
Merged

Upgrade to Maven 4.0.0-rc-2 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions .github/workflows/maven-verify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@ jobs:
name: Verify
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
with:
ff-maven: "4.0.0-beta-5" # Maven version for fail-fast-build
maven-matrix: '[ "4.0.0-beta-5" ]'
jdk-matrix: '[ "17", "21" ]'
maven4-build: true
Copy link
Contributor

@gnodet gnodet Feb 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the effect of this flag ?

Copy link
Member Author

@slawekjaranowski slawekjaranowski Feb 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/apache/maven-gh-actions-shared?tab=readme-ov-file#build-with-maven-4-only

maven4-version: '4.0.0-rc-2' # the same as used in project
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

<properties>
<javaVersion>17</javaVersion>
<mavenVersion>4.0.0-beta-5</mavenVersion>
<mavenVersion>4.0.0-rc-2</mavenVersion>
<!-- Maven bound -->
<slf4jVersion>2.0.13</slf4jVersion>

Expand All @@ -84,7 +84,7 @@
<mavenEnforcerPluginVersion>3.1.0</mavenEnforcerPluginVersion>
<mavenJarPluginVersion>3.3.0</mavenJarPluginVersion>
<mavenPluginPluginVersion>4.0.0-beta-1</mavenPluginPluginVersion>
<mavenPluginTestingVersion>4.0.0-beta-2</mavenPluginTestingVersion>
<mavenPluginTestingVersion>4.0.0-beta-3</mavenPluginTestingVersion>
<mavenResourcesPluginVersion>3.3.0</mavenResourcesPluginVersion>
<mavenSourcePluginVersion>3.2.1</mavenSourcePluginVersion>
<mavenSurefirePluginVersion>3.2.2</mavenSurefirePluginVersion>
Expand Down Expand Up @@ -128,7 +128,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
Expand All @@ -153,7 +153,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-impl</artifactId>
<artifactId>maven-impl</artifactId>
<version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/maven/plugins/install/InstallFileMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public void execute() {

Session session = this.session;

List<Artifact> installableArtifacts = new ArrayList<>();
List<ProducedArtifact> installableArtifacts = new ArrayList<>();

// Override the default local repository
if (localRepositoryPath != null) {
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/org/apache/maven/plugins/install/InstallMojoPomPackagingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@

import java.io.File;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import java.util.stream.Collectors;

import org.apache.maven.api.Artifact;
import org.apache.maven.api.MojoExecution;
import org.apache.maven.api.ProducedArtifact;
import org.apache.maven.api.Project;
import org.apache.maven.api.Session;
import org.apache.maven.api.Type;
Expand Down Expand Up @@ -95,10 +95,10 @@ public void testInstallIfPackagingIsPom(InstallMojo mojo) throws Exception {
ArtifactInstallerRequest request = execute(mojo);

assertNotNull(request);
Collection<Artifact> artifacts = request.getArtifacts();
Collection<ProducedArtifact> artifacts = request.getArtifacts();
assertEquals(
Arrays.asList("org.apache.maven.test:maven-install-test:pom:1.0-SNAPSHOT"),
artifacts.stream().map(Artifact::key).collect(Collectors.toList()));
List.of("org.apache.maven.test:maven-install-test:pom:1.0-SNAPSHOT"),
artifacts.stream().map(Artifact::key).toList());
}

@Provides
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/org/apache/maven/plugins/install/InstallMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import java.util.stream.Collectors;

import org.apache.maven.api.Artifact;
import org.apache.maven.api.MojoExecution;
import org.apache.maven.api.ProducedArtifact;
import org.apache.maven.api.Project;
import org.apache.maven.api.di.Inject;
import org.apache.maven.api.di.Named;
Expand Down Expand Up @@ -105,12 +105,12 @@ public void testBasicInstall(InstallMojo mojo) throws Exception {
ArtifactInstallerRequest request = execute(mojo);

assertNotNull(request);
Collection<Artifact> artifacts = request.getArtifacts();
Collection<ProducedArtifact> artifacts = request.getArtifacts();
assertEquals(
Arrays.asList(
"org.apache.maven.test:maven-install-test:pom:1.0-SNAPSHOT",
"org.apache.maven.test:maven-install-test:jar:1.0-SNAPSHOT"),
artifacts.stream().map(Artifact::key).collect(Collectors.toList()));
artifacts.stream().map(Artifact::key).toList());
}

@Test
Expand All @@ -129,13 +129,13 @@ public void testBasicInstallWithAttachedArtifacts(InstallMojo mojo) throws Excep
ArtifactInstallerRequest request = execute(mojo);

assertNotNull(request);
Collection<Artifact> artifacts = request.getArtifacts();
Collection<ProducedArtifact> artifacts = request.getArtifacts();
assertEquals(
Arrays.asList(
"org.apache.maven.test:maven-install-test:pom:1.0-SNAPSHOT",
"org.apache.maven.test:maven-install-test:jar:1.0-SNAPSHOT",
"org.apache.maven.test:attached-artifact-test:jar:1.0-SNAPSHOT"),
artifacts.stream().map(Artifact::key).collect(Collectors.toList()));
artifacts.stream().map(Artifact::key).toList());
}

@Test
Expand Down
Loading