diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java index 7303e8e61c58..736503d25efc 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java @@ -117,7 +117,7 @@ default String key() { * Determines whether this artifact uses a snapshot version. * * @return {@code true} if the artifact is a snapshot, {@code false} otherwise - * @see org.apache.maven.api.Session#isVersionSnapshot(String) + * @see Session#isVersionSnapshot(String) */ boolean isSnapshot(); @@ -125,7 +125,7 @@ default String key() { * {@return coordinates with the same identifiers as this artifact} * This is a shortcut for {@code session.createArtifactCoordinates(artifact)}. * - * @see org.apache.maven.api.Session#createArtifactCoordinates(Artifact) + * @see Session#createArtifactCoordinates(Artifact) */ @Nonnull ArtifactCoordinates toCoordinates(); diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Packaging.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Packaging.java index 98ca09c87204..62419b85e907 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/Packaging.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Packaging.java @@ -54,8 +54,8 @@ * } * * - * @see org.apache.maven.api.Session#requirePackaging(String) - * @see org.apache.maven.api.Project#getPackaging() + * @see Session#requirePackaging(String) + * @see Project#getPackaging() * @see org.apache.maven.api.model.Model#getPackaging() * @since 4.0.0 */ diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java index 3f43210dc0f2..6d92bd864ed8 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java @@ -693,7 +693,7 @@ Map> resolveDependencies( * * @param artifact the artifact for which to resolve the version * @return resolved version of the given artifact - * @throws org.apache.maven.api.services.VersionResolverException if the resolution failed + * @throws VersionResolverException if the resolution failed * * @see org.apache.maven.api.services.VersionResolver#resolve(Session, ArtifactCoordinates) (String) */ @@ -839,7 +839,7 @@ Optional resolveHighestVersion(@Nonnull ArtifactCoordinates artifact, L * @return the scope for the given identifier (never null) * @throws IllegalArgumentException if the given identifier is not a known scope * - * @see org.apache.maven.api.DependencyScope#forId(String) + * @see DependencyScope#forId(String) */ @Nonnull DependencyScope requireDependencyScope(@Nonnull String id); diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Version.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Version.java index cba76cac2849..c883682da4f2 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/Version.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Version.java @@ -28,7 +28,7 @@ * * @since 4.0.0 * @see org.apache.maven.api.services.VersionParser#parseVersion(String) - * @see org.apache.maven.api.Session#parseVersion(String) + * @see Session#parseVersion(String) * @see VersionConstraint * @see VersionRange */ diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/VersionConstraint.java b/api/maven-api-core/src/main/java/org/apache/maven/api/VersionConstraint.java index 4d5d08204eef..1ad0ed9af57a 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/VersionConstraint.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/VersionConstraint.java @@ -32,7 +32,7 @@ * @see Version * @see VersionRange * @see org.apache.maven.api.services.VersionParser#parseVersionConstraint(String) - * @see org.apache.maven.api.Session#parseVersionConstraint(String) + * @see Session#parseVersionConstraint(String) * @since 4.0.0 */ @Experimental diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/VersionRange.java b/api/maven-api-core/src/main/java/org/apache/maven/api/VersionRange.java index ca58019dc02e..d3241e948d33 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/VersionRange.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/VersionRange.java @@ -31,7 +31,7 @@ * @see Version * @see VersionConstraint * @see org.apache.maven.api.services.VersionParser#parseVersionRange(String) - * @see org.apache.maven.api.Session#parseVersionRange(String) + * @see Session#parseVersionRange(String) * @since 4.0.0 */ @Experimental diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyResolverResult.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyResolverResult.java index 456cd6b505be..a2a100d4952a 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyResolverResult.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyResolverResult.java @@ -82,7 +82,7 @@ public interface DependencyResolverResult extends ResultDesign note * All types of path are determined together because they are sometime mutually exclusive. diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProblemCollector.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProblemCollector.java index 6e5a9d29f646..0c1b28f441f3 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProblemCollector.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProblemCollector.java @@ -46,7 +46,7 @@ public interface ProblemCollector

{ /** * Returns {@code true} if there is at least one problem collected with severity equal or more severe than - * {@link org.apache.maven.api.services.BuilderProblem.Severity#WARNING}. This check is logically equivalent + * {@link BuilderProblem.Severity#WARNING}. This check is logically equivalent * to "is there any problem reported?", given warning is the lowest severity. */ default boolean hasWarningProblems() { @@ -55,7 +55,7 @@ default boolean hasWarningProblems() { /** * Returns {@code true} if there is at least one problem collected with severity equal or more severe than - * {@link org.apache.maven.api.services.BuilderProblem.Severity#ERROR}. + * {@link BuilderProblem.Severity#ERROR}. */ default boolean hasErrorProblems() { return hasProblemsFor(BuilderProblem.Severity.ERROR); @@ -63,7 +63,7 @@ default boolean hasErrorProblems() { /** * Returns {@code true} if there is at least one problem collected with severity equal or more severe than - * {@link org.apache.maven.api.services.BuilderProblem.Severity#FATAL}. + * {@link BuilderProblem.Severity#FATAL}. */ default boolean hasFatalProblems() { return hasProblemsFor(BuilderProblem.Severity.FATAL); diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java index 302768585d83..36aaf0f96e70 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java @@ -54,7 +54,7 @@ * during parallel builds. * * @since 4.0.0 - * @see org.apache.maven.api.services.ProjectBuilder + * @see ProjectBuilder * @see Project */ @Experimental diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilder.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilder.java index 000ebb883780..3f6b94edcc18 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilder.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilder.java @@ -24,6 +24,7 @@ import org.apache.maven.api.Session; import org.apache.maven.api.annotations.Experimental; import org.apache.maven.api.annotations.Nonnull; +import org.apache.maven.api.settings.Profile; import org.apache.maven.api.settings.Settings; /** @@ -125,11 +126,11 @@ default ProblemCollector validate(@Nonnull Settings settings) { * Convert a model profile to a settings profile. */ @Nonnull - org.apache.maven.api.settings.Profile convert(@Nonnull org.apache.maven.api.model.Profile profile); + Profile convert(@Nonnull org.apache.maven.api.model.Profile profile); /** * Convert a settings profile to a model profile. */ @Nonnull - org.apache.maven.api.model.Profile convert(@Nonnull org.apache.maven.api.settings.Profile profile); + org.apache.maven.api.model.Profile convert(@Nonnull Profile profile); } diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/Source.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/Source.java index 2893faa4e248..ad3f66957601 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/Source.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/Source.java @@ -45,7 +45,7 @@ * * * @since 4.0.0 - * @see org.apache.maven.api.services.ProjectBuilder#build(Session, Source) + * @see ProjectBuilder#build(Session, Source) */ @Experimental public interface Source { diff --git a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/LanguageProvider.java b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/LanguageProvider.java index 7a2f77068fe9..4094702248ca 100644 --- a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/LanguageProvider.java +++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/LanguageProvider.java @@ -40,8 +40,8 @@ * } * * - * @see org.apache.maven.api.Language - * @see org.apache.maven.api.spi.ExtensibleEnumProvider + * @see Language + * @see ExtensibleEnumProvider * @since 4.0.0 */ @Experimental diff --git a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/LifecycleProvider.java b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/LifecycleProvider.java index d37a327e5288..98c0ddec1482 100644 --- a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/LifecycleProvider.java +++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/LifecycleProvider.java @@ -48,8 +48,8 @@ * } * * - * @see org.apache.maven.api.Lifecycle - * @see org.apache.maven.api.spi.ExtensibleEnumProvider + * @see Lifecycle + * @see ExtensibleEnumProvider * @since 4.0.0 */ @Experimental diff --git a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PackagingProvider.java b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PackagingProvider.java index 2e2af56e8263..17812e5d4b70 100644 --- a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PackagingProvider.java +++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PackagingProvider.java @@ -43,8 +43,8 @@ * } * * - * @see org.apache.maven.api.Packaging - * @see org.apache.maven.api.spi.ExtensibleEnumProvider + * @see Packaging + * @see ExtensibleEnumProvider * @since 4.0.0 */ @Experimental diff --git a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PathScopeProvider.java b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PathScopeProvider.java index 7d618ae1108a..546a5276fc15 100644 --- a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PathScopeProvider.java +++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PathScopeProvider.java @@ -43,8 +43,8 @@ * } * * - * @see org.apache.maven.api.PathScope - * @see org.apache.maven.api.spi.ExtensibleEnumProvider + * @see PathScope + * @see ExtensibleEnumProvider * @since 4.0.0 */ @Experimental diff --git a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/ProjectScopeProvider.java b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/ProjectScopeProvider.java index bcd071e9be48..8c58f506737c 100644 --- a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/ProjectScopeProvider.java +++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/ProjectScopeProvider.java @@ -40,8 +40,8 @@ * } * * - * @see org.apache.maven.api.ProjectScope - * @see org.apache.maven.api.spi.ExtensibleEnumProvider + * @see ProjectScope + * @see ExtensibleEnumProvider * @since 4.0.0 */ @Experimental diff --git a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/TypeProvider.java b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/TypeProvider.java index 1aa5bf78d81b..691d612a1ef7 100644 --- a/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/TypeProvider.java +++ b/api/maven-api-spi/src/main/java/org/apache/maven/api/spi/TypeProvider.java @@ -45,8 +45,8 @@ * } * * - * @see org.apache.maven.api.Type - * @see org.apache.maven.api.spi.ExtensibleEnumProvider + * @see Type + * @see ExtensibleEnumProvider * @since 4.0.0 */ @Experimental diff --git a/compat/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java b/compat/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java index 19beeb576e3b..af1a2d447fa6 100644 --- a/compat/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java +++ b/compat/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java @@ -46,7 +46,7 @@ class DefaultProblem implements Problem { * * @param message The message describing the problem, may be {@code null}. * @param severity The severity level of the problem, may be {@code null} to default to - * {@link org.apache.maven.building.Problem.Severity#ERROR}. + * {@link Problem.Severity#ERROR}. * @param source A hint about the source of the problem like a file path, may be {@code null}. * @param lineNumber The one-based index of the line containing the problem or {@code -1} if unknown. * @param columnNumber The one-based index of the column containing the problem or {@code -1} if unknown. diff --git a/compat/maven-compat/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/compat/maven-compat/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java index f698d53c652c..1c4a21c1d1cb 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java @@ -60,7 +60,7 @@ private synchronized Set getExcludedArtifacts() { /** * Returns the artifact filter for the core + extension artifacts. * - * @see org.apache.maven.ArtifactFilterManager#getArtifactFilter() + * @see ArtifactFilterManager#getArtifactFilter() */ public ArtifactFilter getArtifactFilter() { Set excludes = new LinkedHashSet<>(getExcludedArtifacts()); @@ -75,7 +75,7 @@ public ArtifactFilter getArtifactFilter() { /** * Returns the artifact filter for the standard core artifacts. * - * @see org.apache.maven.ArtifactFilterManager#getCoreArtifactFilter() + * @see ArtifactFilterManager#getCoreArtifactFilter() */ public ArtifactFilter getCoreArtifactFilter() { return new ExclusionSetFilter(getCoreArtifactExcludes()); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java index 1562d19c1ba3..f6c8329ed92c 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java @@ -25,8 +25,7 @@ */ @Deprecated public abstract class AbstractArtifactMetadata - extends org.apache.maven.repository.legacy.metadata.AbstractArtifactMetadata - implements org.apache.maven.artifact.metadata.ArtifactMetadata { + extends org.apache.maven.repository.legacy.metadata.AbstractArtifactMetadata implements ArtifactMetadata { protected AbstractArtifactMetadata(Artifact artifact) { super(artifact); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java index 078ce1175a78..be3277cdd250 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java @@ -18,6 +18,7 @@ */ package org.apache.maven.artifact.repository.metadata; +import org.apache.maven.artifact.metadata.ArtifactMetadata; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; @@ -27,7 +28,7 @@ * TODO not happy about the store method - they use "this" */ @Deprecated -public interface RepositoryMetadata extends org.apache.maven.artifact.metadata.ArtifactMetadata { +public interface RepositoryMetadata extends ArtifactMetadata { int RELEASE = 1; diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java index bdddced4c301..b45333c9a8a0 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java @@ -25,13 +25,14 @@ import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; +import org.apache.maven.repository.legacy.resolver.LegacyArtifactCollector; /** * Artifact collector - takes a set of original artifacts and resolves the best versions to use * along with their metadata. No artifacts are downloaded. */ @Deprecated -public interface ArtifactCollector extends org.apache.maven.repository.legacy.resolver.LegacyArtifactCollector { +public interface ArtifactCollector extends LegacyArtifactCollector { @Deprecated ArtifactResolutionResult collect( diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java index 6001f46e7076..11f125756e6c 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java @@ -21,6 +21,8 @@ import javax.inject.Named; import javax.inject.Singleton; +import org.apache.maven.repository.legacy.resolver.DefaultLegacyArtifactCollector; + /** * Artifact collector - takes a set of original artifacts and resolves the best versions to use * along with their metadata. No artifacts are downloaded. @@ -28,5 +30,4 @@ @Deprecated @Named @Singleton -public class DefaultArtifactCollector extends org.apache.maven.repository.legacy.resolver.DefaultLegacyArtifactCollector - implements ArtifactCollector {} +public class DefaultArtifactCollector extends DefaultLegacyArtifactCollector implements ArtifactCollector {} diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java index 789c2cf981bc..526dca56e7b0 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java @@ -33,6 +33,7 @@ import org.apache.maven.model.Plugin; import org.apache.maven.model.Repository; import org.apache.maven.settings.Mirror; +import org.apache.maven.settings.Proxy; import org.apache.maven.settings.Server; import org.eclipse.aether.RepositorySystemSession; @@ -125,7 +126,7 @@ ArtifactRepository createArtifactRepository( * @param repositories The repositories into which to inject the proxy information, may be {@code null}. * @param proxies The available proxies, may be {@code null}. */ - void injectProxy(List repositories, List proxies); + void injectProxy(List repositories, List proxies); /** * Injects the authentication information into the specified repositories. For each repository that is matched by a diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java index 49c8fa645af0..e39ddd7071a5 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java @@ -34,6 +34,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Properties; @@ -692,7 +693,7 @@ public Wagon getWagon(String protocol) throws UnsupportedProtocolException { throw new UnsupportedProtocolException("Unspecified protocol"); } - String hint = protocol.toLowerCase(java.util.Locale.ENGLISH); + String hint = protocol.toLowerCase(Locale.ENGLISH); Wagon wagon; try { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java index 9f6191c9fbfd..a1f71459a80e 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java @@ -68,6 +68,8 @@ import org.apache.maven.settings.crypto.SettingsDecrypter; import org.apache.maven.settings.crypto.SettingsDecryptionRequest; import org.apache.maven.settings.crypto.SettingsDecryptionResult; +import org.apache.maven.wagon.ResourceDoesNotExistException; +import org.apache.maven.wagon.TransferFailedException; import org.apache.maven.wagon.proxy.ProxyInfo; import org.apache.maven.wagon.proxy.ProxyUtils; import org.codehaus.plexus.PlexusContainer; @@ -642,9 +644,9 @@ public void retrieve( TransferListenerAdapter.newAdapter(transferListener), ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN, true); - } catch (org.apache.maven.wagon.TransferFailedException e) { + } catch (TransferFailedException e) { throw new ArtifactTransferFailedException(getMessage(e, "Error transferring artifact."), e); - } catch (org.apache.maven.wagon.ResourceDoesNotExistException e) { + } catch (ResourceDoesNotExistException e) { throw new ArtifactDoesNotExistException(getMessage(e, "Requested artifact does not exist."), e); } } @@ -655,7 +657,7 @@ public void publish( try { wagonManager.putRemoteFile( repository, source, remotePath, TransferListenerAdapter.newAdapter(transferListener)); - } catch (org.apache.maven.wagon.TransferFailedException e) { + } catch (TransferFailedException e) { throw new ArtifactTransferFailedException(getMessage(e, "Error transferring artifact."), e); } } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/toolchain/ToolchainManagerFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/toolchain/ToolchainManagerFactory.java index 4f9c0b8c0d02..47f122d734bb 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/toolchain/ToolchainManagerFactory.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/toolchain/ToolchainManagerFactory.java @@ -36,6 +36,7 @@ import org.apache.maven.api.services.ToolchainFactoryException; import org.apache.maven.api.services.ToolchainManagerException; import org.apache.maven.execution.MavenSession; +import org.apache.maven.impl.DefaultToolchainManager; import org.apache.maven.impl.MappedList; import org.apache.maven.toolchain.model.ToolchainModel; import org.slf4j.Logger; @@ -72,18 +73,18 @@ DefaultToolchainManagerV4 v4Manager() { return new DefaultToolchainManagerV4(); } - private org.apache.maven.impl.DefaultToolchainManager getDelegate() { + private DefaultToolchainManager getDelegate() { return getToolchainManager(lookup, logger); } - private org.apache.maven.impl.DefaultToolchainManager getToolchainManager(Lookup lookup, Logger logger) { + private DefaultToolchainManager getToolchainManager(Lookup lookup, Logger logger) { return getToolchainManager( lookup.lookupMap(ToolchainFactory.class), lookup.lookupMap(org.apache.maven.api.services.ToolchainFactory.class), logger); } - private org.apache.maven.impl.DefaultToolchainManager getToolchainManager( + private DefaultToolchainManager getToolchainManager( Map v3Factories, Map v4Factories, Logger logger) { @@ -112,7 +113,7 @@ public Optional createDefaultToolchain() }); } allFactories.putAll(v4Factories); - return new org.apache.maven.impl.DefaultToolchainManager(allFactories, logger) {}; + return new DefaultToolchainManager(allFactories, logger) {}; } public class DefaultToolchainManagerV4 implements org.apache.maven.api.services.ToolchainManager { @@ -171,7 +172,7 @@ public ToolchainPrivate[] getToolchainsForType(String type, MavenSession session return toolchains.stream() .map(ToolchainManagerFactory.this::getToolchainV3) .toArray(ToolchainPrivate[]::new); - } catch (org.apache.maven.api.services.ToolchainManagerException e) { + } catch (ToolchainManagerException e) { throw new MisconfiguredToolchainException(e.getMessage(), e); } } diff --git a/compat/maven-compat/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java b/compat/maven-compat/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java index 18de14738221..e5be7473bf75 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java @@ -164,7 +164,7 @@ void testRequirements() throws Exception { when(basicPrivate.matchesRequirements(anyMap())).thenReturn(false); when(basicPrivate.matchesRequirements(ArgumentMatchers.eq(Map.of("key", "value")))) .thenReturn(true); - when(toolchainFactoryBasicType.createToolchain(isA(org.apache.maven.api.toolchain.ToolchainModel.class))) + when(toolchainFactoryBasicType.createToolchain(isA(ToolchainModel.class))) .thenReturn(basicPrivate); List toolchains = diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index d36824bc60d6..128dfa0f70a3 100644 --- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -33,6 +33,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashMap; @@ -954,7 +955,7 @@ private void encryption(CliRequest cliRequest) throws Exception { passwd = String.copyValueOf(password); // Sun/Oracle advises to empty the char array - java.util.Arrays.fill(password, ' '); + Arrays.fill(password, ' '); } } System.out.println(dispatcher.encrypt(passwd, null)); diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java index 2aea29d6cb18..332ffd00b300 100644 --- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java +++ b/compat/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java @@ -32,6 +32,7 @@ import org.apache.maven.execution.ExecutionEvent; import org.apache.maven.execution.MavenExecutionResult; import org.apache.maven.execution.MavenSession; +import org.apache.maven.logging.api.LogLevelRecorder; import org.apache.maven.plugin.MojoExecution; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.project.MavenProject; @@ -146,8 +147,7 @@ public void sessionEnded(ExecutionEvent event) { ILoggerFactory iLoggerFactory = LoggerFactory.getILoggerFactory(); - if (iLoggerFactory instanceof org.apache.maven.logging.api.LogLevelRecorder recorder - && recorder.hasReachedMaxLevel()) { + if (iLoggerFactory instanceof LogLevelRecorder recorder && recorder.hasReachedMaxLevel()) { event.getSession() .getResult() .addException( diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenPropertiesLoader.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenPropertiesLoader.java index 7061445bc68b..41baacf8539e 100644 --- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenPropertiesLoader.java +++ b/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenPropertiesLoader.java @@ -23,6 +23,7 @@ import java.nio.file.Path; import java.util.Enumeration; import java.util.Map; +import java.util.Properties; import java.util.StringTokenizer; import java.util.function.UnaryOperator; @@ -36,8 +37,7 @@ public class MavenPropertiesLoader { public static final String OVERRIDE_PREFIX = "maven.override."; // prefix that marks that system property should override defaults. - public static void loadProperties( - java.util.Properties properties, Path path, UnaryOperator callback, boolean escape) + public static void loadProperties(Properties properties, Path path, UnaryOperator callback, boolean escape) throws IOException { MavenProperties sp = new MavenProperties(false); if (Files.exists(path)) { diff --git a/compat/maven-embedder/src/main/java/org/fusesource/jansi/Ansi.java b/compat/maven-embedder/src/main/java/org/fusesource/jansi/Ansi.java index f861da0098b0..8208feb3d088 100644 --- a/compat/maven-embedder/src/main/java/org/fusesource/jansi/Ansi.java +++ b/compat/maven-embedder/src/main/java/org/fusesource/jansi/Ansi.java @@ -20,6 +20,8 @@ import java.util.ArrayList; +import org.apache.maven.jline.MessageUtils; + /** * Provides a fluent API for generating * ANSI escape sequences. @@ -161,7 +163,7 @@ public interface Consumer { } public static boolean isEnabled() { - return org.apache.maven.jline.MessageUtils.isColorEnabled() && org.jline.jansi.Ansi.isEnabled(); + return MessageUtils.isColorEnabled() && org.jline.jansi.Ansi.isEnabled(); } public static void setEnabled(final boolean flag) { diff --git a/compat/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java index 07aa1e8ba664..843bb018f75f 100644 --- a/compat/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java +++ b/compat/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java @@ -26,6 +26,7 @@ import java.io.StringWriter; import java.util.List; import java.util.Map; +import java.util.Properties; import org.apache.maven.impl.model.DefaultInterpolator; import org.junit.jupiter.api.BeforeEach; @@ -101,7 +102,7 @@ public void testSpaces() throws Exception { + "dblbackslash=\\\\\n" + " \n"; - java.util.Properties props1 = new java.util.Properties(); + Properties props1 = new Properties(); props1.load(new StringReader(config)); MavenProperties props2 = new MavenProperties(); @@ -168,7 +169,7 @@ public void testConfigInterpolation() throws IOException { String config = "a=$\\\\\\\\{var}\n" + "ab=${a}b\n" + "abc=${ab}c"; Map expected = Map.of("a", "$\\{var}", "ab", "$\\{var}b", "abc", "$\\{var}bc"); - java.util.Properties props1 = new java.util.Properties(); + Properties props1 = new Properties(); props1.load(new StringReader(config)); new DefaultInterpolator().performSubstitution((Map) props1, null, true); assertEquals(expected, props1); @@ -327,7 +328,7 @@ public void testMultiValueEscaping() throws IOException { pw.println(" cantaloupe, watermelon, \\"); pw.println(" kiwi, mango"); - java.util.Properties p = new java.util.Properties(); + Properties p = new Properties(); p.load(new StringReader(sw.toString())); Object o24 = p.getProperty("fruits"); assertEquals("apple, banana, pear, cantaloupe, watermelon, kiwi, mango", o24); diff --git a/compat/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java index 9f76ebb2e3ca..f15165d26744 100644 --- a/compat/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java +++ b/compat/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java @@ -47,7 +47,7 @@ public interface ModelResolver { /** * Tries to resolve the POM for the specified parent coordinates possibly updating {@code parent}. *

- * Unlike the {@link #resolveModel(java.lang.String, java.lang.String, java.lang.String)} method, this method + * Unlike the {@link #resolveModel(String, String, String)} method, this method * supports version ranges and updates the given {@code parent} instance to match the returned {@code ModelSource}. * If {@code parent} declares a version range, the version corresponding to the returned {@code ModelSource} will * be set on the given {@code parent}. @@ -67,7 +67,7 @@ public interface ModelResolver { /** * Tries to resolve the POM for the specified dependency coordinates possibly updating {@code dependency}. *

- * Unlike the {@link #resolveModel(java.lang.String, java.lang.String, java.lang.String)} method, this method + * Unlike the {@link #resolveModel(String, String, String)} method, this method * supports version ranges and updates the given {@code dependency} instance to match the returned * {@code ModelSource}. If {@code dependency} declares a version range, the version corresponding to the returned * {@code ModelSource} will be set on the given {@code dependency}. diff --git a/compat/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java index 6d0fa698f193..21a9eec46716 100644 --- a/compat/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java +++ b/compat/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java @@ -30,6 +30,10 @@ import java.util.Properties; import java.util.TimeZone; +import org.apache.maven.api.model.Build; +import org.apache.maven.api.model.Organization; +import org.apache.maven.api.model.Repository; +import org.apache.maven.api.model.Scm; import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; import org.apache.maven.model.Resource; @@ -136,9 +140,7 @@ public void testDefaultBuildTimestampFormatWithLocalTimeZoneMidnightRollover() { @Test public void testShouldNotThrowExceptionOnReferenceToNonExistentValue() throws Exception { Model model = new Model(org.apache.maven.api.model.Model.newBuilder() - .scm(org.apache.maven.api.model.Scm.newBuilder() - .connection("${test}/somepath") - .build()) + .scm(Scm.newBuilder().connection("${test}/somepath").build()) .build()); ModelInterpolator interpolator = createInterpolator(); @@ -153,7 +155,7 @@ public void testShouldNotThrowExceptionOnReferenceToNonExistentValue() throws Ex @Test public void testShouldThrowExceptionOnRecursiveScmConnectionReference() throws Exception { var model = new Model(org.apache.maven.api.model.Model.newBuilder() - .scm(org.apache.maven.api.model.Scm.newBuilder() + .scm(Scm.newBuilder() .connection("${project.scm.connection}/somepath") .build()) .build()); @@ -170,9 +172,7 @@ public void testShouldNotThrowExceptionOnReferenceToValueContainingNakedExpressi Map props = new HashMap<>(); props.put("test", "test"); Model model = new Model(org.apache.maven.api.model.Model.newBuilder() - .scm(org.apache.maven.api.model.Scm.newBuilder() - .connection("${test}/somepath") - .build()) + .scm(Scm.newBuilder().connection("${test}/somepath").build()) .properties(props) .build()); @@ -192,9 +192,7 @@ public void shouldInterpolateOrganizationNameCorrectly() throws Exception { Model model = new Model(org.apache.maven.api.model.Model.newBuilder() .name("${project.organization.name} Tools") - .organization(org.apache.maven.api.model.Organization.newBuilder() - .name(orgName) - .build()) + .organization(Organization.newBuilder().name(orgName).build()) .build()); ModelInterpolator interpolator = createInterpolator(); @@ -265,7 +263,7 @@ public void testBasedir() throws Exception { Model model = new Model(org.apache.maven.api.model.Model.newBuilder() .version("3.8.1") .artifactId("foo") - .repositories(Collections.singletonList(org.apache.maven.api.model.Repository.newBuilder() + .repositories(Collections.singletonList(Repository.newBuilder() .url("file://localhost/${basedir}/temp-repo") .build())) .build()); @@ -285,7 +283,7 @@ public void testBaseUri() throws Exception { Model model = new Model(org.apache.maven.api.model.Model.newBuilder() .version("3.8.1") .artifactId("foo") - .repositories(Collections.singletonList(org.apache.maven.api.model.Repository.newBuilder() + .repositories(Collections.singletonList(Repository.newBuilder() .url("${project.baseUri}/temp-repo") .build())) .build()); @@ -359,7 +357,7 @@ public void expressionThatEvaluatesToNullReturnsTheLiteralString() throws Except @Test public void shouldInterpolateSourceDirectoryReferencedFromResourceDirectoryCorrectly() throws Exception { Model model = new Model(org.apache.maven.api.model.Model.newBuilder() - .build(org.apache.maven.api.model.Build.newBuilder() + .build(Build.newBuilder() .sourceDirectory("correct") .resources(List.of(org.apache.maven.api.model.Resource.newBuilder() .directory("${project.build.sourceDirectory}") diff --git a/compat/maven-model/src/main/java/org/apache/maven/model/InputLocation.java b/compat/maven-model/src/main/java/org/apache/maven/model/InputLocation.java index 82bfc9162b8b..abfcebc3a49d 100644 --- a/compat/maven-model/src/main/java/org/apache/maven/model/InputLocation.java +++ b/compat/maven-model/src/main/java/org/apache/maven/model/InputLocation.java @@ -18,6 +18,11 @@ */ package org.apache.maven.model; +import java.io.Serializable; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; import java.util.stream.Collectors; /** @@ -26,7 +31,7 @@ * @version $Revision$ $Date$ */ @SuppressWarnings("all") -public final class InputLocation implements java.io.Serializable, Cloneable, InputLocationTracker { +public final class InputLocation implements Serializable, Cloneable, InputLocationTracker { // --------------------------/ // - Class/Member Variables -/ @@ -52,7 +57,7 @@ public final class InputLocation implements java.io.Serializable, Cloneable, Inp /** * Field locations. */ - private java.util.Map locations; + private Map locations; /** * Field location. @@ -106,7 +111,7 @@ public InputLocation clone() { InputLocation copy = (InputLocation) super.clone(); if (copy.locations != null) { - copy.locations = new java.util.LinkedHashMap(copy.locations); + copy.locations = new LinkedHashMap(copy.locations); } return copy; @@ -162,7 +167,7 @@ public InputLocation getLocation(Object key) { * * @return Map */ - public java.util.Map getLocations() { + public Map getLocations() { return locations; } // -- java.util.Map getLocations() @@ -198,7 +203,7 @@ public void setLocation(Object key, InputLocation location) { public void setOtherLocation(Object key, InputLocation location) { if (location != null) { if (this.locations == null) { - this.locations = new java.util.LinkedHashMap<>(); + this.locations = new LinkedHashMap<>(); } this.locations.put(key, location); } @@ -260,15 +265,15 @@ public static InputLocation merge(InputLocation target, InputLocation source, bo InputLocation result = new InputLocation(target.getLineNumber(), target.getColumnNumber(), target.getSource()); - java.util.Map locations; - java.util.Map sourceLocations = source.getLocations(); - java.util.Map targetLocations = target.getLocations(); + Map locations; + Map sourceLocations = source.getLocations(); + Map targetLocations = target.getLocations(); if (sourceLocations == null) { locations = targetLocations; } else if (targetLocations == null) { locations = sourceLocations; } else { - locations = new java.util.LinkedHashMap(); + locations = new LinkedHashMap(); locations.putAll(sourceDominant ? targetLocations : sourceLocations); locations.putAll(sourceDominant ? sourceLocations : targetLocations); } @@ -285,8 +290,7 @@ public static InputLocation merge(InputLocation target, InputLocation source, bo * @param source * @return InputLocation */ - public static InputLocation merge( - InputLocation target, InputLocation source, java.util.Collection indices) { + public static InputLocation merge(InputLocation target, InputLocation source, Collection indices) { if (source == null) { return target; } else if (target == null) { @@ -295,16 +299,16 @@ public static InputLocation merge( InputLocation result = new InputLocation(target.getLineNumber(), target.getColumnNumber(), target.getSource()); - java.util.Map locations; - java.util.Map sourceLocations = source.getLocations(); - java.util.Map targetLocations = target.getLocations(); + Map locations; + Map sourceLocations = source.getLocations(); + Map targetLocations = target.getLocations(); if (sourceLocations == null) { locations = targetLocations; } else if (targetLocations == null) { locations = sourceLocations; } else { - locations = new java.util.LinkedHashMap<>(); - for (java.util.Iterator it = indices.iterator(); it.hasNext(); ) { + locations = new LinkedHashMap<>(); + for (Iterator it = indices.iterator(); it.hasNext(); ) { InputLocation location; Integer index = it.next(); if (index.intValue() < 0) { @@ -325,7 +329,7 @@ public static InputLocation merge( * * @param locations */ - public void setLocations(java.util.Map locations) { + public void setLocations(Map locations) { this.locations = locations; } // -- void setLocations( java.util.Map ) diff --git a/compat/maven-model/src/main/java/org/apache/maven/model/InputSource.java b/compat/maven-model/src/main/java/org/apache/maven/model/InputSource.java index 1bd81e925ee0..59135ef8cccd 100644 --- a/compat/maven-model/src/main/java/org/apache/maven/model/InputSource.java +++ b/compat/maven-model/src/main/java/org/apache/maven/model/InputSource.java @@ -18,13 +18,15 @@ */ package org.apache.maven.model; +import java.io.Serializable; + /** * Class InputSource. * * @version $Revision$ $Date$ */ @SuppressWarnings("all") -public class InputSource implements java.io.Serializable, Cloneable { +public class InputSource implements Serializable, Cloneable { // --------------------------/ // - Class/Member Variables -/ diff --git a/compat/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java b/compat/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java index ad90dac4b559..f5ae78bdae6e 100644 --- a/compat/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java +++ b/compat/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java @@ -19,6 +19,7 @@ package org.apache.maven.model.merge; import java.io.ObjectStreamException; +import java.io.Serializable; import java.util.AbstractList; import java.util.ArrayList; import java.util.Collection; @@ -2394,7 +2395,7 @@ private static List merge(List tgt, List src, KeyComputer comput * Merging list * @param */ - private static class MergingList extends AbstractList implements java.io.Serializable { + private static class MergingList extends AbstractList implements Serializable { private final KeyComputer keyComputer; private Map map; diff --git a/compat/maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java index 090292cffa35..55fe7796adfe 100644 --- a/compat/maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java +++ b/compat/maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java @@ -86,7 +86,7 @@ public int readWithStax(AdditionState state) throws IOException, XMLStreamExcept *

main.

* * @param args a {@link String} object. - * @throws org.openjdk.jmh.runner.RunnerException if any. + * @throws RunnerException if any. */ public static void main(String... args) throws RunnerException { Options opts = new OptionsBuilder().forks(1).build(); diff --git a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java index f9ea24d94ee6..c81d3c1b00ea 100644 --- a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java +++ b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java @@ -163,7 +163,7 @@ public void setLog(Log log) { * gets injected by the Plexus container after the mojo has been constructed. Therefore, simply call this * method directly whenever you need the logger, it is fast enough and needs no caching. * - * @see org.apache.maven.plugin.Mojo#getLog() + * @see Mojo#getLog() * @deprecated Use SLF4J directly */ @Deprecated diff --git a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Execution.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Execution.java index 7ef46425eb9c..bdd195c05424 100644 --- a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Execution.java +++ b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Execution.java @@ -18,13 +18,17 @@ */ package org.apache.maven.plugin.lifecycle; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + /** * A set of goals to execute. * * @version $Revision$ $Date$ */ @SuppressWarnings("all") -public class Execution implements java.io.Serializable { +public class Execution implements Serializable { // --------------------------/ // - Class/Member Variables -/ @@ -38,7 +42,7 @@ public class Execution implements java.io.Serializable { /** * Field goals. */ - private java.util.List goals; + private List goals; // -----------/ // - Methods -/ @@ -67,9 +71,9 @@ public Object getConfiguration() { * * @return List */ - public java.util.List getGoals() { + public List getGoals() { if (this.goals == null) { - this.goals = new java.util.ArrayList(); + this.goals = new ArrayList(); } return this.goals; @@ -98,7 +102,7 @@ public void setConfiguration(Object configuration) { * * @param goals a goals object. */ - public void setGoals(java.util.List goals) { + public void setGoals(List goals) { this.goals = goals; } // -- void setGoals( java.util.List ) } diff --git a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Lifecycle.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Lifecycle.java index df6c225729bf..b6b463969422 100644 --- a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Lifecycle.java +++ b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Lifecycle.java @@ -18,6 +18,10 @@ */ package org.apache.maven.plugin.lifecycle; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + /** * * A custom lifecycle mapping definition. @@ -26,7 +30,7 @@ * @version $Revision$ $Date$ */ @SuppressWarnings("all") -public class Lifecycle implements java.io.Serializable { +public class Lifecycle implements Serializable { // --------------------------/ // - Class/Member Variables -/ @@ -41,7 +45,7 @@ public class Lifecycle implements java.io.Serializable { /** * Field phases. */ - private java.util.List phases; + private List phases; // -----------/ // - Methods -/ @@ -71,9 +75,9 @@ public String getId() { * * @return List */ - public java.util.List getPhases() { + public List getPhases() { if (this.phases == null) { - this.phases = new java.util.ArrayList(); + this.phases = new ArrayList(); } return this.phases; @@ -103,7 +107,7 @@ public void setId(String id) { * * @param phases a phases object. */ - public void setPhases(java.util.List phases) { + public void setPhases(List phases) { this.phases = phases; } // -- void setPhases( java.util.List ) } diff --git a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/LifecycleConfiguration.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/LifecycleConfiguration.java index bde244cf110d..2f9ff944e843 100644 --- a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/LifecycleConfiguration.java +++ b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/LifecycleConfiguration.java @@ -18,13 +18,17 @@ */ package org.apache.maven.plugin.lifecycle; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + /** * Root element of the lifecycle.xml file. * * @version $Revision$ $Date$ */ @SuppressWarnings("all") -public class LifecycleConfiguration implements java.io.Serializable { +public class LifecycleConfiguration implements Serializable { // --------------------------/ // - Class/Member Variables -/ @@ -33,7 +37,7 @@ public class LifecycleConfiguration implements java.io.Serializable { /** * Field lifecycles. */ - private java.util.List lifecycles; + private List lifecycles; /** * Field modelEncoding. @@ -58,9 +62,9 @@ public void addLifecycle(Lifecycle lifecycle) { * * @return List */ - public java.util.List getLifecycles() { + public List getLifecycles() { if (this.lifecycles == null) { - this.lifecycles = new java.util.ArrayList(); + this.lifecycles = new ArrayList(); } return this.lifecycles; @@ -89,7 +93,7 @@ public void removeLifecycle(Lifecycle lifecycle) { * * @param lifecycles a lifecycles object. */ - public void setLifecycles(java.util.List lifecycles) { + public void setLifecycles(List lifecycles) { this.lifecycles = lifecycles; } // -- void setLifecycles( java.util.List ) diff --git a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Phase.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Phase.java index e5731a1936cb..f8e3141a9930 100644 --- a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Phase.java +++ b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Phase.java @@ -18,13 +18,17 @@ */ package org.apache.maven.plugin.lifecycle; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + /** * A phase mapping definition. * * @version $Revision$ $Date$ */ @SuppressWarnings("all") -public class Phase implements java.io.Serializable { +public class Phase implements Serializable { // --------------------------/ // - Class/Member Variables -/ @@ -38,7 +42,7 @@ public class Phase implements java.io.Serializable { /** * Field executions. */ - private java.util.List executions; + private List executions; /** * Configuration to pass to all goals run in this phase. @@ -72,9 +76,9 @@ public Object getConfiguration() { * * @return List */ - public java.util.List getExecutions() { + public List getExecutions() { if (this.executions == null) { - this.executions = new java.util.ArrayList(); + this.executions = new ArrayList(); } return this.executions; @@ -113,7 +117,7 @@ public void setConfiguration(Object configuration) { * * @param executions a executions object. */ - public void setExecutions(java.util.List executions) { + public void setExecutions(List executions) { this.executions = executions; } // -- void setExecutions( java.util.List ) diff --git a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java index bff8bf3295c4..02cd7fb9e3c9 100644 --- a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java +++ b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java @@ -30,77 +30,77 @@ @Deprecated public class SystemStreamLog implements Log { /** - * @see org.apache.maven.plugin.logging.Log#debug(java.lang.CharSequence) + * @see Log#debug(CharSequence) */ public void debug(CharSequence content) { print("debug", content); } /** - * @see org.apache.maven.plugin.logging.Log#debug(java.lang.CharSequence, java.lang.Throwable) + * @see Log#debug(CharSequence, Throwable) */ public void debug(CharSequence content, Throwable error) { print("debug", content, error); } /** - * @see org.apache.maven.plugin.logging.Log#debug(java.lang.Throwable) + * @see Log#debug(Throwable) */ public void debug(Throwable error) { print("debug", error); } /** - * @see org.apache.maven.plugin.logging.Log#info(java.lang.CharSequence) + * @see Log#info(CharSequence) */ public void info(CharSequence content) { print("info", content); } /** - * @see org.apache.maven.plugin.logging.Log#info(java.lang.CharSequence, java.lang.Throwable) + * @see Log#info(CharSequence, Throwable) */ public void info(CharSequence content, Throwable error) { print("info", content, error); } /** - * @see org.apache.maven.plugin.logging.Log#info(java.lang.Throwable) + * @see Log#info(Throwable) */ public void info(Throwable error) { print("info", error); } /** - * @see org.apache.maven.plugin.logging.Log#warn(java.lang.CharSequence) + * @see Log#warn(CharSequence) */ public void warn(CharSequence content) { print("warn", content); } /** - * @see org.apache.maven.plugin.logging.Log#warn(java.lang.CharSequence, java.lang.Throwable) + * @see Log#warn(CharSequence, Throwable) */ public void warn(CharSequence content, Throwable error) { print("warn", content, error); } /** - * @see org.apache.maven.plugin.logging.Log#warn(java.lang.Throwable) + * @see Log#warn(Throwable) */ public void warn(Throwable error) { print("warn", error); } /** - * @see org.apache.maven.plugin.logging.Log#error(java.lang.CharSequence) + * @see Log#error(CharSequence) */ public void error(CharSequence content) { System.err.println("[error] " + content.toString()); } /** - * @see org.apache.maven.plugin.logging.Log#error(java.lang.CharSequence, java.lang.Throwable) + * @see Log#error(CharSequence, Throwable) */ public void error(CharSequence content, Throwable error) { StringWriter sWriter = new StringWriter(); @@ -112,7 +112,7 @@ public void error(CharSequence content, Throwable error) { } /** - * @see org.apache.maven.plugin.logging.Log#error(java.lang.Throwable) + * @see Log#error(Throwable) */ public void error(Throwable error) { StringWriter sWriter = new StringWriter(); @@ -124,7 +124,7 @@ public void error(Throwable error) { } /** - * @see org.apache.maven.plugin.logging.Log#isDebugEnabled() + * @see Log#isDebugEnabled() */ public boolean isDebugEnabled() { // TODO Not sure how best to set these for this implementation... @@ -132,21 +132,21 @@ public boolean isDebugEnabled() { } /** - * @see org.apache.maven.plugin.logging.Log#isInfoEnabled() + * @see Log#isInfoEnabled() */ public boolean isInfoEnabled() { return true; } /** - * @see org.apache.maven.plugin.logging.Log#isWarnEnabled() + * @see Log#isWarnEnabled() */ public boolean isWarnEnabled() { return true; } /** - * @see org.apache.maven.plugin.logging.Log#isErrorEnabled() + * @see Log#isErrorEnabled() */ public boolean isErrorEnabled() { return true; diff --git a/compat/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java b/compat/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java index fbed96f67931..28339e485a63 100644 --- a/compat/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java +++ b/compat/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java @@ -58,9 +58,9 @@ public void setFileComment(String fileComment) { * * @param writer a writer object * @param metadata a Metadata object - * @throws java.io.IOException java.io.IOException if any + * @throws IOException java.io.IOException if any */ - public void write(Writer writer, Metadata metadata) throws java.io.IOException { + public void write(Writer writer, Metadata metadata) throws IOException { try { delegate.write(writer, metadata.getDelegate()); } catch (XMLStreamException e) { @@ -73,9 +73,9 @@ public void write(Writer writer, Metadata metadata) throws java.io.IOException { * * @param stream a stream object * @param metadata a Metadata object - * @throws java.io.IOException java.io.IOException if any + * @throws IOException java.io.IOException if any */ - public void write(OutputStream stream, Metadata metadata) throws java.io.IOException { + public void write(OutputStream stream, Metadata metadata) throws IOException { try { delegate.write(stream, metadata.getDelegate()); } catch (XMLStreamException e) { diff --git a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java index ef2e32469d55..87082a6a145e 100644 --- a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java +++ b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java @@ -109,7 +109,7 @@ private DefaultModelResolver(DefaultModelResolver original) { } @Override - public void addRepository(org.apache.maven.model.Repository repository) throws InvalidRepositoryException { + public void addRepository(Repository repository) throws InvalidRepositoryException { addRepository(repository, false); } diff --git a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java index a38833076355..72af63fa922e 100644 --- a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java +++ b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java @@ -32,6 +32,7 @@ import org.eclipse.aether.impl.scope.InternalScopeManager; import org.eclipse.aether.impl.scope.ScopeManagerConfiguration; import org.eclipse.aether.internal.impl.scope.ScopeManagerDump; +import org.eclipse.aether.scope.ResolutionScope; import static org.eclipse.aether.impl.scope.BuildScopeQuery.all; import static org.eclipse.aether.impl.scope.BuildScopeQuery.byBuildPath; @@ -127,7 +128,7 @@ public Collection buildDependencyScope MavenArtifactProperties.LOCAL_PATH)); // == sanity check - if (result.size() != org.apache.maven.api.DependencyScope.values().length - 1) { // sans "undefined" + if (result.size() != DependencyScope.values().length - 1) { // sans "undefined" throw new IllegalStateException("Maven4 API dependency scope mismatch"); } @@ -135,8 +136,7 @@ public Collection buildDependencyScope } @Override - public Collection buildResolutionScopes( - InternalScopeManager internalScopeManager) { + public Collection buildResolutionScopes(InternalScopeManager internalScopeManager) { Collection allDependencyScopes = internalScopeManager.getDependencyScopeUniverse(); Collection nonTransitiveDependencyScopes = @@ -145,7 +145,7 @@ public Collection buildResolutionScope .getDependencyScope(DependencyScope.SYSTEM.id()) .orElse(null); - ArrayList result = new ArrayList<>(); + ArrayList result = new ArrayList<>(); result.add(internalScopeManager.createResolutionScope( RS_NONE, InternalScopeManager.Mode.REMOVE, diff --git a/compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java b/compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java index 8e3fb5d467ea..76dc3ce8b3bb 100644 --- a/compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java +++ b/compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java @@ -256,8 +256,8 @@ void testEnvironmentVariablesAreInterpolated() throws Exception { .get(0) .getProvides() .get("key")); - org.codehaus.plexus.util.xml.Xpp3Dom toolchainConfiguration = (org.codehaus.plexus.util.xml.Xpp3Dom) - result.getEffectiveToolchains().getToolchains().get(0).getConfiguration(); + Xpp3Dom toolchainConfiguration = + (Xpp3Dom) result.getEffectiveToolchains().getToolchains().get(0).getConfiguration(); assertEquals( interpolatedValue, toolchainConfiguration.getChild("jdkHome").getValue()); assertNotNull(result.getProblems()); diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/event/ExecutionEventLogger.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/event/ExecutionEventLogger.java index 3d506a605060..da55e551e250 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/event/ExecutionEventLogger.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/event/ExecutionEventLogger.java @@ -38,6 +38,7 @@ import org.apache.maven.execution.ExecutionEvent; import org.apache.maven.execution.MavenExecutionResult; import org.apache.maven.execution.MavenSession; +import org.apache.maven.logging.api.LogLevelRecorder; import org.apache.maven.plugin.MojoExecution; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.project.MavenProject; @@ -151,8 +152,7 @@ public void sessionEnded(ExecutionEvent event) { ILoggerFactory iLoggerFactory = LoggerFactory.getILoggerFactory(); - if (iLoggerFactory instanceof org.apache.maven.logging.api.LogLevelRecorder recorder - && recorder.hasReachedMaxLevel()) { + if (iLoggerFactory instanceof LogLevelRecorder recorder && recorder.hasReachedMaxLevel()) { event.getSession() .getResult() .addException( diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/CommonsCliMavenOptions.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/CommonsCliMavenOptions.java index 2632d71e48c2..82b004d44b1c 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/CommonsCliMavenOptions.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/CommonsCliMavenOptions.java @@ -26,6 +26,7 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; +import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.maven.api.cli.mvn.MavenOptions; import org.apache.maven.api.services.Interpolator; @@ -284,7 +285,7 @@ protected static class CLIManager extends CommonsCliOptions.CLIManager { public static final String AT_FILE = "af"; @Override - protected void prepareOptions(org.apache.commons.cli.Options options) { + protected void prepareOptions(Options options) { super.prepareOptions(options); options.addOption(Option.builder(ALTERNATE_POM_FILE) .longOpt("file") diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenPropertiesLoader.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenPropertiesLoader.java index 469b22938a33..cc0746a5b2a3 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenPropertiesLoader.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenPropertiesLoader.java @@ -23,6 +23,7 @@ import java.nio.file.Path; import java.util.Enumeration; import java.util.Map; +import java.util.Properties; import java.util.StringTokenizer; import java.util.function.UnaryOperator; @@ -35,8 +36,7 @@ public class MavenPropertiesLoader { public static final String OVERRIDE_PREFIX = "maven.override."; // prefix that marks that system property should override defaults. - public static void loadProperties( - java.util.Properties properties, Path path, UnaryOperator callback, boolean escape) + public static void loadProperties(Properties properties, Path path, UnaryOperator callback, boolean escape) throws IOException { MavenProperties sp = new MavenProperties(false); if (Files.exists(path)) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/impl/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java index 1617b19c3714..790cc8890ce4 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java +++ b/impl/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java @@ -54,11 +54,14 @@ import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.model.Dependency; import org.apache.maven.model.Plugin; +import org.apache.maven.model.Repository; +import org.apache.maven.model.RepositoryPolicy; import org.apache.maven.repository.Proxy; import org.apache.maven.settings.Mirror; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.AuthenticationContext; import org.eclipse.aether.repository.AuthenticationSelector; +import org.eclipse.aether.repository.MirrorSelector; import org.eclipse.aether.repository.ProxySelector; import org.eclipse.aether.repository.RemoteRepository; @@ -173,7 +176,7 @@ public void injectMirror(List repositories, List mir private Mirror getMirror(RepositorySystemSession session, ArtifactRepository repository) { if (session != null) { - org.eclipse.aether.repository.MirrorSelector selector = session.getMirrorSelector(); + MirrorSelector selector = session.getMirrorSelector(); if (selector != null) { RemoteRepository repo = selector.getMirror(RepositoryUtils.toRepo(repository)); if (repo != null) { @@ -296,9 +299,8 @@ private ArtifactRepositoryLayout getLayout(String id) { // Taken from LegacyRepositorySystem // - public static org.apache.maven.model.Repository fromSettingsRepository( - org.apache.maven.settings.Repository settingsRepository) { - org.apache.maven.model.Repository modelRepository = new org.apache.maven.model.Repository(); + public static Repository fromSettingsRepository(org.apache.maven.settings.Repository settingsRepository) { + Repository modelRepository = new Repository(); modelRepository.setId(settingsRepository.getId()); modelRepository.setLayout(settingsRepository.getLayout()); modelRepository.setName(settingsRepository.getName()); @@ -308,9 +310,9 @@ public static org.apache.maven.model.Repository fromSettingsRepository( return modelRepository; } - public static org.apache.maven.model.RepositoryPolicy fromSettingsRepositoryPolicy( + public static RepositoryPolicy fromSettingsRepositoryPolicy( org.apache.maven.settings.RepositoryPolicy settingsRepositoryPolicy) { - org.apache.maven.model.RepositoryPolicy modelRepositoryPolicy = new org.apache.maven.model.RepositoryPolicy(); + RepositoryPolicy modelRepositoryPolicy = new RepositoryPolicy(); if (settingsRepositoryPolicy != null) { modelRepositoryPolicy.setEnabled(settingsRepositoryPolicy.isEnabled()); modelRepositoryPolicy.setUpdatePolicy(settingsRepositoryPolicy.getUpdatePolicy()); @@ -324,8 +326,7 @@ public static ArtifactRepository buildArtifactRepository(org.apache.maven.settin return buildArtifactRepository(fromSettingsRepository(repo)); } - public static ArtifactRepository buildArtifactRepository(org.apache.maven.model.Repository repo) - throws InvalidRepositoryException { + public static ArtifactRepository buildArtifactRepository(Repository repo) throws InvalidRepositoryException { if (repo != null) { String id = repo.getId(); @@ -351,8 +352,7 @@ public static ArtifactRepository buildArtifactRepository(org.apache.maven.model. } } - public static ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( - org.apache.maven.model.RepositoryPolicy policy) { + public static ArtifactRepositoryPolicy buildArtifactRepositoryPolicy(RepositoryPolicy policy) { boolean enabled = true; String updatePolicy = null; diff --git a/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java b/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java index 5f217daa50ff..8785d9d2fa3e 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java +++ b/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java @@ -33,6 +33,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.bridge.MavenRepositorySystem; import org.apache.maven.settings.Mirror; +import org.apache.maven.settings.Profile; import org.apache.maven.settings.Proxy; import org.apache.maven.settings.Repository; import org.apache.maven.settings.Server; @@ -208,7 +209,7 @@ public MavenExecutionRequest populateFromSettings(MavenExecutionRequest request, request.setActiveProfiles(settings.getActiveProfiles()); - for (org.apache.maven.settings.Profile rawProfile : settings.getProfiles()) { + for (Profile rawProfile : settings.getProfiles()) { request.addProfile(SettingsUtils.convertFromSettingsProfile(rawProfile)); if (settings.getActiveProfiles().contains(rawProfile.getId())) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java b/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java index a477ec868cbb..6fb93152564b 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java +++ b/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java @@ -19,6 +19,7 @@ package org.apache.maven.execution.scope.internal; import com.google.inject.AbstractModule; +import org.apache.maven.api.Project; import org.apache.maven.api.plugin.Log; import org.apache.maven.execution.scope.MojoExecutionScoped; import org.apache.maven.plugin.MojoExecution; @@ -48,8 +49,8 @@ protected void configure() { bind(Log.class) .toProvider(MojoExecutionScope.seededKeyProvider(Log.class)) .in(scope); - bind(org.apache.maven.api.Project.class) - .toProvider(MojoExecutionScope.seededKeyProvider(org.apache.maven.api.Project.class)) + bind(Project.class) + .toProvider(MojoExecutionScope.seededKeyProvider(Project.class)) .in(scope); bind(org.apache.maven.api.MojoExecution.class) .toProvider(MojoExecutionScope.seededKeyProvider(org.apache.maven.api.MojoExecution.class)) diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/aether/LegacyRepositorySystemSessionExtender.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/LegacyRepositorySystemSessionExtender.java index ee7129246d64..6114e3455564 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/aether/LegacyRepositorySystemSessionExtender.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/LegacyRepositorySystemSessionExtender.java @@ -29,6 +29,7 @@ import org.apache.maven.artifact.repository.Authentication; import org.apache.maven.bridge.MavenRepositorySystem; import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.repository.Proxy; import org.apache.maven.settings.Mirror; import org.eclipse.aether.repository.AuthenticationContext; import org.eclipse.aether.repository.AuthenticationSelector; @@ -99,12 +100,12 @@ private void injectProxy(ProxySelector selector, List reposi } } - private org.apache.maven.repository.Proxy getProxy(ProxySelector selector, ArtifactRepository repository) { + private Proxy getProxy(ProxySelector selector, ArtifactRepository repository) { if (selector != null) { RemoteRepository repo = RepositoryUtils.toRepo(repository); org.eclipse.aether.repository.Proxy proxy = selector.getProxy(repo); if (proxy != null) { - org.apache.maven.repository.Proxy p = new org.apache.maven.repository.Proxy(); + Proxy p = new Proxy(); p.setHost(proxy.getHost()); p.setProtocol(proxy.getType()); p.setPort(proxy.getPort()); diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java index 60a6c0b32a0b..23776d108f53 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java @@ -147,8 +147,7 @@ public List computePhases(Lifecycle lifecycle) { return computed; } - private static void addPhase( - Graph graph, Graph.Vertex before, Graph.Vertex after, org.apache.maven.api.Lifecycle.Phase phase) { + private static void addPhase(Graph graph, Graph.Vertex before, Graph.Vertex after, Lifecycle.Phase phase) { Graph.Vertex ep0 = graph.addVertex(BEFORE + phase.name()); Graph.Vertex ep1 = graph.addVertex("$$" + phase.name()); Graph.Vertex ep2 = graph.addVertex(phase.name()); diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java index 5c53a246a5c5..4ebfdbbb188f 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java @@ -38,6 +38,7 @@ import org.apache.maven.api.VersionConstraint; import org.apache.maven.api.annotations.Nonnull; import org.apache.maven.api.annotations.Nullable; +import org.apache.maven.api.model.Dependency; import org.apache.maven.api.model.DependencyManagement; import org.apache.maven.api.model.Model; import org.apache.maven.api.model.Profile; @@ -45,6 +46,7 @@ import org.apache.maven.impl.MappedList; import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.ProjectArtifact; +import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.util.artifact.ArtifactIdUtils; public class DefaultProject implements Project { @@ -94,8 +96,8 @@ public String getVersion() { @Nonnull @Override public List getArtifacts() { - org.eclipse.aether.artifact.Artifact pomArtifact = RepositoryUtils.toArtifact(new ProjectArtifact(project)); - org.eclipse.aether.artifact.Artifact projectArtifact = RepositoryUtils.toArtifact(project.getArtifact()); + Artifact pomArtifact = RepositoryUtils.toArtifact(new ProjectArtifact(project)); + Artifact projectArtifact = RepositoryUtils.toArtifact(project.getArtifact()); ArrayList result = new ArrayList<>(2); result.add(session.getArtifact(ProducedArtifact.class, pomArtifact)); @@ -200,7 +202,7 @@ public List getEffectiveActiveProfiles() { } @Nonnull - private DependencyCoordinates toDependency(org.apache.maven.api.model.Dependency dependency) { + private DependencyCoordinates toDependency(Dependency dependency) { return new DependencyCoordinates() { @Override public String getGroupId() { diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java index dbc679d903e2..918cfb004277 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java @@ -24,8 +24,11 @@ import org.apache.maven.api.RemoteRepository; import org.apache.maven.api.Session; import org.apache.maven.api.annotations.Nullable; +import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.execution.MavenSession; import org.apache.maven.impl.InternalSession; +import org.apache.maven.project.MavenProject; +import org.eclipse.aether.RepositorySystemSession; import static org.apache.maven.internal.impl.CoreUtils.cast; @@ -35,22 +38,21 @@ static InternalMavenSession from(Session session) { return cast(InternalMavenSession.class, session, "session should be an " + InternalMavenSession.class); } - static InternalMavenSession from(org.eclipse.aether.RepositorySystemSession session) { + static InternalMavenSession from(RepositorySystemSession session) { return cast(InternalMavenSession.class, session.getData().get(InternalSession.class), "session"); } - List getProjects(List projects); + List getProjects(List projects); /** * May return null if the input project is null or is not part of the reactor. */ @Nullable - Project getProject(org.apache.maven.project.MavenProject project); + Project getProject(MavenProject project); - List toArtifactRepositories( - List repositories); + List toArtifactRepositories(List repositories); - org.apache.maven.artifact.repository.ArtifactRepository toArtifactRepository(RemoteRepository repository); + ArtifactRepository toArtifactRepository(RemoteRepository repository); MavenSession getMavenSession(); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifact.java b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifact.java index e928e6101896..4fe0be9890a1 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifact.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifact.java @@ -32,6 +32,7 @@ import java.util.function.Supplier; import org.apache.maven.api.services.ModelBuilderException; +import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.internal.transformation.TransformationFailedException; import org.apache.maven.project.MavenProject; @@ -58,7 +59,7 @@ class TransformedArtifact extends DefaultArtifact { MavenProject project, Path target, RepositorySystemSession session, - org.apache.maven.artifact.Artifact source, + Artifact source, Supplier sourcePathProvider, String classifier, String extension) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java index 91d392e280a6..87e92a22fa73 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.stream.Collectors; +import org.apache.maven.api.services.LifecycleRegistry; import org.apache.maven.lifecycle.mapping.LifecyclePhase; /** @@ -38,8 +39,7 @@ public Lifecycle(String id, List phases, Map def this.defaultPhases = defaultPhases; } - public Lifecycle( - org.apache.maven.api.services.LifecycleRegistry registry, org.apache.maven.api.Lifecycle lifecycle) { + public Lifecycle(LifecycleRegistry registry, org.apache.maven.api.Lifecycle lifecycle) { this.lifecycle = lifecycle; this.id = lifecycle.id(); this.phases = registry.computePhases(lifecycle); diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java index e35bd8df1ca3..bca43559851a 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java @@ -59,6 +59,7 @@ import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException; import org.apache.maven.plugin.version.PluginVersionResolutionException; import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.util.xml.Xpp3Dom; /** * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. @@ -511,7 +512,7 @@ private void injectLifecycleOverlay( if (phaseConfiguration != null) { for (MojoExecution forkedExecution : forkedExecutions) { - org.codehaus.plexus.util.xml.Xpp3Dom config = forkedExecution.getConfiguration(); + Xpp3Dom config = forkedExecution.getConfiguration(); if (config != null) { XmlNode forkedConfiguration = config.getDom(); diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java index 009e3712cdc9..eb4ceb28ed0d 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java @@ -49,6 +49,7 @@ import org.apache.maven.plugin.version.PluginVersionResolver; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.configuration.PlexusConfiguration; +import org.codehaus.plexus.util.xml.Xpp3Dom; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -106,7 +107,7 @@ public static XmlNode convert(org.apache.maven.api.plugin.descriptor.MojoDescrip return XmlNode.newInstance("configuration", children); } - public static org.codehaus.plexus.util.xml.Xpp3Dom convert(MojoDescriptor mojoDescriptor) { + public static Xpp3Dom convert(MojoDescriptor mojoDescriptor) { PlexusConfiguration c = mojoDescriptor.getMojoConfiguration(); List children = new ArrayList<>(); @@ -128,7 +129,7 @@ public static org.codehaus.plexus.util.xml.Xpp3Dom convert(MojoDescriptor mojoDe } XmlNode dom = XmlNode.newInstance("configuration", children); - return new org.codehaus.plexus.util.xml.Xpp3Dom(dom); + return new Xpp3Dom(dom); } // org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process@executionId diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java index 81a319b7aea6..7150ff87d8d4 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java @@ -26,6 +26,7 @@ import org.apache.maven.api.Lifecycle; import org.apache.maven.api.model.Plugin; +import org.apache.maven.api.model.PluginExecution; import org.apache.maven.plugin.descriptor.PluginDescriptor; class PluginLifecycle implements Lifecycle { @@ -61,7 +62,7 @@ public List plugins() { .version(pluginDescriptor.getVersion()) .configuration(phase.getConfiguration()) .executions(phase.getExecutions().stream() - .map(exec -> org.apache.maven.api.model.PluginExecution.newBuilder() + .map(exec -> PluginExecution.newBuilder() .goals(exec.getGoals()) .configuration(exec.getConfiguration()) .build()) diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java index fd8835a699ee..86fba1b18f68 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java @@ -25,6 +25,7 @@ import org.apache.maven.api.xml.XmlNode; import org.apache.maven.model.Plugin; import org.apache.maven.plugin.descriptor.MojoDescriptor; +import org.codehaus.plexus.util.xml.Xpp3Dom; /** * MojoExecution @@ -39,7 +40,7 @@ public class MojoExecution { private MojoDescriptor mojoDescriptor; - private org.codehaus.plexus.util.xml.Xpp3Dom configuration; + private Xpp3Dom configuration; /** * Describes the source of an execution. @@ -96,7 +97,7 @@ public MojoExecution(MojoDescriptor mojoDescriptor, String executionId) { this.configuration = null; } - public MojoExecution(MojoDescriptor mojoDescriptor, org.codehaus.plexus.util.xml.Xpp3Dom configuration) { + public MojoExecution(MojoDescriptor mojoDescriptor, Xpp3Dom configuration) { this.mojoDescriptor = mojoDescriptor; this.configuration = configuration; this.executionId = null; @@ -104,7 +105,7 @@ public MojoExecution(MojoDescriptor mojoDescriptor, org.codehaus.plexus.util.xml public MojoExecution(MojoDescriptor mojoDescriptor, XmlNode configuration) { this.mojoDescriptor = mojoDescriptor; - this.configuration = new org.codehaus.plexus.util.xml.Xpp3Dom(configuration); + this.configuration = new Xpp3Dom(configuration); this.executionId = null; } @@ -133,16 +134,16 @@ public MojoDescriptor getMojoDescriptor() { return mojoDescriptor; } - public org.codehaus.plexus.util.xml.Xpp3Dom getConfiguration() { + public Xpp3Dom getConfiguration() { return configuration; } - public void setConfiguration(org.codehaus.plexus.util.xml.Xpp3Dom configuration) { + public void setConfiguration(Xpp3Dom configuration) { this.configuration = configuration; } public void setConfiguration(XmlNode configuration) { - this.configuration = configuration != null ? new org.codehaus.plexus.util.xml.Xpp3Dom(configuration) : null; + this.configuration = configuration != null ? new Xpp3Dom(configuration) : null; } public String identify() { diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java index b1b0da0b369d..30a3a2822f91 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java @@ -48,6 +48,7 @@ import org.apache.maven.api.PathType; import org.apache.maven.api.Project; import org.apache.maven.api.Session; +import org.apache.maven.api.plugin.Log; import org.apache.maven.api.plugin.descriptor.Resolution; import org.apache.maven.api.services.DependencyResolver; import org.apache.maven.api.services.DependencyResolverResult; @@ -550,7 +551,7 @@ private T loadV4Mojo( Project project = sessionV4.getProject(session.getCurrentProject()); org.apache.maven.api.MojoExecution execution = new DefaultMojoExecution(sessionV4, mojoExecution); - org.apache.maven.api.plugin.Log log = new DefaultLog( + Log log = new DefaultLog( LoggerFactory.getLogger(mojoExecution.getMojoDescriptor().getFullGoalName())); try { Injector injector = Injector.create(); @@ -560,7 +561,7 @@ private T loadV4Mojo( injector.bindInstance(Session.class, sessionV4); injector.bindInstance(Project.class, project); injector.bindInstance(org.apache.maven.api.MojoExecution.class, execution); - injector.bindInstance(org.apache.maven.api.plugin.Log.class, log); + injector.bindInstance(Log.class, log); mojo = mojoInterface.cast(injector.getInstance( Key.of(mojoDescriptor.getImplementationClass(), mojoDescriptor.getRoleHint()))); diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedCoreExpressionValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedCoreExpressionValidator.java index faaac5cf1c53..680037d2495f 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedCoreExpressionValidator.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedCoreExpressionValidator.java @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.Objects; +import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.PluginValidationManager; import org.apache.maven.plugin.descriptor.MojoDescriptor; @@ -82,8 +83,7 @@ protected void doValidate( } private boolean isDeprecated(Parameter parameter) { - return Objects.equals( - org.apache.maven.artifact.repository.ArtifactRepository.class.getName(), parameter.getType()) + return Objects.equals(ArtifactRepository.class.getName(), parameter.getType()) && DEPRECATED_CORE_PARAMETERS.containsKey(parameter.getDefaultValue()); } } diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/Maven3CompatDependenciesValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/Maven3CompatDependenciesValidator.java index 0cf8fee6ad35..37f3377ae322 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/Maven3CompatDependenciesValidator.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/Maven3CompatDependenciesValidator.java @@ -26,6 +26,7 @@ import org.apache.maven.plugin.PluginValidationManager; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.graph.Dependency; import org.eclipse.aether.resolution.ArtifactDescriptorResult; /** @@ -47,7 +48,7 @@ protected void doValidate( RepositorySystemSession session, Artifact pluginArtifact, ArtifactDescriptorResult artifactDescriptorResult) { - for (org.eclipse.aether.graph.Dependency dependency : artifactDescriptorResult.getDependencies()) { + for (Dependency dependency : artifactDescriptorResult.getDependencies()) { if ("org.apache.maven".equals(dependency.getArtifact().getGroupId()) && "maven-compat".equals(dependency.getArtifact().getArtifactId()) && !DependencyScope.TEST.is(dependency.getScope())) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenScopeDependenciesValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenScopeDependenciesValidator.java index 460a91c6ec18..acdc75eee1c3 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenScopeDependenciesValidator.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenScopeDependenciesValidator.java @@ -29,6 +29,7 @@ import org.apache.maven.plugin.PluginValidationManager; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.graph.Dependency; import org.eclipse.aether.resolution.ArtifactDescriptorResult; /** @@ -52,7 +53,7 @@ protected void doValidate( ArtifactDescriptorResult artifactDescriptorResult) { Set mavenArtifacts = artifactDescriptorResult.getDependencies().stream() .filter(d -> !DependencyScope.PROVIDED.is(d.getScope()) && !DependencyScope.TEST.is(d.getScope())) - .map(org.eclipse.aether.graph.Dependency::getArtifact) + .map(Dependency::getArtifact) .filter(a -> "org.apache.maven".equals(a.getGroupId())) .filter(a -> !DefaultPluginValidationManager.EXPECTED_PROVIDED_SCOPE_EXCLUSIONS_GA.contains( a.getGroupId() + ":" + a.getArtifactId())) diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java index b5ee23b4e877..733fa4eb0983 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java @@ -92,7 +92,7 @@ public void attachArtifact(MavenProject project, File artifactFile, String artif /** * Add an attached artifact or replace the file for an existing artifact. * - * @see MavenProject#addAttachedArtifact(org.apache.maven.artifact.Artifact) + * @see MavenProject#addAttachedArtifact(Artifact) * @param project project reference. * @param artifact artifact to add or replace. */ diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java index a14dfaabe158..4170dacc4269 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java @@ -51,6 +51,7 @@ import org.apache.maven.api.LocalRepository; import org.apache.maven.api.ProjectScope; import org.apache.maven.api.SessionData; +import org.apache.maven.api.WorkspaceRepository; import org.apache.maven.api.annotations.Nonnull; import org.apache.maven.api.annotations.Nullable; import org.apache.maven.api.model.Build; @@ -449,7 +450,7 @@ ProjectBuildingResult build(boolean parent, Artifact artifact, boolean allowStub ArtifactResolverResult.ResultItem resItem = res.getResult(coordinates); pomArtifact = InternalMavenSession.from(session).toArtifact(resItem.getArtifact()); - localProject = resItem.getRepository() instanceof org.apache.maven.api.WorkspaceRepository; + localProject = resItem.getRepository() instanceof WorkspaceRepository; } catch (ArtifactResolverException e) { if (e.getResult().getResults().values().iterator().next().isMissing() && allowStubModel) { return build(parent, null, createStubModelSource(artifact)); diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java b/impl/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java index 4e75473210b2..c6578c2bba23 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java @@ -28,7 +28,7 @@ public interface MavenProjectHelper { String ROLE = MavenProjectHelper.class.getName(); /** - * See {@link #attachArtifact(MavenProject, String, String, java.io.File)}, but with type set to null. + * See {@link #attachArtifact(MavenProject, String, String, File)}, but with type set to null. * @param project project reference. * @param artifactFile artifact file. * @param artifactClassifier artifact classifier. @@ -36,7 +36,7 @@ public interface MavenProjectHelper { void attachArtifact(MavenProject project, File artifactFile, String artifactClassifier); /** - * * See {@link #attachArtifact(MavenProject, String, String, java.io.File)}, but with classifier set to null. + * * See {@link #attachArtifact(MavenProject, String, String, File)}, but with classifier set to null. * @param project project reference. * @param artifactType artifact type. * @param artifactFile artifact file. diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java index c2f8fb3bf340..1e62e7d4c80b 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java @@ -123,7 +123,7 @@ public interface ProjectBuildingRequest { List getInactiveProfileIds(); /** - * Add a {@link org.apache.maven.model.Profile} that has come from an external source. This may be from a custom + * Add a {@link Profile} that has come from an external source. This may be from a custom * configuration like the MavenCLI settings.xml file, or from a custom dialog in an IDE integration like M2Eclipse. * * @param profile diff --git a/impl/maven-core/src/test/java/org/apache/maven/di/DiTest.java b/impl/maven-core/src/test/java/org/apache/maven/di/DiTest.java index 2b3a0a861cb3..72f8c16b14d1 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/di/DiTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/di/DiTest.java @@ -30,6 +30,7 @@ import com.google.inject.Binding; import com.google.inject.Injector; import com.google.inject.TypeLiteral; +import org.apache.maven.api.di.Inject; import org.apache.maven.api.model.Model; import org.apache.maven.api.services.Source; import org.apache.maven.api.spi.ModelParser; @@ -38,6 +39,7 @@ import org.codehaus.plexus.DefaultContainerConfiguration; import org.codehaus.plexus.DefaultPlexusContainer; import org.codehaus.plexus.PlexusContainer; +import org.eclipse.sisu.Priority; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -102,13 +104,13 @@ void testDI() throws Exception { } static class DiInjected { - @org.apache.maven.api.di.Inject + @Inject ModelParser parser; - @org.apache.maven.api.di.Inject + @Inject List parsers; - @org.apache.maven.api.di.Inject + @Inject Map parsersMap; } @@ -174,13 +176,13 @@ void testDI() throws Exception { } static class DiInjected { - @org.apache.maven.api.di.Inject + @Inject ModelParser parser; - @org.apache.maven.api.di.Inject + @Inject List parsers; - @org.apache.maven.api.di.Inject + @Inject Map parsersMap; } @@ -246,13 +248,13 @@ void testDI() throws Exception { } static class DiInjected { - @org.apache.maven.api.di.Inject + @Inject ModelParser parser; - @org.apache.maven.api.di.Inject + @Inject List parsers; - @org.apache.maven.api.di.Inject + @Inject Map parsersMap; } @@ -325,18 +327,18 @@ void testDI() throws Exception { } static class DiInjected { - @org.apache.maven.api.di.Inject + @Inject ModelParser parser; - @org.apache.maven.api.di.Inject + @Inject List parsers; - @org.apache.maven.api.di.Inject + @Inject Map parsersMap; } - @javax.inject.Named("sisu") - @org.eclipse.sisu.Priority(100) + @Named("sisu") + @Priority(100) static class TestModelParserSisu implements ModelParser { @Override public Optional locate(Path dir) { diff --git a/impl/maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java index 8b80dc0efd60..5ba8c72d5644 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java @@ -40,6 +40,7 @@ import org.codehaus.plexus.testing.PlexusTest; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.eclipse.aether.ConfigurationProperties; +import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.collection.VersionFilter; import org.eclipse.aether.repository.RepositoryPolicy; import org.eclipse.aether.util.graph.version.ChainedVersionFilter; @@ -69,7 +70,7 @@ public class DefaultRepositorySystemSessionFactoryTest { protected EventSpyDispatcher eventSpyDispatcher; @Inject - protected org.eclipse.aether.RepositorySystem aetherRepositorySystem; + protected RepositorySystem aetherRepositorySystem; @Inject protected RuntimeInformation information; diff --git a/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java index 4b25cf559bcc..1b9f785e9644 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java +++ b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java @@ -33,6 +33,7 @@ import org.apache.maven.AbstractCoreMavenComponentTestCase; import org.apache.maven.RepositoryUtils; import org.apache.maven.api.Artifact; +import org.apache.maven.api.Dependency; import org.apache.maven.api.MojoExecution; import org.apache.maven.api.Session; import org.apache.maven.artifact.DefaultArtifact; @@ -132,8 +133,8 @@ public void testPluginArtifactMapExpressionReference() throws Exception { MojoExecution exec = newMojoExecution(session); @SuppressWarnings("unchecked") - Map depResults = (Map) - new PluginParameterExpressionEvaluatorV4(session, null, exec) + Map depResults = + (Map) new PluginParameterExpressionEvaluatorV4(session, null, exec) .evaluate("${mojo.plugin.dependenciesMap}"); System.out.println("Result: " + depResults); diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java index 20ef83c50441..1007bc27a133 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java @@ -24,6 +24,7 @@ import org.apache.commons.jxpath.ri.model.NodePointer; import org.apache.commons.jxpath.ri.model.NodePointerFactory; import org.apache.maven.api.xml.XmlNode; +import org.codehaus.plexus.util.xml.Xpp3Dom; /** * A node pointer factory for JXPath to support Xpp3Dom. @@ -36,7 +37,7 @@ public int getOrder() { } public NodePointer createNodePointer(QName name, Object object, Locale locale) { - if (object instanceof org.codehaus.plexus.util.xml.Xpp3Dom xpp3Dom) { + if (object instanceof Xpp3Dom xpp3Dom) { object = xpp3Dom.getDom(); } if (object instanceof XmlNode xmlNode) { @@ -46,7 +47,7 @@ public NodePointer createNodePointer(QName name, Object object, Locale locale) { } public NodePointer createNodePointer(NodePointer parent, QName name, Object object) { - if (object instanceof org.codehaus.plexus.util.xml.Xpp3Dom xpp3Dom) { + if (object instanceof Xpp3Dom xpp3Dom) { object = xpp3Dom.getDom(); } if (object instanceof XmlNode xmlNode) { diff --git a/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java index 266122ef3155..a0ce14db0479 100644 --- a/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java +++ b/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java @@ -426,29 +426,27 @@ private void removeFromResolutionStack(Key key) { } private static class SingletonScope implements Scope { - Map, java.util.function.Supplier> cache = new ConcurrentHashMap<>(); + Map, Supplier> cache = new ConcurrentHashMap<>(); @Nonnull @SuppressWarnings("unchecked") @Override - public java.util.function.Supplier scope( - @Nonnull Key key, @Nonnull java.util.function.Supplier unscoped) { - return (java.util.function.Supplier) - cache.computeIfAbsent(key, k -> new java.util.function.Supplier() { - volatile T instance; + public Supplier scope(@Nonnull Key key, @Nonnull Supplier unscoped) { + return (Supplier) cache.computeIfAbsent(key, k -> new Supplier() { + volatile T instance; - @Override - public T get() { + @Override + public T get() { + if (instance == null) { + synchronized (this) { if (instance == null) { - synchronized (this) { - if (instance == null) { - instance = unscoped.get(); - } - } + instance = unscoped.get(); } - return instance; } - }); + } + return instance; + } + }); } } } diff --git a/impl/maven-di/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java index 809e39e9552e..0863ab2539cc 100644 --- a/impl/maven-di/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java +++ b/impl/maven-di/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java @@ -45,6 +45,7 @@ import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Priority; import org.apache.maven.api.di.Qualifier; +import org.apache.maven.api.di.Scope; import org.apache.maven.di.Key; import static java.util.stream.Collectors.toList; @@ -100,7 +101,7 @@ public final class ReflectionUtils { public static @Nullable Annotation scopeOf(AnnotatedElement annotatedElement) { Annotation scope = null; for (Annotation annotation : annotatedElement.getDeclaredAnnotations()) { - if (annotation.annotationType().isAnnotationPresent(org.apache.maven.api.di.Scope.class)) { + if (annotation.annotationType().isAnnotationPresent(Scope.class)) { if (scope != null) { throw new DIException("More than one scope annotation on " + annotatedElement); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractNode.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractNode.java index ad0dea065f5c..0a2635573bb1 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractNode.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractNode.java @@ -25,10 +25,11 @@ import org.apache.maven.api.Node; import org.apache.maven.api.NodeVisitor; +import org.eclipse.aether.graph.DependencyNode; public abstract class AbstractNode implements Node { - abstract org.eclipse.aether.graph.DependencyNode getDependencyNode(); + abstract DependencyNode getDependencyNode(); @Override public boolean accept(NodeVisitor visitor) { diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java index e81a217a8e28..1f7a1d2ee771 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java @@ -100,6 +100,7 @@ import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.ArtifactType; +import org.eclipse.aether.graph.DependencyNode; import org.eclipse.aether.repository.ArtifactRepository; import org.eclipse.aether.transfer.TransferResource; @@ -114,8 +115,7 @@ public abstract class AbstractSession implements InternalSession { protected final Lookup lookup; private final Map, Service> services = new ConcurrentHashMap<>(); private final List listeners = new CopyOnWriteArrayList<>(); - private final Map allNodes = - Collections.synchronizedMap(new WeakHashMap<>()); + private final Map allNodes = Collections.synchronizedMap(new WeakHashMap<>()); private final Map, Map> allArtifacts = new ConcurrentHashMap<>(); private final Map allRepositories = @@ -207,12 +207,12 @@ public org.apache.maven.api.Repository getRepository(ArtifactRepository reposito } @Override - public Node getNode(org.eclipse.aether.graph.DependencyNode node) { + public Node getNode(DependencyNode node) { return getNode(node, false); } @Override - public Node getNode(org.eclipse.aether.graph.DependencyNode node, boolean verbose) { + public Node getNode(DependencyNode node, boolean verbose) { return allNodes.computeIfAbsent(node, n -> new DefaultNode(this, n, verbose)); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinates.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinates.java index 3abf27729d60..fda177503b60 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinates.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinates.java @@ -23,6 +23,7 @@ import org.apache.maven.api.ArtifactCoordinates; import org.apache.maven.api.VersionConstraint; import org.apache.maven.api.annotations.Nonnull; +import org.eclipse.aether.artifact.Artifact; import static org.apache.maven.impl.ImplUtils.nonNull; @@ -31,15 +32,14 @@ */ public class DefaultArtifactCoordinates implements ArtifactCoordinates { private final @Nonnull InternalSession session; - private final @Nonnull org.eclipse.aether.artifact.Artifact coordinates; + private final @Nonnull Artifact coordinates; - public DefaultArtifactCoordinates( - @Nonnull InternalSession session, @Nonnull org.eclipse.aether.artifact.Artifact coordinates) { + public DefaultArtifactCoordinates(@Nonnull InternalSession session, @Nonnull Artifact coordinates) { this.session = nonNull(session, "session"); this.coordinates = nonNull(coordinates, "coordinates"); } - public org.eclipse.aether.artifact.Artifact getCoordinates() { + public Artifact getCoordinates() { return coordinates; } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinatesFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinatesFactory.java index 6832ae6f164b..8e782aa45e10 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinatesFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinatesFactory.java @@ -25,6 +25,7 @@ import org.apache.maven.api.services.ArtifactCoordinatesFactory; import org.apache.maven.api.services.ArtifactCoordinatesFactoryRequest; import org.eclipse.aether.artifact.ArtifactType; +import org.eclipse.aether.artifact.DefaultArtifact; import static org.apache.maven.impl.ImplUtils.nonNull; @@ -36,8 +37,7 @@ public ArtifactCoordinates create(@Nonnull ArtifactCoordinatesFactoryRequest req nonNull(request, "request"); InternalSession session = InternalSession.from(request.getSession()); if (request.getCoordinatesString() != null) { - return new DefaultArtifactCoordinates( - session, new org.eclipse.aether.artifact.DefaultArtifact(request.getCoordinatesString())); + return new DefaultArtifactCoordinates(session, new DefaultArtifact(request.getCoordinatesString())); } else { ArtifactType type = null; if (request.getType() != null) { @@ -52,7 +52,7 @@ public ArtifactCoordinates create(@Nonnull ArtifactCoordinatesFactoryRequest req str != null && !str.isEmpty() ? request.getExtension() : type != null ? type.getExtension() : ""; return new DefaultArtifactCoordinates( session, - new org.eclipse.aether.artifact.DefaultArtifact( + new DefaultArtifact( request.getGroupId(), request.getArtifactId(), classifier, diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinates.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinates.java index 9128e122c986..218519535c50 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinates.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinates.java @@ -25,10 +25,10 @@ import org.apache.maven.api.VersionConstraint; import org.apache.maven.api.annotations.Nonnull; import org.apache.maven.api.annotations.Nullable; +import org.eclipse.aether.graph.Dependency; public class DefaultDependencyCoordinates extends AetherDependencyWrapper implements DependencyCoordinates { - public DefaultDependencyCoordinates( - @Nonnull InternalSession session, @Nonnull org.eclipse.aether.graph.Dependency dependency) { + public DefaultDependencyCoordinates(@Nonnull InternalSession session, @Nonnull Dependency dependency) { super(session, dependency); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinatesFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinatesFactory.java index 9ebb084cb363..3087720a7737 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinatesFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinatesFactory.java @@ -26,6 +26,8 @@ import org.apache.maven.api.services.DependencyCoordinatesFactory; import org.apache.maven.api.services.DependencyCoordinatesFactoryRequest; import org.eclipse.aether.artifact.ArtifactType; +import org.eclipse.aether.artifact.DefaultArtifact; +import org.eclipse.aether.graph.Dependency; import static org.apache.maven.impl.ImplUtils.map; import static org.apache.maven.impl.ImplUtils.nonNull; @@ -47,16 +49,16 @@ public DependencyCoordinates create(@Nonnull DependencyCoordinatesFactoryRequest if (request.getCoordinatesString() != null) { return new DefaultDependencyCoordinates( session, - new org.eclipse.aether.graph.Dependency( - new org.eclipse.aether.artifact.DefaultArtifact(request.getCoordinatesString()), + new Dependency( + new DefaultArtifact(request.getCoordinatesString()), request.getScope(), request.isOptional(), map(request.getExclusions(), this::toExclusion))); } else { return new DefaultDependencyCoordinates( session, - new org.eclipse.aether.graph.Dependency( - new org.eclipse.aether.artifact.DefaultArtifact( + new Dependency( + new DefaultArtifact( request.getGroupId(), request.getArtifactId(), request.getClassifier(), diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java index 7bab2446c6f0..2734427101ed 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java @@ -54,6 +54,7 @@ import org.eclipse.aether.collection.CollectRequest; import org.eclipse.aether.collection.CollectResult; import org.eclipse.aether.collection.DependencyCollectionException; +import org.eclipse.aether.graph.Dependency; import org.eclipse.aether.graph.DependencyFilter; import org.eclipse.aether.graph.DependencyNode; import org.eclipse.aether.scope.ResolutionScope; @@ -67,6 +68,18 @@ @Named @Singleton public class DefaultDependencyResolver implements DependencyResolver { + /** + * Cache of information about the modules contained in a path element. + * This cache is created when first needed. It may be never created. + * + *

TODO: This field should not be in this class, because the cache should be global to the session. + * This field exists here only temporarily, until clarified where to store session-wide caches.

+ * + * @see moduleCache() + * + * @see #moduleCache() + */ + private PathModularizationCache moduleCache; @Nonnull @Override @@ -126,7 +139,11 @@ public DependencyResolverResult collect(@Nonnull DependencyResolverRequest reque final CollectResult result = session.getRepositorySystem().collectDependencies(systemSession, collectRequest); return new DefaultDependencyResolverResult( - null, null, result.getExceptions(), session.getNode(result.getRoot(), request.getVerbose()), 0); + null, + moduleCache(), + result.getExceptions(), + session.getNode(result.getRoot(), request.getVerbose()), + 0); } catch (DependencyCollectionException e) { throw new DependencyResolverException("Unable to collect dependencies", e); } @@ -154,7 +171,7 @@ private static DependencyFilter getScopeDependencyFilter(PathScope scope) { Set scopes = scope.dependencyScopes().stream().map(DependencyScope::id).collect(Collectors.toSet()); return (n, p) -> { - org.eclipse.aether.graph.Dependency d = n.getDependency(); + Dependency d = n.getDependency(); return d == null || scopes.contains(d.getScope()); }; } @@ -191,18 +208,14 @@ public DependencyResolverResult resolve(DependencyResolverRequest request) .map(Artifact::toCoordinates) .collect(Collectors.toList()); Predicate filter = request.getPathTypeFilter(); + DefaultDependencyResolverResult resolverResult = new DefaultDependencyResolverResult( + null, moduleCache(), collectorResult.getExceptions(), collectorResult.getRoot(), nodes.size()); if (request.getRequestType() == DependencyResolverRequest.RequestType.FLATTEN) { - DefaultDependencyResolverResult flattenResult = new DefaultDependencyResolverResult( - null, null, collectorResult.getExceptions(), collectorResult.getRoot(), nodes.size()); for (Node node : nodes) { - flattenResult.addNode(node); + resolverResult.addNode(node); } - result = flattenResult; + result = resolverResult; } else { - PathModularizationCache cache = - new PathModularizationCache(); // TODO: should be project-wide cache. - DefaultDependencyResolverResult resolverResult = new DefaultDependencyResolverResult( - null, cache, collectorResult.getExceptions(), collectorResult.getRoot(), nodes.size()); ArtifactResolverResult artifactResolverResult = session.getService(ArtifactResolver.class).resolve(session, coordinates, repositories); for (Node node : nodes) { @@ -226,6 +239,19 @@ public DependencyResolverResult resolve(DependencyResolverRequest request) } } + /** + * {@return the cache of information about the modules contained in a path element}. + * + *

TODO: This method should not be in this class, because the cache should be global to the session. + * This method exists here only temporarily, until clarified where to store session-wide caches.

+ */ + private PathModularizationCache moduleCache() { + if (moduleCache == null) { + moduleCache = new PathModularizationCache(); + } + return moduleCache; + } + private static DependencyResolverException cannotReadModuleInfo(final Path path, final IOException cause) { return new DependencyResolverException("Cannot read module information of " + path, cause); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDownloadedArtifact.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDownloadedArtifact.java index e5dc30e80918..fd1a58e325aa 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDownloadedArtifact.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDownloadedArtifact.java @@ -22,14 +22,14 @@ import org.apache.maven.api.DownloadedArtifact; import org.apache.maven.api.annotations.Nonnull; +import org.eclipse.aether.artifact.Artifact; /** * A wrapper class around a maven resolver artifact. */ public class DefaultDownloadedArtifact extends DefaultArtifact implements DownloadedArtifact { - public DefaultDownloadedArtifact( - @Nonnull InternalSession session, @Nonnull org.eclipse.aether.artifact.Artifact artifact) { + public DefaultDownloadedArtifact(@Nonnull InternalSession session, @Nonnull Artifact artifact) { super(session, artifact); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultNode.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultNode.java index 3dfe43bdb89b..a6092ee129fe 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultNode.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultNode.java @@ -35,11 +35,10 @@ public class DefaultNode extends AbstractNode { protected final @Nonnull InternalSession session; - protected final @Nonnull org.eclipse.aether.graph.DependencyNode node; + protected final @Nonnull DependencyNode node; protected final boolean verbose; - public DefaultNode( - @Nonnull InternalSession session, @Nonnull org.eclipse.aether.graph.DependencyNode node, boolean verbose) { + public DefaultNode(@Nonnull InternalSession session, @Nonnull DependencyNode node, boolean verbose) { this.session = session; this.node = node; this.verbose = verbose; @@ -114,8 +113,7 @@ public String asString() { } List details = new ArrayList<>(); - org.eclipse.aether.graph.DependencyNode winner = - (org.eclipse.aether.graph.DependencyNode) node.getData().get(ConflictResolver.NODE_DATA_WINNER); + DependencyNode winner = (DependencyNode) node.getData().get(ConflictResolver.NODE_DATA_WINNER); String winnerVersion = winner != null ? winner.getArtifact().getBaseVersion() : null; boolean included = (winnerVersion == null); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultProducedArtifact.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultProducedArtifact.java index 42ab1d1e72ab..b54ff134eaee 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultProducedArtifact.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultProducedArtifact.java @@ -20,14 +20,14 @@ import org.apache.maven.api.ProducedArtifact; import org.apache.maven.api.annotations.Nonnull; +import org.eclipse.aether.artifact.Artifact; /** * A wrapper class around a maven resolver artifact. */ public class DefaultProducedArtifact extends DefaultArtifact implements ProducedArtifact { - public DefaultProducedArtifact( - @Nonnull InternalSession session, @Nonnull org.eclipse.aether.artifact.Artifact artifact) { + public DefaultProducedArtifact(@Nonnull InternalSession session, @Nonnull Artifact artifact) { super(session, artifact); } } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRepositoryFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRepositoryFactory.java index ec6edf462712..d2644ed2328a 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRepositoryFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRepositoryFactory.java @@ -82,8 +82,7 @@ public List aggregate( .toList(); } - public static org.eclipse.aether.repository.RepositoryPolicy buildRepositoryPolicy( - org.apache.maven.api.model.RepositoryPolicy policy) { + public static RepositoryPolicy buildRepositoryPolicy(org.apache.maven.api.model.RepositoryPolicy policy) { boolean enabled = true; String updatePolicy = RepositoryPolicy.UPDATE_POLICY_DAILY; String checksumPolicy = RepositoryPolicy.CHECKSUM_POLICY_FAIL; @@ -96,6 +95,6 @@ public static org.eclipse.aether.repository.RepositoryPolicy buildRepositoryPoli checksumPolicy = policy.getChecksumPolicy(); } } - return new org.eclipse.aether.repository.RepositoryPolicy(enabled, updatePolicy, checksumPolicy); + return new RepositoryPolicy(enabled, updatePolicy, checksumPolicy); } } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultTransportProvider.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultTransportProvider.java index 1530f9d75a0d..94442d95bcbd 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultTransportProvider.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultTransportProvider.java @@ -37,7 +37,7 @@ @Named @Singleton public class DefaultTransportProvider implements TransportProvider { - private final org.eclipse.aether.spi.connector.transport.TransporterProvider transporterProvider; + private final TransporterProvider transporterProvider; @Inject public DefaultTransportProvider(TransporterProvider transporterProvider) { diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionRangeResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionRangeResolver.java index df182d976a3a..ed7860b32cb1 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionRangeResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionRangeResolver.java @@ -34,6 +34,8 @@ import org.apache.maven.api.services.VersionRangeResolverResult; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.repository.ArtifactRepository; +import org.eclipse.aether.repository.LocalRepository; +import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.resolution.VersionRangeRequest; import org.eclipse.aether.resolution.VersionRangeResolutionException; import org.eclipse.aether.resolution.VersionRangeResult; @@ -99,9 +101,9 @@ public List getVersions() { @Override public Optional getRepository(Version version) { ArtifactRepository repo = repos.get(version.toString()); - if (repo instanceof org.eclipse.aether.repository.LocalRepository localRepository) { + if (repo instanceof LocalRepository localRepository) { return Optional.of(new DefaultLocalRepository(localRepository)); - } else if (repo instanceof org.eclipse.aether.repository.RemoteRepository remoteRepository) { + } else if (repo instanceof RemoteRepository remoteRepository) { return Optional.of(new DefaultRemoteRepository(remoteRepository)); } else { return Optional.empty(); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionResolver.java index cc140caf92d6..e5e2a44711c0 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionResolver.java @@ -31,6 +31,8 @@ import org.apache.maven.api.services.VersionResolverRequest; import org.apache.maven.api.services.VersionResolverResult; import org.eclipse.aether.RepositorySystem; +import org.eclipse.aether.repository.LocalRepository; +import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.resolution.VersionRequest; import org.eclipse.aether.resolution.VersionResolutionException; import org.eclipse.aether.resolution.VersionResult; @@ -87,10 +89,9 @@ public Version getVersion() { @Override public Optional getRepository() { - if (res.getRepository() instanceof org.eclipse.aether.repository.LocalRepository localRepository) { + if (res.getRepository() instanceof LocalRepository localRepository) { return Optional.of(new DefaultLocalRepository(localRepository)); - } else if (res.getRepository() - instanceof org.eclipse.aether.repository.RemoteRepository remoteRepository) { + } else if (res.getRepository() instanceof RemoteRepository remoteRepository) { return Optional.of(new DefaultRemoteRepository(remoteRepository)); } else { return Optional.empty(); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/InternalSession.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/InternalSession.java index e39836e2552d..8a8c4e8985c6 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/InternalSession.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/InternalSession.java @@ -39,6 +39,8 @@ import org.apache.maven.api.services.Result; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.graph.DependencyNode; +import org.eclipse.aether.repository.ArtifactRepository; import static org.apache.maven.impl.ImplUtils.cast; @@ -48,11 +50,11 @@ static InternalSession from(Session session) { return cast(InternalSession.class, session, "session should be an " + InternalSession.class); } - static InternalSession from(org.eclipse.aether.RepositorySystemSession session) { + static InternalSession from(RepositorySystemSession session) { return cast(InternalSession.class, session.getData().get(InternalSession.class), "session"); } - static void associate(org.eclipse.aether.RepositorySystemSession rsession, Session session) { + static void associate(RepositorySystemSession rsession, Session session) { if (!rsession.getData().set(InternalSession.class, null, from(session))) { throw new IllegalStateException("A maven session is already associated with the repository session"); } @@ -81,11 +83,11 @@ , REP extends Result> List requests( WorkspaceRepository getWorkspaceRepository(org.eclipse.aether.repository.WorkspaceRepository repository); - Repository getRepository(org.eclipse.aether.repository.ArtifactRepository repository); + Repository getRepository(ArtifactRepository repository); - Node getNode(org.eclipse.aether.graph.DependencyNode node); + Node getNode(DependencyNode node); - Node getNode(org.eclipse.aether.graph.DependencyNode node, boolean verbose); + Node getNode(DependencyNode node, boolean verbose); @Nonnull Artifact getArtifact(@Nonnull org.eclipse.aether.artifact.Artifact artifact); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/PathSelector.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/PathSelector.java index 05401739341e..0026052042de 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/PathSelector.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/PathSelector.java @@ -59,7 +59,7 @@ * @author Benjamin Bentmann * @author Martin Desruisseaux * - * @see java.nio.file.FileSystem#getPathMatcher(String) + * @see FileSystem#getPathMatcher(String) */ public class PathSelector implements PathMatcher { /** diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/RequestTraceHelper.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/RequestTraceHelper.java index 44b54003f25d..59b0193b9870 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/RequestTraceHelper.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/RequestTraceHelper.java @@ -21,6 +21,7 @@ import java.util.stream.Collectors; import org.apache.maven.api.Session; +import org.apache.maven.api.model.Plugin; import org.apache.maven.api.services.Request; import org.eclipse.aether.RequestTrace; import org.eclipse.aether.collection.CollectRequest; @@ -127,7 +128,7 @@ public static String interpretTrace(boolean detailed, RequestTrace requestTrace) return "artifact descriptor request for " + request.getArtifact(); } else if (data instanceof ArtifactRequest request) { return "artifact request for " + request.getArtifact(); - } else if (data instanceof org.apache.maven.api.model.Plugin plugin) { + } else if (data instanceof Plugin plugin) { return "plugin " + plugin.getId(); } requestTrace = requestTrace.getParent(); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java index 8a5d1e81a2bb..9eafef9e9b1b 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java @@ -45,6 +45,7 @@ import org.apache.maven.api.model.ActivationFile; import org.apache.maven.api.model.InputLocation; +import org.apache.maven.api.model.InputSource; import org.apache.maven.api.settings.Activation; import org.apache.maven.api.settings.ActivationOS; import org.apache.maven.api.settings.ActivationProperty; @@ -128,7 +129,7 @@ public static Profile convertToSettingsProfile(org.apache.maven.api.model.Profil activation.os(os); } - org.apache.maven.api.model.ActivationFile modelFile = modelActivation.getFile(); + ActivationFile modelFile = modelActivation.getFile(); if (modelFile != null) { org.apache.maven.api.settings.ActivationFile file = @@ -355,10 +356,9 @@ private static RepositoryPolicy convertRepositoryPolicy(org.apache.maven.api.mod return policy; } - private static org.apache.maven.api.settings.InputLocation toLocation( - org.apache.maven.api.model.InputLocation location) { + private static org.apache.maven.api.settings.InputLocation toLocation(InputLocation location) { if (location != null) { - org.apache.maven.api.model.InputSource source = location.getSource(); + InputSource source = location.getSource(); Map locs = location.getLocations().entrySet().stream() .collect(Collectors.toMap(Map.Entry::getKey, e -> toLocation(e.getValue()))); return new org.apache.maven.api.settings.InputLocation( @@ -371,16 +371,15 @@ private static org.apache.maven.api.settings.InputLocation toLocation( } } - private static org.apache.maven.api.model.InputLocation toLocation( - org.apache.maven.api.settings.InputLocation location) { + private static InputLocation toLocation(org.apache.maven.api.settings.InputLocation location) { if (location != null) { org.apache.maven.api.settings.InputSource source = location.getSource(); Map locs = location.getLocations().entrySet().stream() .collect(Collectors.toMap(Map.Entry::getKey, e -> toLocation(e.getValue()))); - return new org.apache.maven.api.model.InputLocation( + return new InputLocation( location.getLineNumber(), location.getColumnNumber(), - source != null ? new org.apache.maven.api.model.InputSource("", source.getLocation()) : null, + source != null ? new InputSource("", source.getLocation()) : null, locs); } else { return null; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/di/SessionScope.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/di/SessionScope.java index b47c5acde830..75d8072975e0 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/di/SessionScope.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/di/SessionScope.java @@ -22,6 +22,7 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.lang.reflect.Proxy; import java.util.Collection; import java.util.List; import java.util.Map; @@ -104,7 +105,7 @@ protected T createProxy(Key key, Supplier unscoped) { InvocationHandler dispatcher = (proxy, method, args) -> dispatch(key, unscoped, method, args); Class superType = (Class) Types.getRawType(key.getType()); Class[] interfaces = getInterfaces(superType); - return (T) java.lang.reflect.Proxy.newProxyInstance(superType.getClassLoader(), interfaces, dispatcher); + return (T) Proxy.newProxyInstance(superType.getClassLoader(), interfaces, dispatcher); } protected Object dispatch(Key key, Supplier unscoped, Method method, Object[] args) throws Throwable { diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java index 82ebd5a770f1..d9dea233c419 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java @@ -1916,8 +1916,7 @@ private Model getSuperModel(String modelVersion) { return superPomProvider.getSuperPom(modelVersion); } - private static org.apache.maven.api.model.Dependency addExclusions( - org.apache.maven.api.model.Dependency candidate, List exclusions) { + private static Dependency addExclusions(Dependency candidate, List exclusions) { return candidate.withExclusions(Stream.concat(candidate.getExclusions().stream(), exclusions.stream()) .toList()); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProcessor.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProcessor.java index bcd0a191f8c3..0993eb06035e 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProcessor.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProcessor.java @@ -33,6 +33,7 @@ import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Singleton; import org.apache.maven.api.model.Model; +import org.apache.maven.api.services.Source; import org.apache.maven.api.services.model.ModelProcessor; import org.apache.maven.api.services.xml.ModelXmlFactory; import org.apache.maven.api.services.xml.XmlReaderRequest; @@ -82,9 +83,7 @@ public Path locateExistingPom(Path projectDirectory) { // Note that the ModelProcessor#locatePom never returns null // while the ModelParser#locatePom needs to return an existing path! Path pom = modelParsers.stream() - .map(m -> m.locate(projectDirectory) - .map(org.apache.maven.api.services.Source::getPath) - .orElse(null)) + .map(m -> m.locate(projectDirectory).map(Source::getPath).orElse(null)) .filter(Objects::nonNull) .findFirst() .orElseGet(() -> doLocateExistingPom(projectDirectory)); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionProfileActivator.java index 98aa2c037639..c89f871ecf43 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionProfileActivator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionProfileActivator.java @@ -18,6 +18,7 @@ */ package org.apache.maven.impl.model.profile; +import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; import java.util.function.UnaryOperator; @@ -116,7 +117,7 @@ public Map registerFunctions( ConditionFunctions conditionFunctions = new ConditionFunctions(context, versionParser); - for (java.lang.reflect.Method method : ConditionFunctions.class.getDeclaredMethods()) { + for (Method method : ConditionFunctions.class.getDeclaredMethods()) { String methodName = method.getName(); if (methodName.endsWith("_")) { methodName = methodName.substring(0, methodName.length() - 1); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java index 896b240053f6..0f62f64124b0 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java @@ -32,6 +32,7 @@ import org.eclipse.aether.impl.scope.InternalScopeManager; import org.eclipse.aether.impl.scope.ScopeManagerConfiguration; import org.eclipse.aether.internal.impl.scope.ScopeManagerDump; +import org.eclipse.aether.scope.ResolutionScope; import static org.eclipse.aether.impl.scope.BuildScopeQuery.all; import static org.eclipse.aether.impl.scope.BuildScopeQuery.byBuildPath; @@ -133,8 +134,7 @@ public Collection buildDependencyScope } @Override - public Collection buildResolutionScopes( - InternalScopeManager internalScopeManager) { + public Collection buildResolutionScopes(InternalScopeManager internalScopeManager) { Collection allDependencyScopes = internalScopeManager.getDependencyScopeUniverse(); Collection nonTransitiveDependencyScopes = @@ -143,7 +143,7 @@ public Collection buildResolutionScope .getDependencyScope(DependencyScope.SYSTEM.id()) .orElse(null); - ArrayList result = new ArrayList<>(); + ArrayList result = new ArrayList<>(); result.add(internalScopeManager.createResolutionScope( RS_NONE, InternalScopeManager.Mode.REMOVE, diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsValidatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsValidatorTest.java index f604fe6bb3af..e587e8bbddf9 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsValidatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsValidatorTest.java @@ -49,7 +49,7 @@ void testValidate() { ProblemCollector problems = validator.validate(model); assertEquals(0, problems.totalProblemsReported()); - Repository repo = org.apache.maven.api.settings.Repository.newInstance(false); + Repository repo = Repository.newInstance(false); Settings model2 = Settings.newBuilder() .profiles(List.of(prof.withRepositories(List.of(repo)))) .build(); diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/resolver/DefaultModelResolverTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/resolver/DefaultModelResolverTest.java index e680267895ad..fc1d07785429 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/impl/resolver/DefaultModelResolverTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/resolver/DefaultModelResolverTest.java @@ -133,7 +133,7 @@ void testResolveParentSuccessfullyResolvesExistingParentUsingHighestVersion() th .version("(,2.0)") .build(); - AtomicReference modified = new AtomicReference<>(); + AtomicReference modified = new AtomicReference<>(); assertNotNull(this.newModelResolver().resolveModel(session, null, parent, modified)); assertEquals("1", modified.get().getVersion()); } @@ -204,7 +204,7 @@ void testResolveDependencySuccessfullyResolvesExistingDependencyUsingHighestVers .version("(,2.0)") .build(); - AtomicReference modified = new AtomicReference<>(); + AtomicReference modified = new AtomicReference<>(); assertNotNull(this.newModelResolver().resolveModel(session, null, dependency, modified)); assertEquals("1", modified.get().getVersion()); } diff --git a/impl/maven-logging/src/main/java/org/apache/maven/slf4j/SimpleLoggerConfiguration.java b/impl/maven-logging/src/main/java/org/apache/maven/slf4j/SimpleLoggerConfiguration.java index d07f66179fc4..d5ba10dc04fa 100644 --- a/impl/maven-logging/src/main/java/org/apache/maven/slf4j/SimpleLoggerConfiguration.java +++ b/impl/maven-logging/src/main/java/org/apache/maven/slf4j/SimpleLoggerConfiguration.java @@ -20,6 +20,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; import java.time.format.DateTimeFormatter; @@ -139,7 +140,7 @@ private void loadProperties() { properties.load(in); mavenPropsLoaded = true; } - } catch (java.io.IOException e) { + } catch (IOException e) { // ignored } @@ -160,7 +161,7 @@ private void loadProperties() { } } } - } catch (java.io.IOException e) { + } catch (IOException e) { // ignored } } diff --git a/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java index bb99243ccf9d..6de97167d7eb 100644 --- a/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java +++ b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/DefaultXmlService.java @@ -39,6 +39,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import com.ctc.wstx.api.WstxOutputProperties; +import com.ctc.wstx.stax.WstxOutputFactory; import org.apache.maven.api.annotations.Nonnull; import org.apache.maven.api.annotations.Nullable; import org.apache.maven.api.xml.XmlNode; @@ -147,10 +149,10 @@ private XmlNode doBuild(XMLStreamReader parser, boolean trim, InputLocationBuild @Override public void doWrite(XmlNode node, Writer writer) throws IOException { try { - XMLOutputFactory factory = new com.ctc.wstx.stax.WstxOutputFactory(); + XMLOutputFactory factory = new WstxOutputFactory(); factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, false); - factory.setProperty(com.ctc.wstx.api.WstxOutputProperties.P_USE_DOUBLE_QUOTES_IN_XML_DECL, true); - factory.setProperty(com.ctc.wstx.api.WstxOutputProperties.P_ADD_SPACE_AFTER_EMPTY_ELEM, true); + factory.setProperty(WstxOutputProperties.P_USE_DOUBLE_QUOTES_IN_XML_DECL, true); + factory.setProperty(WstxOutputProperties.P_ADD_SPACE_AFTER_EMPTY_ELEM, true); XMLStreamWriter serializer = new IndentingXMLStreamWriter(factory.createXMLStreamWriter(writer)); writeNode(serializer, node); serializer.close(); diff --git a/impl/maven-xml/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java b/impl/maven-xml/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java index af2fcd3dbab7..901e7877eb04 100644 --- a/impl/maven-xml/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java +++ b/impl/maven-xml/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java @@ -191,7 +191,7 @@ void testAppend() throws Exception { /** *

testCombineId.

* - * @throws java.lang.Exception if any. + * @throws Exception if any. */ @Test void testCombineId() throws Exception { @@ -237,7 +237,7 @@ void testCombineId() throws Exception { /** *

testCombineKeys.

* - * @throws java.lang.Exception if any. + * @throws Exception if any. */ @Test void testCombineKeys() throws Exception { @@ -548,7 +548,7 @@ void testShouldMergePluginConfigurationSubItemsWithMergeAttributeSet() throws XM /** *

testShouldNotChangeUponMergeWithItselfWhenFirstOrLastSubItemIsEmpty.

* - * @throws java.lang.Exception if any. + * @throws Exception if any. */ @Test void testShouldNotChangeUponMergeWithItselfWhenFirstOrLastSubItemIsEmpty() throws Exception { @@ -569,7 +569,7 @@ void testShouldNotChangeUponMergeWithItselfWhenFirstOrLastSubItemIsEmpty() throw /** *

testShouldCopyRecessiveChildrenNotPresentInTarget.

* - * @throws java.lang.Exception if any. + * @throws Exception if any. */ @Test void testShouldCopyRecessiveChildrenNotPresentInTarget() throws Exception { @@ -601,7 +601,7 @@ void testDupeChildren() throws IOException, XMLStreamException { /** *

testShouldRemoveEntireElementWithAttributesAndChildren.

* - * @throws java.lang.Exception if any. + * @throws Exception if any. */ @Test void testShouldRemoveEntireElementWithAttributesAndChildren() throws Exception { @@ -619,7 +619,7 @@ void testShouldRemoveEntireElementWithAttributesAndChildren() throws Exception { /** *

testShouldRemoveDoNotRemoveTagWhenSwappedInputDOMs.

* - * @throws java.lang.Exception if any. + * @throws Exception if any. */ @Test void testShouldRemoveDoNotRemoveTagWhenSwappedInputDOMs() throws Exception {