Skip to content

Upgrade to Maven 4.0.0-rc-3 #81

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

Closed
gnodet wants to merge 1 commit into from
Closed

Upgrade to Maven 4.0.0-rc-3 #81

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
6 changes: 3 additions & 3 deletions ...ugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@
import org.apache.maven.di.Injector;
import org.apache.maven.di.Key;
import org.apache.maven.di.impl.DIException;
import org.apache.maven.impl.InternalSession;
import org.apache.maven.impl.model.DefaultModelPathTranslator;
import org.apache.maven.impl.model.DefaultPathTranslator;
import org.apache.maven.internal.impl.DefaultLog;
import org.apache.maven.internal.impl.InternalSession;
import org.apache.maven.internal.impl.model.DefaultModelPathTranslator;
import org.apache.maven.internal.impl.model.DefaultPathTranslator;
import org.apache.maven.internal.xml.XmlNodeImpl;
import org.apache.maven.internal.xml.XmlPlexusConfiguration;
import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
Expand Down
4 changes: 2 additions & 2 deletions ...testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ArtifactStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import org.apache.maven.api.Version;
import org.apache.maven.api.VersionConstraint;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.internal.impl.DefaultModelVersionParser;
import org.apache.maven.internal.impl.DefaultVersionParser;
import org.apache.maven.impl.DefaultModelVersionParser;
import org.apache.maven.impl.DefaultVersionParser;
import org.eclipse.aether.util.version.GenericVersionScheme;

/**
Expand Down
21 changes: 21 additions & 0 deletions ...-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/ProjectStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.model.Model;
import org.apache.maven.api.model.PluginContainer;
import org.apache.maven.api.model.Profile;

/**
* @author Olivier Lamy
Expand Down Expand Up @@ -169,6 +170,26 @@ public Optional<Project> getParent() {
return Optional.empty();
}

@Override
public List<Profile> getDeclaredProfiles() {
return List.of();
}

@Override
public List<Profile> getEffectiveProfiles() {
return List.of();
}

@Override
public List<Profile> getDeclaredActiveProfiles() {
return List.of();
}

@Override
public List<Profile> getEffectiveActiveProfiles() {
return List.of();
}

@Override
public boolean isTopProject() {
return topProject;
Expand Down
64 changes: 31 additions & 33 deletions ...ess/src/main/java/org/apache/maven/api/plugin/testing/stubs/RepositorySystemSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,38 +26,37 @@
import java.util.function.Supplier;

import org.apache.maven.api.services.ModelBuilder;
import org.apache.maven.internal.impl.DefaultModelUrlNormalizer;
import org.apache.maven.internal.impl.DefaultModelVersionParser;
import org.apache.maven.internal.impl.DefaultModelXmlFactory;
import org.apache.maven.internal.impl.DefaultPluginConfigurationExpander;
import org.apache.maven.internal.impl.DefaultSuperPomProvider;
import org.apache.maven.internal.impl.DefaultUrlNormalizer;
import org.apache.maven.internal.impl.model.DefaultDependencyManagementImporter;
import org.apache.maven.internal.impl.model.DefaultDependencyManagementInjector;
import org.apache.maven.internal.impl.model.DefaultInheritanceAssembler;
import org.apache.maven.internal.impl.model.DefaultInterpolator;
import org.apache.maven.internal.impl.model.DefaultModelBuilder;
import org.apache.maven.internal.impl.model.DefaultModelCacheFactory;
import org.apache.maven.internal.impl.model.DefaultModelInterpolator;
import org.apache.maven.internal.impl.model.DefaultModelNormalizer;
import org.apache.maven.internal.impl.model.DefaultModelPathTranslator;
import org.apache.maven.internal.impl.model.DefaultModelProcessor;
import org.apache.maven.internal.impl.model.DefaultModelValidator;
import org.apache.maven.internal.impl.model.DefaultPathTranslator;
import org.apache.maven.internal.impl.model.DefaultPluginManagementInjector;
import org.apache.maven.internal.impl.model.DefaultProfileInjector;
import org.apache.maven.internal.impl.model.DefaultProfileSelector;
import org.apache.maven.internal.impl.model.rootlocator.DefaultRootLocator;
import org.apache.maven.internal.impl.resolver.DefaultArtifactDescriptorReader;
import org.apache.maven.internal.impl.resolver.DefaultModelResolver;
import org.apache.maven.internal.impl.resolver.DefaultVersionRangeResolver;
import org.apache.maven.internal.impl.resolver.DefaultVersionResolver;
import org.apache.maven.internal.impl.resolver.MavenArtifactRelocationSource;
import org.apache.maven.internal.impl.resolver.PluginsMetadataGeneratorFactory;
import org.apache.maven.internal.impl.resolver.SnapshotMetadataGeneratorFactory;
import org.apache.maven.internal.impl.resolver.VersionsMetadataGeneratorFactory;
import org.apache.maven.internal.impl.resolver.relocation.DistributionManagementArtifactRelocationSource;
import org.apache.maven.internal.impl.resolver.relocation.UserPropertiesArtifactRelocationSource;
import org.apache.maven.impl.DefaultModelUrlNormalizer;
import org.apache.maven.impl.DefaultModelVersionParser;
import org.apache.maven.impl.DefaultModelXmlFactory;
import org.apache.maven.impl.DefaultPluginConfigurationExpander;
import org.apache.maven.impl.DefaultSuperPomProvider;
import org.apache.maven.impl.DefaultUrlNormalizer;
import org.apache.maven.impl.model.DefaultDependencyManagementImporter;
import org.apache.maven.impl.model.DefaultDependencyManagementInjector;
import org.apache.maven.impl.model.DefaultInheritanceAssembler;
import org.apache.maven.impl.model.DefaultInterpolator;
import org.apache.maven.impl.model.DefaultModelBuilder;
import org.apache.maven.impl.model.DefaultModelInterpolator;
import org.apache.maven.impl.model.DefaultModelNormalizer;
import org.apache.maven.impl.model.DefaultModelPathTranslator;
import org.apache.maven.impl.model.DefaultModelProcessor;
import org.apache.maven.impl.model.DefaultModelValidator;
import org.apache.maven.impl.model.DefaultPathTranslator;
import org.apache.maven.impl.model.DefaultPluginManagementInjector;
import org.apache.maven.impl.model.DefaultProfileInjector;
import org.apache.maven.impl.model.DefaultProfileSelector;
import org.apache.maven.impl.model.rootlocator.DefaultRootLocator;
import org.apache.maven.impl.resolver.DefaultArtifactDescriptorReader;
import org.apache.maven.impl.resolver.DefaultModelResolver;
import org.apache.maven.impl.resolver.DefaultVersionRangeResolver;
import org.apache.maven.impl.resolver.DefaultVersionResolver;
import org.apache.maven.impl.resolver.MavenArtifactRelocationSource;
import org.apache.maven.impl.resolver.PluginsMetadataGeneratorFactory;
import org.apache.maven.impl.resolver.SnapshotMetadataGeneratorFactory;
import org.apache.maven.impl.resolver.VersionsMetadataGeneratorFactory;
import org.apache.maven.impl.resolver.relocation.DistributionManagementArtifactRelocationSource;
import org.apache.maven.impl.resolver.relocation.UserPropertiesArtifactRelocationSource;
import org.eclipse.aether.RepositoryListener;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
Expand Down Expand Up @@ -1076,7 +1075,6 @@ protected ModelBuilder createModelBuilder() {
new DefaultPluginConfigurationExpander(),
new DefaultModelVersionParser(getVersionScheme()),
List.of(),
new DefaultModelCacheFactory(),
new DefaultModelResolver(),
new DefaultInterpolator(),
new DefaultPathTranslator(),
Expand Down
8 changes: 4 additions & 4 deletions ...-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionMock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
import org.apache.maven.api.services.RepositoryFactory;
import org.apache.maven.api.services.VersionParser;
import org.apache.maven.api.services.xml.ModelXmlFactory;
import org.apache.maven.internal.impl.DefaultModelVersionParser;
import org.apache.maven.internal.impl.DefaultModelXmlFactory;
import org.apache.maven.internal.impl.DefaultVersionParser;
import org.apache.maven.internal.impl.InternalSession;
import org.apache.maven.impl.DefaultModelVersionParser;
import org.apache.maven.impl.DefaultModelXmlFactory;
import org.apache.maven.impl.DefaultVersionParser;
import org.apache.maven.impl.InternalSession;
import org.apache.maven.model.v4.MavenStaxReader;
import org.eclipse.aether.util.version.GenericVersionScheme;
import org.mockito.ArgumentMatchers;
Expand Down
13 changes: 13 additions & 0 deletions ...-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/SessionStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.Nullable;
import org.apache.maven.api.model.Repository;
import org.apache.maven.api.services.VersionResolverException;
import org.apache.maven.api.settings.Settings;
import org.apache.maven.api.toolchain.ToolchainModel;

/**
*/
Expand Down Expand Up @@ -443,4 +445,15 @@ public DependencyScope requireDependencyScope(String id) {
public PathScope requirePathScope(String id) {
return null;
}

@Override
public Collection<ToolchainModel> getToolchains() {
return List.of();
}

@Override
public Optional<Version> resolveHighestVersion(ArtifactCoordinates artifactCoordinates, List<RemoteRepository> list)
throws VersionResolverException {
return Optional.empty();
}
}
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ under the License.

<properties>
<surefire.version>3.5.1</surefire.version>
<mavenVersion>4.0.0-rc-2</mavenVersion>
<mavenVersion>4.0.0-rc-3-SNAPSHOT</mavenVersion>
<maven.site.path>plugin-testing-archives/LATEST</maven.site.path>
<javaVersion>17</javaVersion>
<project.build.outputTimestamp>2025-01-27T19:27:57Z</project.build.outputTimestamp>
Expand Down
Loading