diff --git a/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/mvn/MavenOptions.java b/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/mvn/MavenOptions.java index 2387105a3a24..4f692564ea3e 100644 --- a/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/mvn/MavenOptions.java +++ b/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/mvn/MavenOptions.java @@ -229,5 +229,6 @@ public interface MavenOptions extends Options { * @return a new MavenOptions instance with interpolated values */ @Nonnull + @Override MavenOptions interpolate(@Nonnull UnaryOperator callback); } diff --git a/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/mvnenc/EncryptOptions.java b/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/mvnenc/EncryptOptions.java index 9a7da3750217..1c71f2ca027d 100644 --- a/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/mvnenc/EncryptOptions.java +++ b/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/mvnenc/EncryptOptions.java @@ -64,5 +64,6 @@ public interface EncryptOptions extends Options { * @return a new EncryptOptions instance with interpolated values */ @Nonnull + @Override EncryptOptions interpolate(UnaryOperator callback); } diff --git a/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/mvnsh/ShellOptions.java b/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/mvnsh/ShellOptions.java index 4e1a63c6d74e..81aef61d7adf 100644 --- a/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/mvnsh/ShellOptions.java +++ b/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/mvnsh/ShellOptions.java @@ -39,5 +39,6 @@ public interface ShellOptions extends Options { * @return a new EncryptOptions instance with interpolated values */ @Nonnull + @Override ShellOptions interpolate(UnaryOperator callback); } diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/ExtensibleEnums.java b/api/maven-api-core/src/main/java/org/apache/maven/api/ExtensibleEnums.java index 46a24b9b44cd..75892c765140 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/ExtensibleEnums.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/ExtensibleEnums.java @@ -87,6 +87,7 @@ private static class DefaultExtensibleEnum implements ExtensibleEnum { * * @return the identifier */ + @Override public String id() { return id; } diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Lifecycle.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Lifecycle.java index 37b3fba04311..27cb57d7c480 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/Lifecycle.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Lifecycle.java @@ -244,6 +244,7 @@ interface PhasePointer extends Pointer { * * @return the PROJECT pointer type */ + @Override default Type type() { return Type.PROJECT; } @@ -262,6 +263,7 @@ interface DependenciesPointer extends Pointer { * * @return the DEPENDENCIES pointer type */ + @Override default Type type() { return Type.DEPENDENCIES; } @@ -273,6 +275,7 @@ interface ChildrenPointer extends Pointer { * * @return the CHILDREN pointer type */ + @Override default Type type() { return Type.CHILDREN; } 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..18437f9c7773 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 @@ -66,6 +66,7 @@ public interface Packaging extends ExtensibleEnum { * The packaging id. */ @Nonnull + @Override String id(); /** diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Type.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Type.java index 30d81eabe309..98861483ff42 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/Type.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Type.java @@ -134,6 +134,7 @@ public interface Type extends ExtensibleEnum { * @return the id of this type, never {@code null}. */ @Nonnull + @Override 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..6d533ecfb601 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 @@ -38,5 +38,6 @@ public interface Version extends Comparable { * {@return the string representation of this version} */ @Nonnull + @Override String toString(); } 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..5d5ac0fc4f80 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 @@ -65,5 +65,6 @@ public interface VersionConstraint { * {@return the string representation of this version} */ @Nonnull + @Override String toString(); } 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..224b5d6f75fb 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 @@ -60,6 +60,7 @@ public interface VersionRange { * {@return the string representation of this version} */ @Nonnull + @Override String toString(); /** diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinatesFactoryRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinatesFactoryRequest.java index d754082668a1..d2c3540f3c2b 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinatesFactoryRequest.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinatesFactoryRequest.java @@ -233,6 +233,7 @@ public String getType() { return type; } + @Override public String getCoordinatesString() { return coordinatesString; } diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java index 6bf2c31b223b..b5e338466aa7 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java @@ -45,10 +45,12 @@ protected BaseRequest(@Nonnull S session, RequestTrace trace) { } @Nonnull + @Override public S getSession() { return session; } + @Override public RequestTrace getTrace() { return trace; } diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinatesFactoryRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinatesFactoryRequest.java index 579e9a448c31..c0314b2078b5 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinatesFactoryRequest.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinatesFactoryRequest.java @@ -282,6 +282,7 @@ public String getType() { return type; } + @Override public String getCoordinatesString() { return coordinateString; } diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelBuilderResult.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelBuilderResult.java index e4bec3a4d50d..4b15818cf033 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelBuilderResult.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelBuilderResult.java @@ -109,5 +109,6 @@ public interface ModelBuilderResult extends Result { /** * Creates a human-readable representation of these errors. */ + @Override String toString(); } diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java index d261345f7083..d6fc50e911ad 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java @@ -216,6 +216,7 @@ public InputStream getInputStream() { return inputStream; } + @Override public Reader getReader() { return reader; } diff --git a/api/maven-api-model/src/main/java/org/apache/maven/api/model/InputLocation.java b/api/maven-api-model/src/main/java/org/apache/maven/api/model/InputLocation.java index 60f50addbe08..2e65dea793fd 100644 --- a/api/maven-api-model/src/main/java/org/apache/maven/api/model/InputLocation.java +++ b/api/maven-api-model/src/main/java/org/apache/maven/api/model/InputLocation.java @@ -93,6 +93,7 @@ public InputSource getSource() { return source; } + @Override public InputLocation getLocation(Object key) { return locations != null ? locations.get(key) : null; } @@ -108,6 +109,7 @@ public Map getLocations() { * @return InputLocation * @since 4.0.0 */ + @Override public InputLocation getImportedFrom() { return importedFrom; } diff --git a/api/maven-api-plugin/src/test/java/org/apache/maven/api/plugin/descriptor/another/ExtendedPluginDescriptorTest.java b/api/maven-api-plugin/src/test/java/org/apache/maven/api/plugin/descriptor/another/ExtendedPluginDescriptorTest.java index c6b5e9ad67be..c318cb815f44 100644 --- a/api/maven-api-plugin/src/test/java/org/apache/maven/api/plugin/descriptor/another/ExtendedPluginDescriptorTest.java +++ b/api/maven-api-plugin/src/test/java/org/apache/maven/api/plugin/descriptor/another/ExtendedPluginDescriptorTest.java @@ -56,6 +56,7 @@ public Builder additionalField(String additionalField) { return this; } + @Override public ExtendedPluginDescriptor build() { return new ExtendedPluginDescriptor(this); } diff --git a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java index 5582e98cd2f2..63cf7c36c631 100644 --- a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java +++ b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java @@ -49,6 +49,7 @@ public InvalidArtifactRTException( this.baseMessage = message; } + @Override public String getMessage() { return "For artifact {" + getArtifactKey() + "}: " + getBaseMessage(); } diff --git a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java index a47d6a685117..e04c6b2a1e3a 100644 --- a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java +++ b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java @@ -32,6 +32,7 @@ public CyclicDependencyException(String message, Artifact artifact) { this.artifact = artifact; } + @Override public Artifact getArtifact() { return artifact; } diff --git a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index 6f84a85bd3e8..e92e0bb450ea 100644 --- a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@ -285,6 +285,7 @@ public int hashCode() { return value.hashCode(); } + @Override public String toString() { return value.toString(); } @@ -415,6 +416,7 @@ public int hashCode() { return value.hashCode(); } + @Override public String toString() { return value; } diff --git a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java index 0ce07377400f..5d2264f24510 100644 --- a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java +++ b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java @@ -57,6 +57,7 @@ public boolean equals(Object other) { return false; } + @Override public int compareTo(ArtifactVersion otherVersion) { if (otherVersion instanceof DefaultArtifactVersion defaultArtifactVersion) { return this.comparable.compareTo(defaultArtifactVersion.comparable); @@ -65,26 +66,32 @@ public int compareTo(ArtifactVersion otherVersion) { } } + @Override public int getMajorVersion() { return majorVersion != null ? majorVersion : 0; } + @Override public int getMinorVersion() { return minorVersion != null ? minorVersion : 0; } + @Override public int getIncrementalVersion() { return incrementalVersion != null ? incrementalVersion : 0; } + @Override public int getBuildNumber() { return buildNumber != null ? buildNumber : 0; } + @Override public String getQualifier() { return qualifier; } + @Override public final void parseVersion(String version) { comparable = new ComparableVersion(version); diff --git a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java index cd65e3984a32..8498ec86f5a8 100644 --- a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java +++ b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java @@ -139,6 +139,7 @@ public boolean equals(Object other) { } } + @Override public String toString() { StringBuilder buf = new StringBuilder(); diff --git a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java index 3f8cd985c5d5..1869dcc5846c 100644 --- a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java +++ b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java @@ -419,6 +419,7 @@ public boolean isSelectedVersionKnown(Artifact artifact) throws OverConstrainedV return value; } + @Override public String toString() { if (recommendedVersion != null) { return recommendedVersion.toString(); @@ -465,6 +466,7 @@ public boolean hasRestrictions() { return !restrictions.isEmpty() && recommendedVersion == null; } + @Override public boolean equals(Object obj) { if (this == obj) { return true; @@ -477,6 +479,7 @@ public boolean equals(Object obj) { } } + @Override public int hashCode() { int hash = 7; hash = 31 * hash + (recommendedVersion == null ? 0 : recommendedVersion.hashCode()); 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..ad5c72e5a2bf 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 @@ -62,18 +62,22 @@ class DefaultProblem implements Problem { this.exception = exception; } + @Override public String getSource() { return source; } + @Override public int getLineNumber() { return lineNumber; } + @Override public int getColumnNumber() { return columnNumber; } + @Override public String getLocation() { StringBuilder buffer = new StringBuilder(256); @@ -101,10 +105,12 @@ public String getLocation() { return buffer.toString(); } + @Override public Exception getException() { return exception; } + @Override public String getMessage() { String msg; @@ -121,6 +127,7 @@ public String getMessage() { return msg; } + @Override public Severity getSeverity() { return severity; } 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..c7f6590d57a0 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 @@ -62,6 +62,7 @@ private synchronized Set getExcludedArtifacts() { * * @see org.apache.maven.ArtifactFilterManager#getArtifactFilter() */ + @Override public ArtifactFilter getArtifactFilter() { Set excludes = new LinkedHashSet<>(getExcludedArtifacts()); @@ -77,14 +78,17 @@ public ArtifactFilter getArtifactFilter() { * * @see org.apache.maven.ArtifactFilterManager#getCoreArtifactFilter() */ + @Override public ArtifactFilter getCoreArtifactFilter() { return new ExclusionSetFilter(getCoreArtifactExcludes()); } + @Override public void excludeArtifact(String artifactId) { getExcludedArtifacts().add(artifactId); } + @Override public Set getCoreArtifactExcludes() { Set excludes = new LinkedHashSet<>(coreArtifacts); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java index ce24588292b1..08d80f5f4e3f 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java @@ -64,11 +64,13 @@ public DefaultProjectDependenciesResolver( this.resolutionErrorHandler = resolutionErrorHandler; } + @Override public Set resolve(MavenProject project, Collection scopesToResolve, MavenSession session) throws ArtifactResolutionException, ArtifactNotFoundException { return resolve(Collections.singleton(project), scopesToResolve, session); } + @Override public Set resolve( MavenProject project, Collection scopesToCollect, @@ -80,12 +82,14 @@ public Set resolve( mavenProjects, scopesToCollect, scopesToResolve, session, getIgnorableArtifacts(mavenProjects)); } + @Override public Set resolve( Collection projects, Collection scopesToResolve, MavenSession session) throws ArtifactResolutionException, ArtifactNotFoundException { return resolveImpl(projects, null, scopesToResolve, session, getIgnorableArtifacts(projects)); } + @Override public Set resolve( MavenProject project, Collection scopesToCollect, diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java index 3a6a2bdf5014..a755cacada57 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java @@ -83,6 +83,7 @@ public static ArtifactStatus valueOf(String status) { return retVal != null ? retVal : NONE; } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -96,14 +97,17 @@ public boolean equals(Object o) { return rank == that.rank; } + @Override public int hashCode() { return rank; } + @Override public String toString() { return key; } + @Override public int compareTo(ArtifactStatus s) { return rank - s.rank; } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java index e634a254c90d..b1443490482c 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java @@ -67,6 +67,7 @@ public class DefaultArtifactDeployer extends AbstractLogEnabled implements Artif * correctly. */ @Deprecated + @Override public void deploy( String basedir, String finalName, @@ -79,6 +80,7 @@ public void deploy( deploy(source, artifact, deploymentRepository, localRepository); } + @Override public void deploy( File source, Artifact artifact, ArtifactRepository deploymentRepository, ArtifactRepository localRepository) throws ArtifactDeploymentException { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java index eda4d2f57fca..a343a9a7b891 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java @@ -59,6 +59,7 @@ public class DefaultArtifactInstaller extends AbstractLogEnabled implements Arti /** @deprecated we want to use the artifact method only, and ensure artifact.file is set correctly. */ @Deprecated + @Override public void install(String basedir, String finalName, Artifact artifact, ArtifactRepository localRepository) throws ArtifactInstallationException { String extension = artifact.getArtifactHandler().getExtension(); @@ -67,6 +68,7 @@ public void install(String basedir, String finalName, Artifact artifact, Artifac install(source, artifact, localRepository); } + @Override public void install(File source, Artifact artifact, ArtifactRepository localRepository) throws ArtifactInstallationException { RepositorySystemSession session = diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java index ee2ff7240c7f..28b912868dec 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java @@ -68,6 +68,7 @@ public class DefaultWagonManager extends org.apache.maven.repository.legacy.Defa @Inject private ArtifactRepositoryFactory artifactRepositoryFactory; + @Override public AuthenticationInfo getAuthenticationInfo(String id) { MavenSession session = legacySupport.getSession(); @@ -101,6 +102,7 @@ public AuthenticationInfo getAuthenticationInfo(String id) { return new AuthenticationInfo(); } + @Override public ProxyInfo getProxy(String protocol) { MavenSession session = legacySupport.getSession(); @@ -135,17 +137,20 @@ public ProxyInfo getProxy(String protocol) { return null; } + @Override public void getArtifact(Artifact artifact, ArtifactRepository repository) throws TransferFailedException, ResourceDoesNotExistException { getArtifact(artifact, repository, null, false); } + @Override public void getArtifact(Artifact artifact, List remoteRepositories) throws TransferFailedException, ResourceDoesNotExistException { getArtifact(artifact, remoteRepositories, null, false); } @Deprecated + @Override public ArtifactRepository getMirrorRepository(ArtifactRepository repository) { Mirror mirror = mirrorSelector.getMirror( diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java index 771e4962bd50..f916588ea347 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java @@ -32,8 +32,10 @@ @Deprecated public interface ArtifactMetadataSource extends org.apache.maven.repository.legacy.metadata.ArtifactMetadataSource { + @Override ResolutionGroup retrieve(MetadataResolutionRequest request) throws ArtifactMetadataRetrievalException; + @Override ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories) throws ArtifactMetadataRetrievalException; @@ -41,10 +43,12 @@ ResolutionGroup retrieve( List retrieveAvailableVersions(MetadataResolutionRequest request) throws ArtifactMetadataRetrievalException; + @Override List retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories) throws ArtifactMetadataRetrievalException; + @Override List retrieveAvailableVersionsFromDeploymentRepository( Artifact artifact, ArtifactRepository localRepository, ArtifactRepository remoteRepository) throws ArtifactMetadataRetrievalException; diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java index 15668909e6d6..c59cd2b5c6fe 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java @@ -113,54 +113,67 @@ public DefaultArtifactRepository( this.releases = releases; } + @Override public String pathOf(Artifact artifact) { return layout.pathOf(artifact); } + @Override public String pathOfRemoteRepositoryMetadata(ArtifactMetadata artifactMetadata) { return layout.pathOfRemoteRepositoryMetadata(artifactMetadata); } + @Override public String pathOfLocalRepositoryMetadata(ArtifactMetadata metadata, ArtifactRepository repository) { return layout.pathOfLocalRepositoryMetadata(metadata, repository); } + @Override public void setLayout(ArtifactRepositoryLayout layout) { this.layout = layout; } + @Override public ArtifactRepositoryLayout getLayout() { return layout; } + @Override public void setSnapshotUpdatePolicy(ArtifactRepositoryPolicy snapshots) { this.snapshots = snapshots; } + @Override public ArtifactRepositoryPolicy getSnapshots() { return snapshots; } + @Override public void setReleaseUpdatePolicy(ArtifactRepositoryPolicy releases) { this.releases = releases; } + @Override public ArtifactRepositoryPolicy getReleases() { return releases; } + @Override public String getKey() { return getId(); } + @Override public boolean isBlacklisted() { return blacklisted; } + @Override public void setBlacklisted(boolean blacklisted) { this.blacklisted = blacklisted; } + @Override public String toString() { StringBuilder sb = new StringBuilder(256); @@ -181,6 +194,7 @@ public String toString() { return sb.toString(); } + @Override public Artifact find(Artifact artifact) { File artifactFile = new File(getBasedir(), pathOf(artifact)); @@ -195,38 +209,47 @@ public Artifact find(Artifact artifact) { return artifact; } + @Override public List findVersions(Artifact artifact) { return Collections.emptyList(); } + @Override public boolean isProjectAware() { return false; } + @Override public Authentication getAuthentication() { return authentication; } + @Override public void setAuthentication(Authentication authentication) { this.authentication = authentication; } + @Override public Proxy getProxy() { return proxy; } + @Override public void setProxy(Proxy proxy) { this.proxy = proxy; } + @Override public boolean isUniqueVersion() { return true; } + @Override public List getMirroredRepositories() { return mirroredRepositories; } + @Override public void setMirroredRepositories(List mirroredRepositories) { if (mirroredRepositories != null) { this.mirroredRepositories = Collections.unmodifiableList(mirroredRepositories); @@ -235,10 +258,12 @@ public void setMirroredRepositories(List mirroredRepositorie } } + @Override public boolean isBlocked() { return blocked; } + @Override public void setBlocked(boolean blocked) { this.blocked = blocked; } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java index 8ddb073dfe2a..ce348b87c966 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java @@ -49,21 +49,25 @@ public class DefaultArtifactRepositoryFactory implements ArtifactRepositoryFacto @Inject private PlexusContainer container; + @Override public ArtifactRepositoryLayout getLayout(String layoutId) throws UnknownRepositoryLayoutException { return factory.getLayout(layoutId); } + @Override public ArtifactRepository createDeploymentArtifactRepository( String id, String url, String layoutId, boolean uniqueVersion) throws UnknownRepositoryLayoutException { return injectSession(factory.createDeploymentArtifactRepository(id, url, layoutId, uniqueVersion), false); } + @Override public ArtifactRepository createDeploymentArtifactRepository( String id, String url, ArtifactRepositoryLayout repositoryLayout, boolean uniqueVersion) { return injectSession( factory.createDeploymentArtifactRepository(id, url, repositoryLayout, uniqueVersion), false); } + @Override public ArtifactRepository createArtifactRepository( String id, String url, @@ -74,6 +78,7 @@ public ArtifactRepository createArtifactRepository( return injectSession(factory.createArtifactRepository(id, url, layoutId, snapshots, releases), true); } + @Override public ArtifactRepository createArtifactRepository( String id, String url, @@ -83,10 +88,12 @@ public ArtifactRepository createArtifactRepository( return injectSession(factory.createArtifactRepository(id, url, repositoryLayout, snapshots, releases), true); } + @Override public void setGlobalUpdatePolicy(String updatePolicy) { factory.setGlobalUpdatePolicy(updatePolicy); } + @Override public void setGlobalChecksumPolicy(String checksumPolicy) { factory.setGlobalChecksumPolicy(checksumPolicy); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java index 5386d44c1055..0d36d42f1f8c 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java @@ -105,10 +105,12 @@ private LegacyLocalRepositoryManager(ArtifactRepository delegate) { realLocalRepo = (layout instanceof DefaultRepositoryLayout) && "local".equals(delegate.getId()); } + @Override public LocalRepository getRepository() { return repo; } + @Override public String getPathForLocalArtifact(Artifact artifact) { if (realLocalRepo) { return delegate.pathOf(RepositoryUtils.toArtifact(artifact.setVersion(artifact.getBaseVersion()))); @@ -116,19 +118,23 @@ public String getPathForLocalArtifact(Artifact artifact) { return delegate.pathOf(RepositoryUtils.toArtifact(artifact)); } + @Override public String getPathForRemoteArtifact(Artifact artifact, RemoteRepository repository, String context) { return delegate.pathOf(RepositoryUtils.toArtifact(artifact)); } + @Override public String getPathForLocalMetadata(Metadata metadata) { return delegate.pathOfLocalRepositoryMetadata(new ArtifactMetadataAdapter(metadata), delegate); } + @Override public String getPathForRemoteMetadata(Metadata metadata, RemoteRepository repository, String context) { return delegate.pathOfLocalRepositoryMetadata( new ArtifactMetadataAdapter(metadata), new ArtifactRepositoryAdapter(repository)); } + @Override public LocalArtifactResult find(RepositorySystemSession session, LocalArtifactRequest request) { String path = getPathForLocalArtifact(request.getArtifact()); File file = new File(getRepository().getBasedir(), path); @@ -142,6 +148,7 @@ public LocalArtifactResult find(RepositorySystemSession session, LocalArtifactRe return result; } + @Override public LocalMetadataResult find(RepositorySystemSession session, LocalMetadataRequest request) { Metadata metadata = request.getMetadata(); @@ -162,10 +169,12 @@ public LocalMetadataResult find(RepositorySystemSession session, LocalMetadataRe return result; } + @Override public void add(RepositorySystemSession session, LocalArtifactRegistration request) { // noop } + @Override public void add(RepositorySystemSession session, LocalMetadataRegistration request) { // noop } @@ -178,22 +187,27 @@ static class ArtifactMetadataAdapter implements ArtifactMetadata { this.metadata = metadata; } + @Override public boolean storedInArtifactVersionDirectory() { return !metadata.getVersion().isEmpty(); } + @Override public boolean storedInGroupDirectory() { return metadata.getArtifactId().isEmpty(); } + @Override public String getGroupId() { return nullify(metadata.getGroupId()); } + @Override public String getArtifactId() { return nullify(metadata.getArtifactId()); } + @Override public String getBaseVersion() { return nullify(metadata.getVersion()); } @@ -202,14 +216,17 @@ private String nullify(String str) { return (str == null || str.isEmpty()) ? null : str; } + @Override public Object getKey() { return metadata.toString(); } + @Override public String getRemoteFilename() { return metadata.getType(); } + @Override public String getLocalFilename(ArtifactRepository repository) { return insertRepositoryKey(getRemoteFilename(), repository.getKey()); } @@ -225,19 +242,23 @@ private String insertRepositoryKey(String filename, String repositoryKey) { return result; } + @Override public void merge(org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata) { // not used } + @Override public void merge(ArtifactMetadata metadata) { // not used } + @Override public void storeInLocalRepository(ArtifactRepository localRepository, ArtifactRepository remoteRepository) throws RepositoryMetadataStoreException { // not used } + @Override public String extendedToString() { return metadata.toString(); } @@ -251,104 +272,134 @@ static class ArtifactRepositoryAdapter implements ArtifactRepository { this.repository = repository; } + @Override public String pathOf(org.apache.maven.artifact.Artifact artifact) { return null; } + @Override public String pathOfRemoteRepositoryMetadata(ArtifactMetadata artifactMetadata) { return null; } + @Override public String pathOfLocalRepositoryMetadata(ArtifactMetadata metadata, ArtifactRepository repository) { return null; } + @Override public String getUrl() { return repository.getUrl(); } + @Override public void setUrl(String url) {} + @Override public String getBasedir() { return null; } + @Override public String getProtocol() { return repository.getProtocol(); } + @Override public String getId() { return repository.getId(); } + @Override public void setId(String id) {} + @Override public ArtifactRepositoryPolicy getSnapshots() { return null; } + @Override public void setSnapshotUpdatePolicy(ArtifactRepositoryPolicy policy) {} + @Override public ArtifactRepositoryPolicy getReleases() { return null; } + @Override public void setReleaseUpdatePolicy(ArtifactRepositoryPolicy policy) {} + @Override public ArtifactRepositoryLayout getLayout() { return null; } + @Override public void setLayout(ArtifactRepositoryLayout layout) {} + @Override public String getKey() { return getId(); } + @Override public boolean isUniqueVersion() { return true; } + @Override public boolean isBlacklisted() { return false; } + @Override public void setBlacklisted(boolean blackListed) {} + @Override public org.apache.maven.artifact.Artifact find(org.apache.maven.artifact.Artifact artifact) { return null; } + @Override public List findVersions(org.apache.maven.artifact.Artifact artifact) { return Collections.emptyList(); } + @Override public boolean isProjectAware() { return false; } + @Override public void setAuthentication(Authentication authentication) {} + @Override public Authentication getAuthentication() { return null; } + @Override public void setProxy(Proxy proxy) {} + @Override public Proxy getProxy() { return null; } + @Override public List getMirroredRepositories() { return Collections.emptyList(); } + @Override public void setMirroredRepositories(List mirroredRepositories) {} + @Override public boolean isBlocked() { return false; } + @Override public void setBlocked(boolean blocked) {} } } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java index 509624b4fe33..465dd45cac2d 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java @@ -38,10 +38,12 @@ public class FlatRepositoryLayout implements ArtifactRepositoryLayout { private static final char GROUP_SEPARATOR = '.'; + @Override public String getId() { return "flat"; } + @Override public String pathOf(Artifact artifact) { ArtifactHandler artifactHandler = artifact.getArtifactHandler(); @@ -61,6 +63,7 @@ public String pathOf(Artifact artifact) { return path.toString(); } + @Override public String pathOfLocalRepositoryMetadata(ArtifactMetadata metadata, ArtifactRepository repository) { return pathOfRepositoryMetadata(metadata.getLocalFilename(repository)); } @@ -73,6 +76,7 @@ private String pathOfRepositoryMetadata(String filename) { return path.toString(); } + @Override public String pathOfRemoteRepositoryMetadata(ArtifactMetadata metadata) { return pathOfRepositoryMetadata(metadata.getRemoteFilename()); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java index 0d278f7cb46d..c9c7d83c563e 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java @@ -47,14 +47,17 @@ protected AbstractRepositoryMetadata(Metadata metadata) { this.metadata = metadata; } + @Override public String getRemoteFilename() { return "maven-metadata.xml"; } + @Override public String getLocalFilename(ArtifactRepository repository) { return "maven-metadata-" + repository.getKey() + ".xml"; } + @Override public void storeInLocalRepository(ArtifactRepository localRepository, ArtifactRepository remoteRepository) throws RepositoryMetadataStoreException { try { @@ -117,6 +120,7 @@ protected void updateRepositoryMetadata(ArtifactRepository localRepository, Arti } } + @Override public String toString() { return "repository metadata for: '" + getKey() + "'"; } @@ -136,14 +140,17 @@ protected static Versioning createVersioning(Snapshot snapshot) { return versioning; } + @Override public void setMetadata(Metadata metadata) { this.metadata = metadata; } + @Override public Metadata getMetadata() { return metadata; } + @Override public void merge(org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata) { // TODO not sure that it should assume this, maybe the calls to addMetadata should pre-merge, then artifact // replaces? @@ -151,6 +158,7 @@ public void merge(org.apache.maven.repository.legacy.metadata.ArtifactMetadata m this.metadata.merge(repoMetadata.getMetadata()); } + @Override public void merge(ArtifactMetadata metadata) { // TODO not sure that it should assume this, maybe the calls to addMetadata should pre-merge, then artifact // replaces? @@ -158,6 +166,7 @@ public void merge(ArtifactMetadata metadata) { this.metadata.merge(repoMetadata.getMetadata()); } + @Override public String extendedToString() { StringBuilder buffer = new StringBuilder(256); @@ -169,10 +178,12 @@ public String extendedToString() { return buffer.toString(); } + @Override public int getNature() { return RELEASE; } + @Override public ArtifactRepositoryPolicy getPolicy(ArtifactRepository repository) { int nature = getNature(); if ((nature & RepositoryMetadata.RELEASE_OR_SNAPSHOT) == RepositoryMetadata.RELEASE_OR_SNAPSHOT) { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java index 3038cc1eb629..036c201e711e 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java @@ -42,36 +42,44 @@ public ArtifactRepositoryMetadata(Artifact artifact, Versioning versioning) { this.artifact = artifact; } + @Override public boolean storedInGroupDirectory() { return false; } + @Override public boolean storedInArtifactVersionDirectory() { return false; } + @Override public String getGroupId() { return artifact.getGroupId(); } + @Override public String getArtifactId() { return artifact.getArtifactId(); } + @Override public String getBaseVersion() { // Don't want the artifact's version in here, as this is stored in the directory above that return null; } + @Override public Object getKey() { return "artifact " + artifact.getGroupId() + ":" + artifact.getArtifactId(); } + @Override public boolean isSnapshot() { // Don't consider the artifact's version in here, as this is stored in the directory above that return false; } + @Override public int getNature() { if (artifact.getVersion() != null) { return artifact.isSnapshot() ? SNAPSHOT : RELEASE; @@ -93,10 +101,12 @@ private boolean isSnapshot(ArtifactVersion version) { return version != null && ArtifactUtils.isSnapshot(version.getQualifier()); } + @Override public ArtifactRepository getRepository() { return null; } + @Override public void setRepository(ArtifactRepository remoteRepository) { /* * NOTE: Metadata at the g:a level contains a collection of available versions. After merging, we can't tell diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java index d711fc4ece95..a7d052455ad7 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java @@ -59,6 +59,7 @@ public class DefaultRepositoryMetadataManager extends AbstractLogEnabled impleme @Inject private UpdateCheckManager updateCheckManager; + @Override public void resolve( RepositoryMetadata metadata, List remoteRepositories, @@ -70,6 +71,7 @@ public void resolve( resolve(metadata, request); } + @Override public void resolve(RepositoryMetadata metadata, RepositoryRequest request) throws RepositoryMetadataResolutionException { ArtifactRepository localRepo = request.getLocalRepository(); @@ -321,6 +323,7 @@ private void fixTimestamp(File metadataFile, Metadata metadata, Metadata referen } } + @Override public void resolveAlways( RepositoryMetadata metadata, ArtifactRepository localRepository, ArtifactRepository remoteRepository) throws RepositoryMetadataResolutionException { @@ -378,6 +381,7 @@ private File getArtifactMetadataFromDeploymentRepository( return file; } + @Override public void deploy( ArtifactMetadata metadata, ArtifactRepository localRepository, ArtifactRepository deploymentRepository) throws RepositoryMetadataDeploymentException { @@ -420,6 +424,7 @@ public void deploy( } } + @Override public void install(ArtifactMetadata metadata, ArtifactRepository localRepository) throws RepositoryMetadataInstallationException { try { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java index a7c4515c6b99..884649dc240c 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java @@ -36,22 +36,27 @@ public GroupRepositoryMetadata(String groupId) { this.groupId = groupId; } + @Override public boolean storedInGroupDirectory() { return true; } + @Override public boolean storedInArtifactVersionDirectory() { return false; } + @Override public String getGroupId() { return groupId; } + @Override public String getArtifactId() { return null; } + @Override public String getBaseVersion() { return null; } @@ -79,18 +84,22 @@ public void addPluginMapping(String goalPrefix, String artifactId, String name) } } + @Override public Object getKey() { return groupId; } + @Override public boolean isSnapshot() { return false; } + @Override public ArtifactRepository getRepository() { return null; } + @Override public void setRepository(ArtifactRepository remoteRepository) { // intentionally blank } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java index b9f677f3c71b..acdccd6e1469 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java @@ -48,6 +48,7 @@ public MetadataBridge(ArtifactMetadata metadata) { this.metadata = metadata; } + @Override public void merge(File current, File result) throws RepositoryException { try { if (current.exists()) { @@ -62,22 +63,27 @@ public void merge(File current, File result) throws RepositoryException { } } + @Override public boolean isMerged() { return merged; } + @Override public String getGroupId() { return emptify(metadata.getGroupId()); } + @Override public String getArtifactId() { return metadata.storedInGroupDirectory() ? "" : emptify(metadata.getArtifactId()); } + @Override public String getVersion() { return metadata.storedInArtifactVersionDirectory() ? emptify(metadata.getBaseVersion()) : ""; } + @Override public String getType() { return metadata.getRemoteFilename(); } @@ -86,10 +92,12 @@ private String emptify(String string) { return (string != null) ? string : ""; } + @Override public File getFile() { return null; } + @Override public MetadataBridge setFile(File file) { return this; } @@ -99,6 +107,7 @@ public Path getPath() { return null; } + @Override public Nature getNature() { if (metadata instanceof RepositoryMetadata repositoryMetadata) { return switch (repositoryMetadata.getNature()) { @@ -111,6 +120,7 @@ public Nature getNature() { } } + @Override public Map getProperties() { return Collections.emptyMap(); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java index ca1c1696f149..45914e8ba010 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java @@ -40,42 +40,52 @@ public SnapshotArtifactRepositoryMetadata(Artifact artifact, Snapshot snapshot) this.artifact = artifact; } + @Override public boolean storedInGroupDirectory() { return false; } + @Override public boolean storedInArtifactVersionDirectory() { return true; } + @Override public String getGroupId() { return artifact.getGroupId(); } + @Override public String getArtifactId() { return artifact.getArtifactId(); } + @Override public String getBaseVersion() { return artifact.getBaseVersion(); } + @Override public Object getKey() { return "snapshot " + artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getBaseVersion(); } + @Override public boolean isSnapshot() { return artifact.isSnapshot(); } + @Override public int getNature() { return isSnapshot() ? SNAPSHOT : RELEASE; } + @Override public ArtifactRepository getRepository() { return artifact.getRepository(); } + @Override public void setRepository(ArtifactRepository remoteRepository) { artifact.setRepository(remoteRepository); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java index 6bd018e7a526..ec86b40a06d7 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java @@ -107,20 +107,24 @@ public Set getArtifactDependencies() { return artifactDependencies; } + @Override public ArtifactRepository getLocalRepository() { return localRepository; } + @Override public ArtifactResolutionRequest setLocalRepository(ArtifactRepository localRepository) { this.localRepository = localRepository; return this; } + @Override public List getRemoteRepositories() { return remoteRepositories; } + @Override public ArtifactResolutionRequest setRemoteRepositories(List remoteRepositories) { this.remoteRepositories = remoteRepositories; @@ -206,6 +210,7 @@ public boolean isResolveTransitively() { return resolveTransitively; } + @Override public String toString() { StringBuilder sb = new StringBuilder() .append("REQUEST: ") @@ -224,20 +229,24 @@ public String toString() { return sb.toString(); } + @Override public boolean isOffline() { return offline; } + @Override public ArtifactResolutionRequest setOffline(boolean offline) { this.offline = offline; return this; } + @Override public boolean isForceUpdate() { return forceUpdate; } + @Override public ArtifactResolutionRequest setForceUpdate(boolean forceUpdate) { this.forceUpdate = forceUpdate; diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java index c530287001c3..be3c565fc0d1 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java @@ -308,6 +308,7 @@ private List initList(final List l) { return l; } + @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java index 70191b2cb6a1..708ee91b14d4 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java @@ -42,20 +42,25 @@ public DebugResolutionListener(Logger logger) { this.logger = logger; } + @Override public void testArtifact(Artifact node) {} + @Override public void startProcessChildren(Artifact artifact) { indent += " "; } + @Override public void endProcessChildren(Artifact artifact) { indent = indent.substring(2); } + @Override public void includeArtifact(Artifact artifact) { logger.debug(indent + artifact + " (selected for " + artifact.getScope() + ")"); } + @Override public void omitForNearer(Artifact omitted, Artifact kept) { String omittedVersion = omitted.getVersion(); String keptVersion = kept.getVersion(); @@ -65,10 +70,12 @@ public void omitForNearer(Artifact omitted, Artifact kept) { } } + @Override public void omitForCycle(Artifact omitted) { logger.debug(indent + omitted + " (removed - causes a cycle in the graph)"); } + @Override public void updateScopeCurrentPom(Artifact artifact, String ignoredScope) { logger.debug(indent + artifact + " (not setting artifactScope to: " + ignoredScope + "; local artifactScope " + artifact.getScope() + " wins)"); @@ -82,15 +89,18 @@ public void updateScopeCurrentPom(Artifact artifact, String ignoredScope) { } } + @Override public void updateScope(Artifact artifact, String scope) { logger.debug(indent + artifact + " (setting artifactScope to: " + scope + ")"); } + @Override public void selectVersionFromRange(Artifact artifact) { logger.debug(indent + artifact + " (setting version to: " + artifact.getVersion() + " from range: " + artifact.getVersionRange() + ")"); } + @Override public void restrictRange(Artifact artifact, Artifact replacement, VersionRange newRange) { logger.debug(indent + artifact + " (range restricted from: " + artifact.getVersionRange() + " and: " + replacement.getVersionRange() + " to: " + newRange + " )"); @@ -102,6 +112,7 @@ public void restrictRange(Artifact artifact, Artifact replacement, VersionRange * (and more information) is needed to be able to determine when and if the version and/or artifactScope changes. * See the two added methods, manageArtifactVersion and manageArtifactScope. */ + @Override public void manageArtifact(Artifact artifact, Artifact replacement) { String msg = indent + artifact; msg += " ("; @@ -115,6 +126,7 @@ public void manageArtifact(Artifact artifact, Artifact replacement) { logger.debug(msg); } + @Override public void manageArtifactVersion(Artifact artifact, Artifact replacement) { // only show msg if a change is actually taking place if (!replacement.getVersion().equals(artifact.getVersion())) { @@ -123,6 +135,7 @@ public void manageArtifactVersion(Artifact artifact, Artifact replacement) { } } + @Override public void manageArtifactScope(Artifact artifact, Artifact replacement) { // only show msg if a change is actually taking place if (!replacement.getScope().equals(artifact.getScope())) { @@ -131,6 +144,7 @@ public void manageArtifactScope(Artifact artifact, Artifact replacement) { } } + @Override public void manageArtifactSystemPath(Artifact artifact, Artifact replacement) { // only show msg if a change is actually taking place if (!replacement.getScope().equals(artifact.getScope())) { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java index d802d46c50b1..68ad69a6d2cd 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java @@ -128,6 +128,7 @@ private void injectSession2(ArtifactResolutionRequest request, MavenSession sess } } + @Override public void resolve( Artifact artifact, List remoteRepositories, @@ -137,6 +138,7 @@ public void resolve( resolve(artifact, remoteRepositories, getSession(localRepository)); } + @Override public void resolveAlways( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository) throws ArtifactResolutionException, ArtifactNotFoundException { @@ -217,6 +219,7 @@ private void resolve( } } + @Override public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, @@ -235,6 +238,7 @@ public ArtifactResolutionResult resolveTransitively( filter); } + @Override public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, @@ -247,6 +251,7 @@ public ArtifactResolutionResult resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, remoteRepositories, source, null); } + @Override public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, @@ -267,6 +272,7 @@ public ArtifactResolutionResult resolveTransitively( null); } + @Override public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, @@ -277,6 +283,7 @@ public ArtifactResolutionResult resolveTransitively( return resolveTransitively(artifacts, originatingArtifact, localRepository, remoteRepositories, source, null); } + @Override public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, @@ -296,6 +303,7 @@ public ArtifactResolutionResult resolveTransitively( listeners); } + @Override @SuppressWarnings("checkstyle:parameternumber") public ArtifactResolutionResult resolveTransitively( Set artifacts, @@ -365,6 +373,7 @@ public ArtifactResolutionResult resolveWithExceptions(ArtifactResolutionRequest // // ------------------------------------------------------------------------ + @Override @SuppressWarnings("checkstyle:methodlength") public ArtifactResolutionResult resolve(ArtifactResolutionRequest request) { Artifact rootArtifact = request.getArtifact(); @@ -523,6 +532,7 @@ public ArtifactResolutionResult resolve(ArtifactResolutionRequest request) { return result; } + @Override public void resolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository) throws ArtifactResolutionException, ArtifactNotFoundException { @@ -540,6 +550,7 @@ static final class DaemonThreadCreator implements ThreadFactory { static final AtomicInteger THREAD_NUMBER = new AtomicInteger(1); + @Override public Thread newThread(Runnable r) { Thread newThread = new Thread(GROUP, r, "resolver-" + THREAD_NUMBER.getAndIncrement()); newThread.setDaemon(true); @@ -577,6 +588,7 @@ private class ResolveTask implements Runnable { this.result = result; } + @Override public void run() { ClassLoader old = Thread.currentThread().getContextClassLoader(); try { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java index d2311e737f86..768edbcec516 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java @@ -32,6 +32,7 @@ @Deprecated public class DefaultResolutionErrorHandler implements ResolutionErrorHandler { + @Override public void throwErrors(ArtifactResolutionRequest request, ArtifactResolutionResult result) throws ArtifactResolutionException { // Metadata cannot be found diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java index ddfd5686a6fe..8c7fd7b670bb 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java @@ -34,25 +34,36 @@ public WarningResolutionListener(Logger logger) { this.logger = logger; } + @Override public void testArtifact(Artifact node) {} + @Override public void startProcessChildren(Artifact artifact) {} + @Override public void endProcessChildren(Artifact artifact) {} + @Override public void includeArtifact(Artifact artifact) {} + @Override public void omitForNearer(Artifact omitted, Artifact kept) {} + @Override public void omitForCycle(Artifact omitted) {} + @Override public void updateScopeCurrentPom(Artifact artifact, String scope) {} + @Override public void updateScope(Artifact artifact, String scope) {} + @Override public void manageArtifact(Artifact artifact, Artifact replacement) {} + @Override public void selectVersionFromRange(Artifact artifact) {} + @Override public void restrictRange(Artifact artifact, Artifact replacement, VersionRange newRange) {} } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java index cadc5a9c7950..d8cadea36233 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java @@ -31,6 +31,7 @@ public InversionArtifactFilter(ArtifactFilter toInvert) { this.toInvert = toInvert; } + @Override public boolean include(Artifact artifact) { return !toInvert.include(artifact); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java index 4d66946ac8c9..0f7c2215a4c1 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java @@ -41,6 +41,7 @@ public OrArtifactFilter(Collection filters) { this.filters = new LinkedHashSet<>(filters); } + @Override public boolean include(Artifact artifact) { for (ArtifactFilter filter : filters) { if (filter.include(artifact)) { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java index b5bbea55c826..bea3ab6b468d 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java @@ -29,6 +29,7 @@ public TypeArtifactFilter(String type) { this.type = type; } + @Override public boolean include(Artifact artifact) { return type.equals(artifact.getType()); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java index 9e6b78eebd58..7f02150402a0 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java @@ -36,6 +36,7 @@ public ManagedVersionMap(Map map) { } } + @Override public String toString() { StringBuilder buffer = new StringBuilder("ManagedVersionMap (" + size() + " entries)\n"); Iterator iter = keySet().iterator(); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java b/compat/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java index 40e3942e3f20..3a1263f541dd 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java @@ -41,10 +41,12 @@ public class DefaultRuntimeInformation implements RuntimeInformation, Initializa private ArtifactVersion applicationVersion; + @Override public ArtifactVersion getApplicationVersion() { return applicationVersion; } + @Override public void initialize() throws InitializationException { String mavenVersion = rtInfo.getMavenVersion(); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java b/compat/maven-compat/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java index 7a60717df68e..fe4891cd2ed5 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java @@ -87,12 +87,14 @@ public DefaultPluginManager( this.legacySupport = legacySupport; } + @Override public void executeMojo(MavenProject project, MojoExecution execution, MavenSession session) throws MojoExecutionException, ArtifactResolutionException, MojoFailureException, ArtifactNotFoundException, InvalidDependencyVersionException, PluginManagerException, PluginConfigurationException { throw new UnsupportedOperationException(); } + @Override public Object getPluginComponent(Plugin plugin, String role, String roleHint) throws PluginManagerException, ComponentLookupException { MavenSession session = legacySupport.getSession(); @@ -117,6 +119,7 @@ public Object getPluginComponent(Plugin plugin, String role, String roleHint) } } + @Override public Map getPluginComponents(Plugin plugin, String role) throws ComponentLookupException, PluginManagerException { MavenSession session = legacySupport.getSession(); @@ -141,6 +144,7 @@ public Map getPluginComponents(Plugin plugin, String role) } } + @Override public Plugin getPluginDefinitionForPrefix(String prefix, MavenSession session, MavenProject project) { PluginPrefixRequest request = new DefaultPluginPrefixRequest(prefix, session); request.setPom(project.getModel()); @@ -158,6 +162,7 @@ public Plugin getPluginDefinitionForPrefix(String prefix, MavenSession session, } } + @Override public PluginDescriptor getPluginDescriptorForPrefix(String prefix) { MavenSession session = legacySupport.getSession(); @@ -176,6 +181,7 @@ public PluginDescriptor getPluginDescriptorForPrefix(String prefix) { } } + @Override public PluginDescriptor loadPluginDescriptor(Plugin plugin, MavenProject project, MavenSession session) throws ArtifactResolutionException, PluginVersionResolutionException, ArtifactNotFoundException, InvalidVersionSpecificationException, InvalidPluginException, PluginManagerException, @@ -183,6 +189,7 @@ public PluginDescriptor loadPluginDescriptor(Plugin plugin, MavenProject project return verifyPlugin(plugin, project, session.getSettings(), session.getLocalRepository()); } + @Override public PluginDescriptor loadPluginFully(Plugin plugin, MavenProject project, MavenSession session) throws ArtifactResolutionException, PluginVersionResolutionException, ArtifactNotFoundException, InvalidVersionSpecificationException, InvalidPluginException, PluginManagerException, @@ -198,6 +205,7 @@ public PluginDescriptor loadPluginFully(Plugin plugin, MavenProject project, Mav return pluginDescriptor; } + @Override public PluginDescriptor verifyPlugin( Plugin plugin, MavenProject project, Settings settings, ArtifactRepository localRepository) throws ArtifactResolutionException, PluginVersionResolutionException, ArtifactNotFoundException, diff --git a/compat/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java index 6727261059aa..6960d8dded11 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java @@ -83,10 +83,12 @@ public DefaultProfileManager(PlexusContainer container, Properties props) { this.requestProperties = props; } + @Override public Properties getRequestProperties() { return requestProperties; } + @Override public Map getProfilesById() { return profilesById; } @@ -94,6 +96,7 @@ public Map getProfilesById() { /* (non-Javadoc) * @see org.apache.maven.profiles.ProfileManager#addProfile(org.apache.maven.model.Profile) */ + @Override public void addProfile(Profile profile) { String profileId = profile.getId(); @@ -115,6 +118,7 @@ public void addProfile(Profile profile) { /* (non-Javadoc) * @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.lang.String) */ + @Override public void explicitlyActivate(String profileId) { if (!activatedIds.contains(profileId)) { logger.debug("Profile with id: '" + profileId + "' has been explicitly activated."); @@ -126,6 +130,7 @@ public void explicitlyActivate(String profileId) { /* (non-Javadoc) * @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.util.List) */ + @Override public void explicitlyActivate(List profileIds) { for (String profileId1 : profileIds) { explicitlyActivate(profileId1); @@ -135,6 +140,7 @@ public void explicitlyActivate(List profileIds) { /* (non-Javadoc) * @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.lang.String) */ + @Override public void explicitlyDeactivate(String profileId) { if (!deactivatedIds.contains(profileId)) { logger.debug("Profile with id: '" + profileId + "' has been explicitly deactivated."); @@ -146,6 +152,7 @@ public void explicitlyDeactivate(String profileId) { /* (non-Javadoc) * @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.util.List) */ + @Override public void explicitlyDeactivate(List profileIds) { for (String profileId1 : profileIds) { explicitlyDeactivate(profileId1); @@ -155,6 +162,7 @@ public void explicitlyDeactivate(List profileIds) { /* (non-Javadoc) * @see org.apache.maven.profiles.ProfileManager#getActiveProfiles() */ + @Override public List getActiveProfiles() throws ProfileActivationException { DefaultProfileActivationContext context = new DefaultProfileActivationContext(); context.setActiveProfileIds(activatedIds); @@ -180,6 +188,7 @@ public List getActiveProfiles() throws ProfileActivationException { /* (non-Javadoc) * @see org.apache.maven.profiles.ProfileManager#addProfiles(java.util.List) */ + @Override public void addProfiles(List profiles) { for (Profile profile1 : profiles) { addProfile(profile1); @@ -192,14 +201,17 @@ public void activateAsDefault(String profileId) { } } + @Override public List getExplicitlyActivatedIds() { return activatedIds; } + @Override public List getExplicitlyDeactivatedIds() { return deactivatedIds; } + @Override public List getIdsActivatedByDefault() { return defaultIds; } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java index ee023ff77c04..5afd5788c606 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java @@ -25,6 +25,7 @@ */ @Deprecated public abstract class DetectedProfileActivator implements ProfileActivator { + @Override public boolean canDetermineActivation(Profile profile) { return canDetectActivation(profile); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java index 081ff5fdfb81..8a1b82a8e99c 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java @@ -38,10 +38,12 @@ public class FileProfileActivator extends DetectedProfileActivator implements LogEnabled { private Logger logger; + @Override protected boolean canDetectActivation(Profile profile) { return profile.getActivation() != null && profile.getActivation().getFile() != null; } + @Override public boolean isActive(Profile profile) { Activation activation = profile.getActivation(); @@ -87,6 +89,7 @@ public boolean isActive(Profile profile) { return false; } + @Override public void enableLogging(Logger logger) { this.logger = logger; } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java index 4e18159c7587..223a33c00d8c 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java @@ -31,6 +31,7 @@ public class JdkPrefixProfileActivator extends DetectedProfileActivator { private static final String JDK_VERSION = System.getProperty("java.version"); + @Override public boolean isActive(Profile profile) throws ProfileActivationException { Activation activation = profile.getActivation(); @@ -74,6 +75,7 @@ protected String getJdkVersion() { return JDK_VERSION; } + @Override protected boolean canDetectActivation(Profile profile) { return profile.getActivation() != null && profile.getActivation().getJdk() != null diff --git a/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java index 0a33cdc2f8a9..0c7944b53992 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java @@ -29,11 +29,13 @@ @Deprecated public class OperatingSystemProfileActivator implements ProfileActivator { + @Override public boolean canDetermineActivation(Profile profile) { Activation activation = profile.getActivation(); return activation != null && activation.getOs() != null; } + @Override public boolean isActive(Profile profile) { Activation activation = profile.getActivation(); ActivationOS os = activation.getOs(); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java index 59d65d395a2f..32a29f8aedd9 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java @@ -34,14 +34,17 @@ public class SystemPropertyProfileActivator extends DetectedProfileActivator implements Contextualizable { private Properties properties; + @Override public void contextualize(Context context) throws ContextException { properties = (Properties) context.get("SystemProperties"); } + @Override protected boolean canDetectActivation(Profile profile) { return profile.getActivation() != null && profile.getActivation().getProperty() != null; } + @Override public boolean isActive(Profile profile) throws ProfileActivationException { Activation activation = profile.getActivation(); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index a484104d0559..300b0298c4a3 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -171,6 +171,7 @@ private ProjectBuildingException transformError(ProjectBuildingException e) { return e; } + @Override public MavenProject build(File pom, ProjectBuilderConfiguration configuration) throws ProjectBuildingException { ProjectBuildingRequest request = injectSession(toRequest(configuration)); @@ -182,6 +183,7 @@ public MavenProject build(File pom, ProjectBuilderConfiguration configuration) t } // This is used by the SITE plugin. + @Override public MavenProject build(File pom, ArtifactRepository localRepository, ProfileManager profileManager) throws ProjectBuildingException { ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration(); @@ -209,6 +211,7 @@ public MavenProject buildFromRepository( } } + @Override public MavenProject buildFromRepository( Artifact artifact, List remoteRepositories, @@ -221,6 +224,7 @@ public MavenProject buildFromRepository( return buildFromRepository(artifact, remoteRepositories, configuration, allowStubModel); } + @Override public MavenProject buildFromRepository( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository) throws ProjectBuildingException { @@ -231,6 +235,7 @@ public MavenProject buildFromRepository( * This is used for pom-less execution like running archetype:generate. I am taking out the profile handling and the * interpolation of the base directory until we spec this out properly. */ + @Override public MavenProject buildStandaloneSuperProject(ProjectBuilderConfiguration configuration) throws ProjectBuildingException { ProjectBuildingRequest request = injectSession(toRequest(configuration)); @@ -244,11 +249,13 @@ public MavenProject buildStandaloneSuperProject(ProjectBuilderConfiguration conf return project; } + @Override public MavenProject buildStandaloneSuperProject(ArtifactRepository localRepository) throws ProjectBuildingException { return buildStandaloneSuperProject(localRepository, null); } + @Override public MavenProject buildStandaloneSuperProject(ArtifactRepository localRepository, ProfileManager profileManager) throws ProjectBuildingException { ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration(); @@ -258,6 +265,7 @@ public MavenProject buildStandaloneSuperProject(ArtifactRepository localReposito return buildStandaloneSuperProject(configuration); } + @Override public MavenProject buildWithDependencies( File pom, ArtifactRepository localRepository, @@ -279,6 +287,7 @@ public MavenProject buildWithDependencies( } } + @Override public MavenProject buildWithDependencies( File pom, ArtifactRepository localRepository, ProfileManager profileManager) throws ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java b/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java index e19fdec547a0..3fc47cd72074 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java @@ -42,29 +42,35 @@ public class DefaultProjectBuilderConfiguration implements ProjectBuilderConfigu public DefaultProjectBuilderConfiguration() {} + @Override public ProjectBuilderConfiguration setGlobalProfileManager(ProfileManager globalProfileManager) { this.globalProfileManager = globalProfileManager; return this; } + @Override public ProfileManager getGlobalProfileManager() { return globalProfileManager; } + @Override public ProjectBuilderConfiguration setLocalRepository(ArtifactRepository localRepository) { this.localRepository = localRepository; return this; } + @Override public ArtifactRepository getLocalRepository() { return localRepository; } + @Override public ProjectBuilderConfiguration setUserProperties(Properties userProperties) { this.userProperties = userProperties; return this; } + @Override public Properties getUserProperties() { if (userProperties == null) { userProperties = new Properties(); @@ -73,19 +79,23 @@ public Properties getUserProperties() { return userProperties; } + @Override public Properties getExecutionProperties() { return executionProperties; } + @Override public ProjectBuilderConfiguration setExecutionProperties(Properties executionProperties) { this.executionProperties = executionProperties; return this; } + @Override public Date getBuildStartTime() { return buildStartTime; } + @Override public ProjectBuilderConfiguration setBuildStartTime(Date buildStartTime) { this.buildStartTime = buildStartTime; return this; diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java index c59595b80d10..19c5b64dc046 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java @@ -54,243 +54,291 @@ public ActiveProjectArtifact(MavenProject project, Artifact artifact) { } /** {@inheritDoc} */ + @Override public File getFile() { // we need to get the latest file for the project, not the artifact that was created at one point in time return project.getArtifact().getFile(); } /** {@inheritDoc} */ + @Override public String getGroupId() { return artifact.getGroupId(); } /** {@inheritDoc} */ + @Override public String getArtifactId() { return artifact.getArtifactId(); } /** {@inheritDoc} */ + @Override public String getVersion() { return artifact.getVersion(); } /** {@inheritDoc} */ + @Override public void setVersion(String version) { artifact.setVersion(version); } /** {@inheritDoc} */ + @Override public String getScope() { return artifact.getScope(); } /** {@inheritDoc} */ + @Override public String getType() { return artifact.getType(); } /** {@inheritDoc} */ + @Override public String getClassifier() { return artifact.getClassifier(); } /** {@inheritDoc} */ + @Override public boolean hasClassifier() { return artifact.hasClassifier(); } /** {@inheritDoc} */ + @Override public void setFile(File destination) { artifact.setFile(destination); project.getArtifact().setFile(destination); } /** {@inheritDoc} */ + @Override public String getBaseVersion() { return artifact.getBaseVersion(); } /** {@inheritDoc} */ + @Override public void setBaseVersion(String baseVersion) { artifact.setBaseVersion(baseVersion); } /** {@inheritDoc} */ + @Override public String getId() { return artifact.getId(); } /** {@inheritDoc} */ + @Override public String getDependencyConflictId() { return artifact.getDependencyConflictId(); } /** {@inheritDoc} */ + @Override public void addMetadata(ArtifactMetadata metadata) { artifact.addMetadata(metadata); } /** {@inheritDoc} */ + @Override public Collection getMetadataList() { return artifact.getMetadataList(); } /** {@inheritDoc} */ + @Override public void setRepository(ArtifactRepository remoteRepository) { artifact.setRepository(remoteRepository); } /** {@inheritDoc} */ + @Override public ArtifactRepository getRepository() { return artifact.getRepository(); } /** {@inheritDoc} */ + @Override public void updateVersion(String version, ArtifactRepository localRepository) { artifact.updateVersion(version, localRepository); } /** {@inheritDoc} */ + @Override public String getDownloadUrl() { return artifact.getDownloadUrl(); } /** {@inheritDoc} */ + @Override public void setDownloadUrl(String downloadUrl) { artifact.setDownloadUrl(downloadUrl); } /** {@inheritDoc} */ + @Override public ArtifactFilter getDependencyFilter() { return artifact.getDependencyFilter(); } /** {@inheritDoc} */ + @Override public void setDependencyFilter(ArtifactFilter artifactFilter) { artifact.setDependencyFilter(artifactFilter); } /** {@inheritDoc} */ + @Override public ArtifactHandler getArtifactHandler() { return artifact.getArtifactHandler(); } /** {@inheritDoc} */ + @Override public List getDependencyTrail() { return artifact.getDependencyTrail(); } /** {@inheritDoc} */ + @Override public void setDependencyTrail(List dependencyTrail) { artifact.setDependencyTrail(dependencyTrail); } /** {@inheritDoc} */ + @Override public void setScope(String scope) { artifact.setScope(scope); } /** {@inheritDoc} */ + @Override public VersionRange getVersionRange() { return artifact.getVersionRange(); } /** {@inheritDoc} */ + @Override public void setVersionRange(VersionRange newRange) { artifact.setVersionRange(newRange); } /** {@inheritDoc} */ + @Override public void selectVersion(String version) { artifact.selectVersion(version); } /** {@inheritDoc} */ + @Override public void setGroupId(String groupId) { artifact.setGroupId(groupId); } /** {@inheritDoc} */ + @Override public void setArtifactId(String artifactId) { artifact.setArtifactId(artifactId); } /** {@inheritDoc} */ + @Override public boolean isSnapshot() { return artifact.isSnapshot(); } /** {@inheritDoc} */ + @Override public int compareTo(Artifact a) { return artifact.compareTo(a); } /** {@inheritDoc} */ + @Override public void setResolved(boolean resolved) { artifact.setResolved(resolved); } /** {@inheritDoc} */ + @Override public boolean isResolved() { return artifact.isResolved(); } /** {@inheritDoc} */ + @Override public void setResolvedVersion(String version) { artifact.setResolvedVersion(version); } /** {@inheritDoc} */ + @Override public void setArtifactHandler(ArtifactHandler handler) { artifact.setArtifactHandler(handler); } /** {@inheritDoc} */ + @Override public String toString() { return "active project artifact[artifact: " + artifact + ", project: " + project + "]"; } /** {@inheritDoc} */ + @Override public boolean isRelease() { return artifact.isRelease(); } /** {@inheritDoc} */ + @Override public void setRelease(boolean release) { artifact.setRelease(release); } /** {@inheritDoc} */ + @Override public List getAvailableVersions() { return artifact.getAvailableVersions(); } /** {@inheritDoc} */ + @Override public void setAvailableVersions(List versions) { artifact.setAvailableVersions(versions); } /** {@inheritDoc} */ + @Override public boolean isOptional() { return artifact.isOptional(); } /** {@inheritDoc} */ + @Override public ArtifactVersion getSelectedVersion() throws OverConstrainedVersionException { return artifact.getSelectedVersion(); } /** {@inheritDoc} */ + @Override public boolean isSelectedVersionKnown() throws OverConstrainedVersionException { return artifact.isSelectedVersionKnown(); } /** {@inheritDoc} */ + @Override public void setOptional(boolean optional) { artifact.setOptional(optional); } /** {@inheritDoc} */ + @Override public int hashCode() { int result = 17; @@ -306,6 +354,7 @@ public int hashCode() { } /** {@inheritDoc} */ + @Override public boolean equals(Object o) { if (o == this) { return true; diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java index e19e1ed9409a..280a0e91d76e 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java @@ -262,6 +262,7 @@ public boolean isStale() { } } + @Override public ResolutionGroup get( Artifact artifact, boolean resolveManagedVersions, @@ -288,6 +289,7 @@ public ResolutionGroup get( return null; } + @Override public void put( Artifact artifact, boolean resolveManagedVersions, @@ -316,6 +318,7 @@ protected void put(CacheKey cacheKey, ResolutionGroup result) { cache.put(cacheKey, cacheRecord); } + @Override public void flush() { cache.clear(); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java index 3cdd8a2546e2..3c21e4216636 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java @@ -49,10 +49,12 @@ public File getFile() { return file; } + @Override public String getRemoteFilename() { return getFilename(); } + @Override public String getLocalFilename(ArtifactRepository repository) { return getFilename(); } @@ -61,6 +63,7 @@ private String getFilename() { return getArtifactId() + "-" + artifact.getVersion() + ".pom"; } + @Override public void storeInLocalRepository(ArtifactRepository localRepository, ArtifactRepository remoteRepository) throws RepositoryMetadataStoreException { File destination = new File( @@ -81,22 +84,27 @@ public void storeInLocalRepository(ArtifactRepository localRepository, ArtifactR } } + @Override public String toString() { return "project information for " + artifact.getArtifactId() + " " + artifact.getVersion(); } + @Override public boolean storedInArtifactVersionDirectory() { return true; } + @Override public String getBaseVersion() { return artifact.getBaseVersion(); } + @Override public Object getKey() { return "project " + artifact.getGroupId() + ":" + artifact.getArtifactId(); } + @Override public void merge(ArtifactMetadata metadata) { ProjectArtifactMetadata m = (ProjectArtifactMetadata) metadata; if (!m.file.equals(file)) { @@ -104,6 +112,7 @@ public void merge(ArtifactMetadata metadata) { } } + @Override public void merge(org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata) { this.merge((ArtifactMetadata) metadata); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java index 34d0b7ade37b..5fa63fc61099 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java @@ -100,6 +100,7 @@ protected AbstractStringBasedModelInterpolator(PathTranslator pathTranslator) { protected AbstractStringBasedModelInterpolator() {} + @Override public Model interpolate(Model model, Map context) throws ModelInterpolationException { return interpolate(model, context, true); } @@ -118,6 +119,7 @@ public Model interpolate(Model model, Map context) throws ModelInterp * @deprecated Use {@link ModelInterpolator#interpolate(Model, File, ProjectBuilderConfiguration, boolean)} instead. */ @Deprecated + @Override public Model interpolate(Model model, Map context, boolean strict) throws ModelInterpolationException { Properties props = new Properties(); props.putAll(context); @@ -125,6 +127,7 @@ public Model interpolate(Model model, Map context, boolean strict) th return interpolate(model, null, new DefaultProjectBuilderConfiguration().setExecutionProperties(props), true); } + @Override public Model interpolate(Model model, File projectDir, ProjectBuilderConfiguration config, boolean debugEnabled) throws ModelInterpolationException { StringWriter sWriter = new StringWriter(1024); @@ -164,6 +167,7 @@ public Model interpolate(Model model, File projectDir, ProjectBuilderConfigurati *
  • If the value is null, get it from the model properties.
    • * */ + @Override public String interpolate( String src, Model model, final File projectDir, ProjectBuilderConfiguration config, boolean debug) throws ModelInterpolationException { @@ -192,6 +196,7 @@ protected List createValueSources( ValueSource basedirValueSource = new PrefixedValueSourceWrapper( new AbstractValueSource(false) { + @Override public Object getValue(String expression) { if (projectDir != null && "basedir".equals(expression)) { return projectDir.getAbsolutePath(); @@ -204,6 +209,7 @@ public Object getValue(String expression) { ValueSource baseUriValueSource = new PrefixedValueSourceWrapper( new AbstractValueSource(false) { + @Override public Object getValue(String expression) { if (projectDir != null && "baseUri".equals(expression)) { return projectDir.getAbsoluteFile().toPath().toUri().toASCIIString(); @@ -226,6 +232,7 @@ public Object getValue(String expression) { valueSources.add(new MapBasedValueSource(config.getExecutionProperties())); valueSources.add(new AbstractValueSource(false) { + @Override public Object getValue(String expression) { return config.getExecutionProperties().getProperty("env." + expression); } @@ -321,6 +328,7 @@ protected void setRecursionInterceptor(RecursionInterceptor recursionInterceptor protected abstract Interpolator createInterpolator(); + @Override public void initialize() throws InitializationException { interpolator = createInterpolator(); recursionInterceptor = new PrefixAwareRecursionInterceptor(PROJECT_PREFIXES); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java index f2af8036aed5..263f04ee957c 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java @@ -41,6 +41,7 @@ public BuildTimestampValueSource(Date startTime, String format) { this.format = format; } + @Override public Object getValue(String expression) { if ("build.timestamp".equals(expression) || "maven.build.timestamp".equals(expression)) { if (formattedDate == null && startTime != null) { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java index c6651fbf7d91..255826d3ea87 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java @@ -47,6 +47,7 @@ public PathTranslatingPostProcessor( this.pathTranslator = pathTranslator; } + @Override public Object execute(String expression, Object value) { expression = ValueSourceUtils.trimPrefix(expression, expressionPrefixes, true); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java index f1dfe3f4adde..6449da7416ce 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java @@ -41,6 +41,7 @@ public RegexBasedModelInterpolator(PathTranslator pathTranslator) { public RegexBasedModelInterpolator(Properties envars) {} + @Override protected Interpolator createInterpolator() { return new RegexBasedInterpolator(true); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java index 9e70e0c49c16..c9d941a446e1 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java @@ -59,6 +59,7 @@ public StringSearchModelInterpolator(PathTranslator pathTranslator) { super(pathTranslator); } + @Override public Model interpolate(Model model, File projectDir, ProjectBuilderConfiguration config, boolean debugEnabled) throws ModelInterpolationException { interpolateObject(model, model, projectDir, config, debugEnabled); @@ -86,6 +87,7 @@ protected void interpolateObject( } } + @Override protected Interpolator createInterpolator() { StringSearchInterpolator interpolator = new StringSearchInterpolator(); interpolator.setCacheAnswers(true); @@ -120,6 +122,7 @@ private static final class InterpolateObjectAction implements PrivilegedAction mirrors) { String repoId = repository.getId(); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java index 306d61230b7f..30827c6a4d36 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java @@ -101,10 +101,12 @@ public List findVersions(Artifact artifact) { return Collections.unmodifiableList(new ArrayList<>(versions)); } + @Override public String pathOfLocalRepositoryMetadata(ArtifactMetadata metadata, ArtifactRepository repository) { return userLocalArtifactRepository.pathOfLocalRepositoryMetadata(metadata, repository); } + @Override public String getId() { return userLocalArtifactRepository.getId(); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java index 3577c316adbf..0a14d8bab948 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java @@ -28,6 +28,7 @@ public abstract class LocalArtifactRepository extends MavenArtifactRepository { public static final String IDE_WORKSPACE = "ide-workspace"; + @Override public abstract Artifact find(Artifact artifact); public abstract boolean hasLocalMetadata(); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java index 4c438ca1e746..75ae3047acae 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java @@ -133,6 +133,7 @@ public MetadataResolutionRequest setManagedVersionMap(Map managedVersionMap) { return this; } + @Override public String toString() { StringBuilder sb = new StringBuilder() .append("REQUEST: ") diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java index 1ef5827810c8..5e1347c73f7a 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java @@ -276,6 +276,7 @@ private List initList(final List l) { return l; } + @Override public String toString() { if (artifacts == null) { return ""; 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..f748a477d229 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 @@ -113,23 +113,28 @@ public class LegacyRepositorySystem implements RepositorySystem { @Inject private SettingsDecrypter settingsDecrypter; + @Override public Artifact createArtifact(String groupId, String artifactId, String version, String scope, String type) { return artifactFactory.createArtifact(groupId, artifactId, version, scope, type); } + @Override public Artifact createArtifact(String groupId, String artifactId, String version, String packaging) { return artifactFactory.createBuildArtifact(groupId, artifactId, version, packaging); } + @Override public Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String type, String classifier) { return artifactFactory.createArtifactWithClassifier(groupId, artifactId, version, type, classifier); } + @Override public Artifact createProjectArtifact(String groupId, String artifactId, String metaVersionId) { return artifactFactory.createProjectArtifact(groupId, artifactId, metaVersionId); } + @Override public Artifact createDependencyArtifact(Dependency d) { VersionRange versionRange; try { @@ -191,6 +196,7 @@ public Artifact createParentArtifact(String groupId, String artifactId, String v return artifactFactory.createParentArtifact(groupId, artifactId, version); } + @Override public Artifact createPluginArtifact(Plugin plugin) { String version = plugin.getVersion(); if (version == null || version.isEmpty()) { @@ -233,10 +239,12 @@ public ArtifactRepositoryPolicy buildArtifactRepositoryPolicy(RepositoryPolicy p return new ArtifactRepositoryPolicy(enabled, updatePolicy, checksumPolicy); } + @Override public ArtifactRepository createDefaultLocalRepository() throws InvalidRepositoryException { return createLocalRepository(RepositorySystem.defaultUserLocalRepository); } + @Override public ArtifactRepository createLocalRepository(File localRepository) throws InvalidRepositoryException { return createRepository( "file://" + localRepository.toURI().getRawPath(), @@ -248,6 +256,7 @@ public ArtifactRepository createLocalRepository(File localRepository) throws Inv ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE); } + @Override public ArtifactRepository createDefaultRemoteRepository() throws InvalidRepositoryException { return createRepository( RepositorySystem.DEFAULT_REMOTE_REPO_URL, @@ -293,6 +302,7 @@ private String canonicalFileUrl(String url) throws IOException { return url; } + @Override public ArtifactResolutionResult resolve(ArtifactResolutionRequest request) { /* * Probably is not worth it, but here I make sure I restore request @@ -331,6 +341,7 @@ public ArtifactResolutionResult resolve(ArtifactResolutionRequest request) { return artifactResolver.resolve(request); } + @Override public List getEffectiveRepositories(List repositories) { if (repositories == null) { return null; @@ -401,10 +412,12 @@ private ArtifactRepositoryPolicy getEffectivePolicy(Collection mirrors) { return mirrorSelector.getMirror(repository, mirrors); } + @Override public void injectMirror(List repositories, List mirrors) { if (repositories != null && mirrors != null) { for (ArtifactRepository repository : repositories) { @@ -432,6 +445,7 @@ private Mirror getMirror(RepositorySystemSession session, ArtifactRepository rep return null; } + @Override public void injectMirror(RepositorySystemSession session, List repositories) { if (repositories != null && session != null) { for (ArtifactRepository repository : repositories) { @@ -463,6 +477,7 @@ private void injectMirror(ArtifactRepository repository, Mirror mirror) { } } + @Override public void injectAuthentication(List repositories, List servers) { if (repositories != null) { Map serversById = new HashMap<>(); @@ -524,6 +539,7 @@ private Authentication getAuthentication(RepositorySystemSession session, Artifa return null; } + @Override public void injectAuthentication(RepositorySystemSession session, List repositories) { if (repositories != null && session != null) { for (ArtifactRepository repository : repositories) { @@ -559,6 +575,7 @@ private org.apache.maven.settings.Proxy getProxy( return null; } + @Override public void injectProxy(List repositories, List proxies) { if (repositories != null) { for (ArtifactRepository repository : repositories) { @@ -620,6 +637,7 @@ private Proxy getProxy(RepositorySystemSession session, ArtifactRepository repos return null; } + @Override public void injectProxy(RepositorySystemSession session, List repositories) { if (repositories != null && session != null) { for (ArtifactRepository repository : repositories) { @@ -628,6 +646,7 @@ public void injectProxy(RepositorySystemSession session, List(); } + @Override public void debug(String message) {} + @Override public void transferCompleted(TransferEvent transferEvent) { ArtifactTransferEvent event = wrap(transferEvent); @@ -75,6 +77,7 @@ public void transferCompleted(TransferEvent transferEvent) { listener.transferCompleted(event); } + @Override public void transferError(TransferEvent transferEvent) { synchronized (transfers) { transfers.remove(transferEvent.getResource()); @@ -84,10 +87,12 @@ public void transferError(TransferEvent transferEvent) { } } + @Override public void transferInitiated(TransferEvent transferEvent) { listener.transferInitiated(wrap(transferEvent)); } + @Override public void transferProgress(TransferEvent transferEvent, byte[] buffer, int length) { Long transferred; synchronized (transfers) { @@ -109,6 +114,7 @@ public void transferProgress(TransferEvent transferEvent, byte[] buffer, int len listener.transferProgress(event); } + @Override public void transferStarted(TransferEvent transferEvent) { listener.transferStarted(wrap(transferEvent)); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java index a02af146070b..c72b8389f0b5 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java @@ -34,18 +34,22 @@ protected AbstractArtifactMetadata(Artifact artifact) { this.artifact = artifact; } + @Override public boolean storedInGroupDirectory() { return false; } + @Override public String getGroupId() { return artifact.getGroupId(); } + @Override public String getArtifactId() { return artifact.getArtifactId(); } + @Override public String extendedToString() { StringBuilder buffer = new StringBuilder(256); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java index 6e09aa5340eb..c8ebf35778d1 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java @@ -51,60 +51,72 @@ public DefaultMetadataResolutionRequest(ArtifactResolutionRequest resolutionRequ this.repositoryRequest = new DefaultRepositoryRequest(resolutionRequest); } + @Override public Artifact getArtifact() { return artifact; } + @Override public DefaultMetadataResolutionRequest setArtifact(Artifact artifact) { this.artifact = artifact; return this; } + @Override public ArtifactRepository getLocalRepository() { return repositoryRequest.getLocalRepository(); } + @Override public DefaultMetadataResolutionRequest setLocalRepository(ArtifactRepository localRepository) { repositoryRequest.setLocalRepository(localRepository); return this; } + @Override public List getRemoteRepositories() { return repositoryRequest.getRemoteRepositories(); } + @Override public DefaultMetadataResolutionRequest setRemoteRepositories(List remoteRepositories) { repositoryRequest.setRemoteRepositories(remoteRepositories); return this; } + @Override public boolean isResolveManagedVersions() { return resolveManagedVersions; } + @Override public DefaultMetadataResolutionRequest setResolveManagedVersions(boolean resolveManagedVersions) { this.resolveManagedVersions = resolveManagedVersions; return this; } + @Override public boolean isOffline() { return repositoryRequest.isOffline(); } + @Override public DefaultMetadataResolutionRequest setOffline(boolean offline) { repositoryRequest.setOffline(offline); return this; } + @Override public boolean isForceUpdate() { return repositoryRequest.isForceUpdate(); } + @Override public DefaultMetadataResolutionRequest setForceUpdate(boolean forceUpdate) { repositoryRequest.setForceUpdate(forceUpdate); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java index 819e182c9102..47e7717f4c96 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java @@ -36,6 +36,7 @@ public interface MetadataResolutionRequest extends RepositoryRequest { * * @return {@code true} if remote access has been disabled, {@code false} otherwise. */ + @Override boolean isOffline(); /** @@ -44,6 +45,7 @@ public interface MetadataResolutionRequest extends RepositoryRequest { * @param offline {@code true} to disable remote access, {@code false} to allow network access. * @return This request, never {@code null}. */ + @Override MetadataResolutionRequest setOffline(boolean offline); /** @@ -66,6 +68,7 @@ public interface MetadataResolutionRequest extends RepositoryRequest { * * @return The local repository to use for the resolution or {@code null} if not set. */ + @Override ArtifactRepository getLocalRepository(); /** @@ -74,6 +77,7 @@ public interface MetadataResolutionRequest extends RepositoryRequest { * @param localRepository The local repository to use for the resolution. * @return This request, never {@code null}. */ + @Override MetadataResolutionRequest setLocalRepository(ArtifactRepository localRepository); /** @@ -81,6 +85,7 @@ public interface MetadataResolutionRequest extends RepositoryRequest { * * @return The remote repositories to use for the resolution, never {@code null}. */ + @Override List getRemoteRepositories(); /** @@ -89,6 +94,7 @@ public interface MetadataResolutionRequest extends RepositoryRequest { * @param remoteRepositories The remote repositories to use for the resolution. * @return This request, never {@code null}. */ + @Override MetadataResolutionRequest setRemoteRepositories(List remoteRepositories); /** diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java index 5e1c5a7c3596..91df21e9b5d7 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java @@ -45,10 +45,12 @@ public class DefaultArtifactRepositoryFactory implements ArtifactRepositoryFacto @Inject private Map repositoryLayouts; + @Override public ArtifactRepositoryLayout getLayout(String layoutId) throws UnknownRepositoryLayoutException { return repositoryLayouts.get(layoutId); } + @Override public ArtifactRepository createDeploymentArtifactRepository( String id, String url, String layoutId, boolean uniqueVersion) throws UnknownRepositoryLayoutException { ArtifactRepositoryLayout layout = repositoryLayouts.get(layoutId); @@ -65,11 +67,13 @@ private void checkLayout(String repositoryId, String layoutId, ArtifactRepositor } } + @Override public ArtifactRepository createDeploymentArtifactRepository( String id, String url, ArtifactRepositoryLayout repositoryLayout, boolean uniqueVersion) { return createArtifactRepository(id, url, repositoryLayout, null, null); } + @Override public ArtifactRepository createArtifactRepository( String id, String url, @@ -84,6 +88,7 @@ public ArtifactRepository createArtifactRepository( return createArtifactRepository(id, url, layout, snapshots, releases); } + @Override public ArtifactRepository createArtifactRepository( String id, String url, @@ -118,10 +123,12 @@ public ArtifactRepository createArtifactRepository( return repository; } + @Override public void setGlobalUpdatePolicy(String updatePolicy) { globalUpdatePolicy = updatePolicy; } + @Override public void setGlobalChecksumPolicy(String checksumPolicy) { globalChecksumPolicy = checksumPolicy; } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java index a9e173c65ddd..f665730fa2c8 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java @@ -85,6 +85,7 @@ private void injectSession(ArtifactResolutionRequest request) { } } + @Override @SuppressWarnings("checkstyle:parameternumber") public ArtifactResolutionResult collect( Set artifacts, @@ -104,6 +105,7 @@ public ArtifactResolutionResult collect( artifacts, originatingArtifact, managedVersions, request, source, filter, listeners, conflictResolvers); } + @Override @SuppressWarnings("checkstyle:parameternumber") public ArtifactResolutionResult collect( Set artifacts, @@ -714,6 +716,7 @@ private void fireEvent( } } + @Override @SuppressWarnings("checkstyle:parameternumber") public ArtifactResolutionResult collect( Set artifacts, diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java index cfe9cd43785a..c99034c82bbb 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java @@ -53,6 +53,7 @@ public class DefaultConflictResolverFactory implements ConflictResolverFactory, * @see org.apache.maven.artifact.resolver.conflict.ConflictResolverFactory#getConflictResolver(java.lang.String) */ + @Override public ConflictResolver getConflictResolver(String type) throws ConflictResolverNotFoundException { try { return (ConflictResolver) container.lookup(ConflictResolver.ROLE, type); @@ -67,6 +68,7 @@ public ConflictResolver getConflictResolver(String type) throws ConflictResolver * @see org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable#contextualize(org.codehaus.plexus.context.Context) */ + @Override public void contextualize(Context context) throws ContextException { container = (PlexusContainer) context.get(PlexusConstants.PLEXUS_KEY); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java index b3dc4772a7c0..e9ec08c4e699 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java @@ -40,6 +40,7 @@ public class FarthestConflictResolver implements ConflictResolver { * org.apache.maven.artifact.resolver.ResolutionNode) */ + @Override public ResolutionNode resolveConflict(ResolutionNode node1, ResolutionNode node2) { return node1.getDepth() >= node2.getDepth() ? node1 : node2; } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java index 7d2bccc23e0a..6d513207bccd 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java @@ -40,6 +40,7 @@ public class NearestConflictResolver implements ConflictResolver { * org.apache.maven.artifact.resolver.ResolutionNode) */ + @Override public ResolutionNode resolveConflict(ResolutionNode node1, ResolutionNode node2) { return node1.getDepth() <= node2.getDepth() ? node1 : node2; } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java index 10cadb204dac..bf0572870a62 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java @@ -43,6 +43,7 @@ public class NewestConflictResolver implements ConflictResolver { * org.apache.maven.artifact.resolver.ResolutionNode) */ + @Override public ResolutionNode resolveConflict(ResolutionNode node1, ResolutionNode node2) { try { ArtifactVersion version1 = node1.getArtifact().getSelectedVersion(); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java index bd15924812a3..fabc790e2883 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java @@ -43,6 +43,7 @@ public class OldestConflictResolver implements ConflictResolver { * org.apache.maven.artifact.resolver.ResolutionNode) */ + @Override public ResolutionNode resolveConflict(ResolutionNode node1, ResolutionNode node2) { try { ArtifactVersion version1 = node1.getArtifact().getSelectedVersion(); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java index f86ea3bc58bf..c86e9cd1369d 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java @@ -51,6 +51,7 @@ public abstract class AbstractVersionTransformation extends AbstractLogEnabled i @Inject protected WagonManager wagonManager; + @Override public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository) throws ArtifactResolutionException, ArtifactNotFoundException { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java index 8eef94e9f300..3aa99257dac1 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java @@ -53,6 +53,7 @@ public DefaultArtifactTransformationManager(Map .collect(Collectors.toList()); } + @Override public void transformForResolve(Artifact artifact, RepositoryRequest request) throws ArtifactResolutionException, ArtifactNotFoundException { for (ArtifactTransformation transform : artifactTransformations) { @@ -60,6 +61,7 @@ public void transformForResolve(Artifact artifact, RepositoryRequest request) } } + @Override public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository) throws ArtifactResolutionException, ArtifactNotFoundException { @@ -68,6 +70,7 @@ public void transformForResolve( } } + @Override public void transformForInstall(Artifact artifact, ArtifactRepository localRepository) throws ArtifactInstallationException { for (ArtifactTransformation transform : artifactTransformations) { @@ -75,6 +78,7 @@ public void transformForInstall(Artifact artifact, ArtifactRepository localRepos } } + @Override public void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository, ArtifactRepository localRepository) throws ArtifactDeploymentException { @@ -83,6 +87,7 @@ public void transformForDeployment( } } + @Override public List getArtifactTransformations() { return artifactTransformations; } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java index 53468900cb0c..065bad156a17 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java @@ -37,6 +37,7 @@ @Deprecated public class LatestArtifactTransformation extends AbstractVersionTransformation { + @Override public void transformForResolve(Artifact artifact, RepositoryRequest request) throws ArtifactResolutionException, ArtifactNotFoundException { if (Artifact.LATEST_VERSION.equals(artifact.getVersion())) { @@ -54,15 +55,18 @@ public void transformForResolve(Artifact artifact, RepositoryRequest request) } } + @Override public void transformForInstall(Artifact artifact, ArtifactRepository localRepository) { // metadata is added via addPluginArtifactMetadata } + @Override public void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository, ArtifactRepository localRepository) { // metadata is added via addPluginArtifactMetadata } + @Override protected String constructVersion(Versioning versioning, String baseVersion) { return versioning.getLatest(); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java index 4f2e5058ab8e..3c14203b35c2 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java @@ -51,6 +51,7 @@ public class SnapshotTransformation extends AbstractVersionTransformation { private String deploymentTimestamp; + @Override public void transformForResolve(Artifact artifact, RepositoryRequest request) throws ArtifactResolutionException { // Only select snapshots that are unresolved (eg 1.0-SNAPSHOT, not 1.0-20050607.123456) if (artifact.isSnapshot() && artifact.getBaseVersion().equals(artifact.getVersion())) { @@ -63,6 +64,7 @@ public void transformForResolve(Artifact artifact, RepositoryRequest request) th } } + @Override public void transformForInstall(Artifact artifact, ArtifactRepository localRepository) { if (artifact.isSnapshot()) { Snapshot snapshot = new Snapshot(); @@ -73,6 +75,7 @@ public void transformForInstall(Artifact artifact, ArtifactRepository localRepos } } + @Override public void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository, ArtifactRepository localRepository) throws ArtifactDeploymentException { @@ -110,6 +113,7 @@ public String getDeploymentTimestamp() { return deploymentTimestamp; } + @Override protected String constructVersion(Versioning versioning, String baseVersion) { String version = null; Snapshot snapshot = versioning.getSnapshot(); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java index ad1937a4b19f..4a0b44fb1233 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java @@ -47,6 +47,7 @@ public ClasspathContainer(List classpath, ArtifactScopeEnum sc } // ------------------------------------------------------------------------------------------- + @Override public Iterator iterator() { return classpath == null ? null : classpath.iterator(); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java index 616467a0f93c..e0b5fb64e695 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java @@ -41,6 +41,7 @@ public class DefaultClasspathTransformation implements ClasspathTransformation { GraphConflictResolver conflictResolver; // ---------------------------------------------------------------------------------------------------- + @Override public ClasspathContainer transform(MetadataGraph dirtyGraph, ArtifactScopeEnum scope, boolean resolve) throws MetadataGraphTransformationException { try { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java index 71a66895cdd6..fbb50979b6c1 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java @@ -44,6 +44,7 @@ public class DefaultGraphConflictResolutionPolicy implements GraphConflictResolu @Configuration(name = "newer-first", value = "true") private boolean newerFirst = true; + @Override public MetadataGraphEdge apply(MetadataGraphEdge e1, MetadataGraphEdge e2) { int depth1 = e1.getDepth(); int depth2 = e2.getDepth(); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java index 60dc8a593cfc..35a0e061681a 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java @@ -44,6 +44,7 @@ public class DefaultGraphConflictResolver implements GraphConflictResolver { // ------------------------------------------------------------------------------------- // ------------------------------------------------------------------------------------- + @Override public MetadataGraph resolveConflicts(MetadataGraph graph, ArtifactScopeEnum scope) throws GraphConflictResolutionException { if (policy == null) { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java index aec802d7f829..a7eb1c0ef61f 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java @@ -93,6 +93,7 @@ private static int compareStrings(String s1, String s2) { } // --------------------------------------------------------------------- + @Override public int compareTo(MetadataGraphVertex vertex) { if (vertex == null || vertex.getMd() == null) { return 1; diff --git a/compat/maven-compat/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java b/compat/maven-compat/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java index 2df142e9b932..ec819401cd7e 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java @@ -48,6 +48,7 @@ public DefaultMavenSettingsBuilder(SettingsBuilder settingsBuilder) { this.settingsBuilder = settingsBuilder; } + @Override public Settings buildSettings() throws IOException, XmlPullParserException { File userSettingsFile = getFile( "${user.home}/.m2/settings.xml", "user.home", MavenSettingsBuilder.ALT_USER_SETTINGS_XML_LOCATION); @@ -55,10 +56,12 @@ public Settings buildSettings() throws IOException, XmlPullParserException { return buildSettings(userSettingsFile); } + @Override public Settings buildSettings(boolean useCachedSettings) throws IOException, XmlPullParserException { return buildSettings(); } + @Override public Settings buildSettings(File userSettingsFile) throws IOException, XmlPullParserException { File globalSettingsFile = getFile( "${maven.conf}/settings.xml", "maven.conf", MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION); @@ -70,6 +73,7 @@ public Settings buildSettings(File userSettingsFile) throws IOException, XmlPull return build(request); } + @Override public Settings buildSettings(File userSettingsFile, boolean useCachedSettings) throws IOException, XmlPullParserException { return buildSettings(userSettingsFile); @@ -84,6 +88,7 @@ private Settings build(SettingsBuildingRequest request) throws IOException, XmlP } /** @since 2.1 */ + @Override public Settings buildSettings(MavenExecutionRequest request) throws IOException, XmlPullParserException { SettingsBuildingRequest settingsRequest = new DefaultSettingsBuildingRequest(); settingsRequest.setUserSettingsFile(request.getUserSettingsFile()); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java b/compat/maven-compat/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java index e78fd2ca8ad1..edb157701781 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java @@ -39,6 +39,7 @@ public class DefaultToolchainsBuilder implements ToolchainsBuilder { private final Logger logger = LoggerFactory.getLogger(getClass()); + @Override public PersistedToolchains build(File userToolchainsFile) throws MisconfiguredToolchainException { PersistedToolchains toolchains = null; diff --git a/compat/maven-compat/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java index 2c0e24279ca3..f22884ce6494 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java @@ -46,6 +46,7 @@ public class JavaToolchainFactory implements ToolchainFactory { private final Logger logger = LoggerFactory.getLogger(getClass()); + @Override public ToolchainPrivate createToolchain(ToolchainModel model) throws MisconfiguredToolchainException { if (model == null) { return null; @@ -95,6 +96,7 @@ public ToolchainPrivate createToolchain(ToolchainModel model) throws Misconfigur return jtc; } + @Override public ToolchainPrivate createDefaultToolchain() { // not sure it's necessary to provide a default toolchain here. // only version can be eventually supplied. diff --git a/compat/maven-compat/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java b/compat/maven-compat/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java index 0f6fc5c25dd4..661ffa642455 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java @@ -51,10 +51,12 @@ public void setJavaHome(String javaHome) { this.javaHome = javaHome; } + @Override public String toString() { return "JDK[" + getJavaHome() + "]"; } + @Override public String findTool(String toolName) { Path toRet = findTool(toolName, Paths.get(getJavaHome()).normalize()); if (toRet != null) { diff --git a/compat/maven-compat/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java b/compat/maven-compat/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java index 5cc242c09648..723ef0111d00 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java @@ -41,6 +41,7 @@ class ProjectDependenciesResolverTest extends AbstractCoreMavenComponentTestCase @Inject private ProjectDependenciesResolver resolver; + @Override protected String getProjectsDirectory() { return "src/test/projects/project-dependencies-resolver"; } diff --git a/compat/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java index f3ffe61b3f86..75d77f3606d2 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java @@ -36,21 +36,25 @@ @Singleton @Deprecated public class SimpleArtifactMetadataSource implements ArtifactMetadataSource { + @Override public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories) { throw new UnsupportedOperationException("Cannot retrieve metadata in this test case"); } + @Override public List retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories) { return Collections.singletonList(new DefaultArtifactVersion("10.1.3")); } + @Override public List retrieveAvailableVersionsFromDeploymentRepository( Artifact artifact, ArtifactRepository localRepository, ArtifactRepository remoteRepository) { return Collections.singletonList(new DefaultArtifactVersion("10.1.3")); } + @Override public ResolutionGroup retrieve(MetadataResolutionRequest request) { return retrieve(request.getArtifact(), request.getLocalRepository(), request.getRemoteRepositories()); } diff --git a/compat/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java index 6747ac894e0f..dd6e2ef91692 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java @@ -39,6 +39,7 @@ public class TestMetadataSource implements ArtifactMetadataSource { @Inject private ArtifactFactory factory; + @Override public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories) throws ArtifactMetadataRetrievalException { @@ -67,22 +68,26 @@ public ResolutionGroup retrieve( return new ResolutionGroup(artifact, dependencies, remoteRepositories); } + @Override public List retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories) throws ArtifactMetadataRetrievalException { throw new UnsupportedOperationException("Cannot get available versions in this test case"); } + @Override public List retrieveAvailableVersionsFromDeploymentRepository( Artifact artifact, ArtifactRepository localRepository, ArtifactRepository remoteRepository) throws ArtifactMetadataRetrievalException { throw new UnsupportedOperationException("Cannot get available versions in this test case"); } + @Override public ResolutionGroup retrieve(MetadataResolutionRequest request) throws ArtifactMetadataRetrievalException { return retrieve(request.getArtifact(), request.getLocalRepository(), request.getRemoteRepositories()); } + @Override public List retrieveAvailableVersions(MetadataResolutionRequest request) throws ArtifactMetadataRetrievalException { return retrieveAvailableVersions( diff --git a/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java index d93edab31323..f93695376381 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java @@ -42,6 +42,7 @@ protected void getTransfer(Resource resource, File destination, InputStream inpu super.getTransfer(resource, destination, input, closeInput, maxSize); } + @Override public void get(String resourceName, File destination) throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException { addTransfer("get " + resourceName); @@ -59,6 +60,7 @@ private void addTransfer(String resourceName) { } } + @Override public boolean getIfNewer(String resourceName, File destination, long timestamp) throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException { if (!insideGet) { @@ -67,6 +69,7 @@ public boolean getIfNewer(String resourceName, File destination, long timestamp) return super.getIfNewer(resourceName, destination, timestamp); } + @Override public void addTransferListener(TransferListener listener) { if (listener instanceof TestTransferListener t) { testTransferListener = t; diff --git a/compat/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java b/compat/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java index a95bcdf09123..f8c532c6c73a 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java @@ -44,6 +44,7 @@ @Deprecated public class ClasspathArtifactResolver implements ArtifactResolver { + @Override public List resolveArtifacts( RepositorySystemSession session, Collection requests) throws ArtifactResolutionException { @@ -73,6 +74,7 @@ public List resolveArtifacts( return results; } + @Override public ArtifactResult resolveArtifact(RepositorySystemSession session, ArtifactRequest request) throws ArtifactResolutionException { return resolveArtifacts(session, Collections.singleton(request)).get(0); diff --git a/compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java b/compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java index 44900c5cd29a..045de59061be 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java @@ -39,16 +39,20 @@ @Deprecated public class EmptyLifecycleExecutor implements LifecycleExecutor { + @Override public MavenExecutionPlan calculateExecutionPlan(MavenSession session, String... tasks) { return new MavenExecutionPlan(null, new DefaultLifecycles()); } + @Override public MavenExecutionPlan calculateExecutionPlan(MavenSession session, boolean setup, String... tasks) { return new MavenExecutionPlan(null, new DefaultLifecycles()); } + @Override public void execute(MavenSession session) {} + @Override public Set getPluginsBoundByDefaultToAllLifecycles(String packaging) { Set plugins; @@ -85,8 +89,10 @@ private Plugin newPlugin(String artifactId, String... goals) { return plugin; } + @Override public void calculateForkedExecutions(MojoExecution mojoExecution, MavenSession session) {} + @Override public List executeForkedExecutions(MojoExecution mojoExecution, MavenSession session) { return Collections.emptyList(); } diff --git a/compat/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java b/compat/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java index 4b489783b0f3..2f42888b5f18 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java @@ -44,10 +44,12 @@ public LegacyLocalRepositoryManager(File basedir) { this.repository = new LocalRepository(basedir.getAbsoluteFile(), "legacy"); } + @Override public LocalRepository getRepository() { return repository; } + @Override public String getPathForLocalArtifact(Artifact artifact) { StringBuilder path = new StringBuilder(128); @@ -66,14 +68,17 @@ public String getPathForLocalArtifact(Artifact artifact) { return path.toString(); } + @Override public String getPathForRemoteArtifact(Artifact artifact, RemoteRepository repository, String context) { return getPathForLocalArtifact(artifact); } + @Override public String getPathForLocalMetadata(Metadata metadata) { return getPath(metadata, "local"); } + @Override public String getPathForRemoteMetadata(Metadata metadata, RemoteRepository repository, String context) { return getPath(metadata, getRepositoryKey(repository, context)); } @@ -113,6 +118,7 @@ private String insertRepositoryKey(String filename, String repositoryKey) { return result; } + @Override public LocalArtifactResult find(RepositorySystemSession session, LocalArtifactRequest request) { String path = getPathForLocalArtifact(request.getArtifact()); File file = new File(getRepository().getBasedir(), path); @@ -126,10 +132,12 @@ public LocalArtifactResult find(RepositorySystemSession session, LocalArtifactRe return result; } + @Override public void add(RepositorySystemSession session, LocalArtifactRegistration request) { // noop } + @Override public LocalMetadataResult find(RepositorySystemSession session, LocalMetadataRequest request) { LocalMetadataResult result = new LocalMetadataResult(request); @@ -153,10 +161,12 @@ public LocalMetadataResult find(RepositorySystemSession session, LocalMetadataRe return result; } + @Override public void add(RepositorySystemSession session, LocalMetadataRegistration request) { // noop } + @Override public String toString() { return String.valueOf(getRepository()); } diff --git a/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java index 3d2c596ee801..903a0f81b792 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java @@ -299,18 +299,22 @@ private void assertWagon(String protocol) throws Exception { } private final class ArtifactRepositoryLayoutStub implements ArtifactRepositoryLayout { + @Override public String getId() { return "test"; } + @Override public String pathOfRemoteRepositoryMetadata(ArtifactMetadata metadata) { return "path"; } + @Override public String pathOfLocalRepositoryMetadata(ArtifactMetadata metadata, ArtifactRepository repository) { return "path"; } + @Override public String pathOf(Artifact artifact) { return "path"; } diff --git a/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java index f3cf58135349..641d3034dfa8 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java @@ -828,6 +828,7 @@ private class Source implements ArtifactMetadataSource { private Map> versions = new HashMap<>(); + @Override public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories) throws ArtifactMetadataRetrievalException { @@ -901,12 +902,14 @@ public void addArtifact(ArtifactSpec spec) { } } + @Override public List retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories) throws ArtifactMetadataRetrievalException { return retrieveAvailableVersions(artifact); } + @Override public List retrieveAvailableVersionsFromDeploymentRepository( Artifact artifact, ArtifactRepository localRepository, ArtifactRepository remoteRepository) throws ArtifactMetadataRetrievalException { @@ -921,10 +924,12 @@ private List retrieveAvailableVersions(Artifact artifact) { return artifactVersions; } + @Override public ResolutionGroup retrieve(MetadataResolutionRequest request) throws ArtifactMetadataRetrievalException { return retrieve(request.getArtifact(), request.getLocalRepository(), request.getRemoteRepositories()); } + @Override public List retrieveAvailableVersions(MetadataResolutionRequest request) throws ArtifactMetadataRetrievalException { return retrieveAvailableVersions( diff --git a/compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java index 5681bba45f81..dd11b2a9554f 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java @@ -42,6 +42,7 @@ public class TestMetadataSource implements ArtifactMetadataSource { @Inject private ArtifactFactory factory; + @Override public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories) throws ArtifactMetadataRetrievalException { @@ -70,18 +71,21 @@ public ResolutionGroup retrieve( return new ResolutionGroup(artifact, dependencies, remoteRepositories); } + @Override public List retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories) throws ArtifactMetadataRetrievalException { throw new UnsupportedOperationException("Cannot get available versions in this test case"); } + @Override public List retrieveAvailableVersionsFromDeploymentRepository( Artifact artifact, ArtifactRepository localRepository, ArtifactRepository remoteRepository) throws ArtifactMetadataRetrievalException { throw new UnsupportedOperationException("Cannot get available versions in this test case"); } + @Override public ResolutionGroup retrieve(MetadataResolutionRequest request) throws ArtifactMetadataRetrievalException { return retrieve(request.getArtifact(), request.getLocalRepository(), request.getRemoteRepositories()); } diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java index d24119940794..6732e5cff439 100644 --- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java +++ b/compat/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java @@ -31,6 +31,7 @@ public class DefaultEventSpyContext implements EventSpy.Context { private final Map data = new HashMap<>(); + @Override public Map getData() { return data; } diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java index 7433436dcb72..8e80c8a5b325 100644 --- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java +++ b/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java @@ -45,11 +45,13 @@ public Slf4jStdoutLogger(PrintStream out) { // // These are the only methods we need in our primordial logger // + @Override public void error(String msg) { out.print(ERROR); out.println(msg); } + @Override public void error(String msg, Throwable t) { error(msg); @@ -61,143 +63,202 @@ public void error(String msg, Throwable t) { // // Don't need any of this // + @Override public String getName() { return null; } + @Override public boolean isTraceEnabled() { return false; } + @Override public void trace(String msg) {} + @Override public void trace(String format, Object arg) {} + @Override public void trace(String format, Object arg1, Object arg2) {} + @Override public void trace(String format, Object... arguments) {} + @Override public void trace(String msg, Throwable t) {} + @Override public boolean isTraceEnabled(Marker marker) { return false; } + @Override public void trace(Marker marker, String msg) {} + @Override public void trace(Marker marker, String format, Object arg) {} + @Override public void trace(Marker marker, String format, Object arg1, Object arg2) {} + @Override public void trace(Marker marker, String format, Object... argArray) {} + @Override public void trace(Marker marker, String msg, Throwable t) {} + @Override public boolean isDebugEnabled() { return false; } + @Override public void debug(String msg) {} + @Override public void debug(String format, Object arg) {} + @Override public void debug(String format, Object arg1, Object arg2) {} + @Override public void debug(String format, Object... arguments) {} + @Override public void debug(String msg, Throwable t) {} + @Override public boolean isDebugEnabled(Marker marker) { return false; } + @Override public void debug(Marker marker, String msg) {} + @Override public void debug(Marker marker, String format, Object arg) {} + @Override public void debug(Marker marker, String format, Object arg1, Object arg2) {} + @Override public void debug(Marker marker, String format, Object... arguments) {} + @Override public void debug(Marker marker, String msg, Throwable t) {} + @Override public boolean isInfoEnabled() { return false; } + @Override public void info(String msg) {} + @Override public void info(String format, Object arg) {} + @Override public void info(String format, Object arg1, Object arg2) {} + @Override public void info(String format, Object... arguments) {} + @Override public void info(String msg, Throwable t) {} + @Override public boolean isInfoEnabled(Marker marker) { return false; } + @Override public void info(Marker marker, String msg) {} + @Override public void info(Marker marker, String format, Object arg) {} + @Override public void info(Marker marker, String format, Object arg1, Object arg2) {} + @Override public void info(Marker marker, String format, Object... arguments) {} + @Override public void info(Marker marker, String msg, Throwable t) {} + @Override public boolean isWarnEnabled() { return false; } + @Override public void warn(String msg) {} + @Override public void warn(String format, Object arg) {} + @Override public void warn(String format, Object... arguments) {} + @Override public void warn(String format, Object arg1, Object arg2) {} + @Override public void warn(String msg, Throwable t) {} + @Override public boolean isWarnEnabled(Marker marker) { return false; } + @Override public void warn(Marker marker, String msg) {} + @Override public void warn(Marker marker, String format, Object arg) {} + @Override public void warn(Marker marker, String format, Object arg1, Object arg2) {} + @Override public void warn(Marker marker, String format, Object... arguments) {} + @Override public void warn(Marker marker, String msg, Throwable t) {} + @Override public boolean isErrorEnabled() { return false; } + @Override public void error(String format, Object arg) {} + @Override public void error(String format, Object arg1, Object arg2) {} + @Override public void error(String format, Object... arguments) {} + @Override public boolean isErrorEnabled(Marker marker) { return false; } + @Override public void error(Marker marker, String msg) {} + @Override public void error(Marker marker, String format, Object arg) {} + @Override public void error(Marker marker, String format, Object arg1, Object arg2) {} + @Override public void error(Marker marker, String format, Object... arguments) {} + @Override public void error(Marker marker, String msg, Throwable t) {} } diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java index 606eb65b5c10..63c6c09d4bfd 100644 --- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java +++ b/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java @@ -193,21 +193,26 @@ public Iterator> iterator() { final Iterator> keyIterator = storage.entrySet().iterator(); + @Override public boolean hasNext() { return keyIterator.hasNext(); } + @Override public Entry next() { final Entry entry = keyIterator.next(); return new Entry() { + @Override public String getKey() { return entry.getKey(); } + @Override public String getValue() { return entry.getValue(); } + @Override public String setValue(String value) { String old = entry.setValue(value); if (old == null || !old.equals(value)) { @@ -221,6 +226,7 @@ public String setValue(String value) { }; } + @Override public void remove() { keyIterator.remove(); } diff --git a/compat/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java index 1a531085cf02..b5b9da97dafa 100644 --- a/compat/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java +++ b/compat/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java @@ -42,6 +42,7 @@ class CLIManagerDocumentationTest { private static final String LS = System.lineSeparator(); private static class OptionComparator implements Comparator