http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/MavenProject.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index 9a65b7f..2289465 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -227,7 +227,7 @@ public class MavenProject /** * Returns the project corresponding to a declared parent. - * + * * @return the parent, or null if no parent is declared or there was an error building it */ public MavenProject getParent() @@ -690,7 +690,7 @@ public class MavenProject * All dependencies that this project has, including transitive ones. Contents are lazily populated, so depending on * what phases have run dependencies in some scopes won't be included. eg. if only compile phase has run, * dependencies with scope test won't be included. - * + * * @return {@link Set} < {@link Artifact} > * @see #getDependencyArtifacts() to get only direct dependencies */ @@ -894,7 +894,7 @@ public class MavenProject * {@code settings.xml}. The profile identifiers are grouped by the identifier of their source, e.g. * {@code <groupId>:<artifactId>:<version>} for a POM profile or {@code external} for profiles from the * {@code settings.xml}. - * + * * @return The identifiers of all injected profiles, indexed by the source from which the profiles originated, never * {@code null}. */ @@ -909,7 +909,7 @@ public class MavenProject * 3.0.x. Historically, it logged and ignored a second addition of the same g/a/v/c/t. Now it replaces the file for * the artifact, so that plugins (e.g. shade) can change the pathname of the file for a particular set of * coordinates. - * + * * @param artifact the artifact to add or replace. * @throws DuplicateArtifactAttachmentException */ @@ -986,7 +986,7 @@ public class MavenProject /** * Direct dependencies that this project has. - * + * * @return {@link Set} < {@link Artifact} > * @see #getArtifacts() to get all transitive dependencies */ @@ -1352,7 +1352,7 @@ public class MavenProject * Sets the project's class realm. <strong>Warning:</strong> This is an internal utility method that is only public * for technical reasons, it is not part of the public API. In particular, this method can be changed or deleted * without prior notice and must not be used by plugins. - * + * * @param classRealm The class realm hosting the build extensions of this project, may be {@code null}. */ public void setClassRealm( ClassRealm classRealm ) @@ -1365,7 +1365,7 @@ public class MavenProject * <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not * part of the public API. In particular, this method can be changed or deleted without prior notice and must not be * used by plugins. - * + * * @return The project's class realm or {@code null}. */ public ClassRealm getClassRealm() @@ -1377,7 +1377,7 @@ public class MavenProject * Sets the artifact filter used to exclude shared extension artifacts from plugin realms. <strong>Warning:</strong> * This is an internal utility method that is only public for technical reasons, it is not part of the public API. * In particular, this method can be changed or deleted without prior notice and must not be used by plugins. - * + * * @param extensionDependencyFilter The dependency filter to apply to plugins, may be {@code null}. */ public void setExtensionDependencyFilter( DependencyFilter extensionDependencyFilter ) @@ -1390,7 +1390,7 @@ public class MavenProject * <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not * part of the public API. In particular, this method can be changed or deleted without prior notice and must not be * used by plugins. - * + * * @return The dependency filter or {@code null}. */ public DependencyFilter getExtensionDependencyFilter() @@ -1403,7 +1403,7 @@ public class MavenProject * <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not * part of the public API. In particular, this method can be changed or deleted without prior notice and must not be * used by plugins. - * + * * @param artifacts The set of artifacts, may be {@code null}. */ public void setResolvedArtifacts( Set<Artifact> artifacts ) @@ -1418,7 +1418,7 @@ public class MavenProject * <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not * part of the public API. In particular, this method can be changed or deleted without prior notice and must not be * used by plugins. - * + * * @param artifactFilter The artifact filter, may be {@code null} to exclude all artifacts. */ public void setArtifactFilter( ArtifactFilter artifactFilter ) @@ -1432,7 +1432,7 @@ public class MavenProject * <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not * part of the public API. In particular, this method can be changed or deleted without prior notice and must not be * used by plugins. - * + * * @param phase The phase to check for, must not be {@code null}. * @return {@code true} if the phase has been seen. */ @@ -1445,7 +1445,7 @@ public class MavenProject * <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not * part of the public API. In particular, this method can be changed or deleted without prior notice and must not be * used by plugins. - * + * * @param lifecyclePhase The lifecycle phase to add, must not be {@code null}. */ public void addLifecyclePhase( String lifecyclePhase ) @@ -1523,8 +1523,8 @@ public class MavenProject } return moduleAdjustments.get( module ); - } - + } + @Deprecated public Set<Artifact> createArtifacts( ArtifactFactory artifactFactory, String inheritedScope, ArtifactFilter filter ) throws InvalidDependencyVersionException @@ -1688,8 +1688,8 @@ public class MavenProject } } return list; - } - + } + @Deprecated public List<Artifact> getRuntimeArtifacts() { @@ -1706,8 +1706,8 @@ public class MavenProject } } return list; - } - + } + @Deprecated public List<String> getSystemClasspathElements() throws DependencyResolutionRequiredException @@ -1944,7 +1944,7 @@ public class MavenProject /** * Gets the project building request from which this project instance was created. <strong>Warning:</strong> This is * an utility method that is meant to assist integrators of Maven, it must not be used by Maven plugins. - * + * * @return The project building request or {@code null}. * @since 2.1 */ @@ -1957,7 +1957,7 @@ public class MavenProject /** * Sets the project building request from which this project instance was created. <strong>Warning:</strong> This is * an utility method that is meant to assist integrators of Maven, it must not be used by Maven plugins. - * + * * @param projectBuildingRequest The project building request, may be {@code null}. * @since 2.1 */
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java index 70eb5b4..4ac8397 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java @@ -33,7 +33,7 @@ public interface ProjectBuilder /** * Builds a project descriptor from the specified POM file. - * + * * @param projectFile The POM file to build the project from, must not be {@code null}. * @param request The project building request that holds further parameters, must not be {@code null}. * @return The result of the project building, never {@code null}. @@ -44,7 +44,7 @@ public interface ProjectBuilder /** * Builds a project descriptor for the specified artifact. - * + * * @param projectArtifact The POM artifact to build the project from, must not be {@code null}. * @param request The project building request that holds further parameters, must not be {@code null}. * @return The result of the project building, never {@code null}. @@ -55,7 +55,7 @@ public interface ProjectBuilder /** * Builds a project descriptor for the specified artifact. - * + * * @param projectArtifact The POM artifact to build the project from, must not be {@code null}. * @param allowStubModel A flag controlling the case of a missing POM artifact. If {@code true} and the specified * POM artifact does not exist, a simple stub model will be returned. If {@code false}, an exception will @@ -69,12 +69,12 @@ public interface ProjectBuilder /** * Builds a project descriptor for the specified model source. - * + * * @param modelSource The source of the model to built the project descriptor from, must not be {@code null}. * @param request The project building request that holds further parameters, must not be {@code null}. * @return The result of the project building, never {@code null}. * @throws ProjectBuildingException If the project descriptor could not be successfully built. - * + * * @see org.apache.maven.model.building.ModelSource2 */ ProjectBuildingResult build( ModelSource modelSource, ProjectBuildingRequest request ) @@ -82,7 +82,7 @@ public interface ProjectBuilder /** * Builds the projects for the specified POM files and optionally their children. - * + * * @param pomFiles The POM files to build, must not be {@code null}. * @param recursive {@code true} to recursively build sub modules referenced by the POM files, {@code false} to * build only the specified POM files. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java index 32818af..0380278 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java @@ -31,7 +31,7 @@ public interface ProjectBuildingRequest { ProjectBuildingRequest setLocalRepository( ArtifactRepository localRepository ); - + ArtifactRepository getLocalRepository(); ProjectBuildingRequest setRemoteRepositories( List<ArtifactRepository> remoteRepositories ); @@ -45,7 +45,7 @@ public interface ProjectBuildingRequest /** * Sets the system properties to use for interpolation and profile activation. The system properties are collected * from the runtime environment like {@link System#getProperties()} and environment variables. - * + * * @param systemProperties The system properties, may be {@code null}. * @return This request, never {@code null}. */ @@ -54,7 +54,7 @@ public interface ProjectBuildingRequest /** * Gets the system properties to use for interpolation and profile activation. The system properties are collected * from the runtime environment like {@link System#getProperties()} and environment variables. - * + * * @return The system properties, never {@code null}. */ Properties getSystemProperties(); @@ -63,7 +63,7 @@ public interface ProjectBuildingRequest * Sets the user properties to use for interpolation and profile activation. The user properties have been * configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command * line. - * + * * @param userProperties The user properties, may be {@code null}. * @return This request, never {@code null}. */ @@ -73,7 +73,7 @@ public interface ProjectBuildingRequest * Gets the user properties to use for interpolation and profile activation. The user properties have been * configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command * line. - * + * * @return The user properties, never {@code null}. */ Properties getUserProperties(); @@ -92,7 +92,7 @@ public interface ProjectBuildingRequest /** * Controls the level of validation to perform on processed models. By default, models are validated in strict mode. - * + * * @param validationLevel The level of validation to perform on processed models, e.g. * {@link org.apache.maven.model.building.ModelBuildingRequest#VALIDATION_LEVEL_STRICT}. * @return This configuration, never {@code null}. @@ -101,47 +101,47 @@ public interface ProjectBuildingRequest /** * Gets the level of validation to perform on processed models. - * + * * @return The level of validation to perform on processed models. */ int getValidationLevel(); // Profiles - + /** * Set any active profiles that the {@link ProjectBuilder} should consider while constructing * a {@link MavenProject}. */ void setActiveProfileIds( List<String> activeProfileIds ); - + List<String> getActiveProfileIds(); void setInactiveProfileIds( List<String> inactiveProfileIds ); List<String> getInactiveProfileIds(); - + /** * Add a {@link org.apache.maven.model.Profile} that has come from an external source. This may be from a custom * configuration like the MavenCLI settings.xml file, or from a custom dialog in an IDE integration like M2Eclipse. - * + * * @param profile */ void addProfile( Profile profile ); - + void setProfiles( List<Profile> profiles ); - + List<Profile> getProfiles(); /** * Gets the start time of the build. - * + * * @return The start time of the build or {@code null} if unknown. */ Date getBuildStartTime(); /** * Sets the start time of the build. - * + * * @param buildStartTime The start time of the build, may be {@code null}. */ void setBuildStartTime( Date buildStartTime ); @@ -153,7 +153,7 @@ public interface ProjectBuildingRequest /** * Sets the merge mode used to combine repositories declared in the POM with the repositories specified in this * request. - * + * * @param mode The repository merge mode, must not be {@code null}. * @return This request for chaining, never {@code null}. * @see #setRemoteRepositories(List) @@ -163,7 +163,7 @@ public interface ProjectBuildingRequest /** * Gets the merge mode used to combine repositories declared in the POM with the repositories specified in this * request - * + * * @return The merge mode, never {@code null}. */ RepositoryMerging getRepositoryMerging(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java index bf9d265..9a43154 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java @@ -26,7 +26,7 @@ import org.apache.maven.model.building.ModelProblem; /** * Collects the output of the project builder. - * + * * @author Benjamin Bentmann */ public interface ProjectBuildingResult @@ -36,21 +36,21 @@ public interface ProjectBuildingResult * Gets the identifier of the project that could not be built. The general format of the identifier is {@code * <groupId>:<artifactId>:<version>} but some of these coordinates may still be unknown at the point the exception * is thrown so this information is merely meant to assist the user. - * + * * @return The identifier of the project or an empty string if not known, never {@code null}. */ String getProjectId(); /** * Gets the POM file from which the project was built. - * + * * @return The POM file or {@code null} if unknown. */ File getPomFile(); /** * Gets the project that was built. - * + * * @return The project that was built or {@code null} if an error occurred and this result accompanies a * {@link ProjectBuildingException}. */ @@ -58,14 +58,14 @@ public interface ProjectBuildingResult /** * Gets the problems that were encountered during the project building. - * + * * @return The problems that were encountered during the project building, can be empty but never {@code null}. */ List<ModelProblem> getProblems(); /** * Gets the result of the dependency resolution for the project. - * + * * @return The result of the dependency resolution for the project or {@code null} if the project dependencies were * not requested. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java index 36572c2..539055c 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java @@ -21,7 +21,7 @@ package org.apache.maven.project; /** * Resolves the transitive dependencies of a project. - * + * * @author Benjamin Bentmann */ public interface ProjectDependenciesResolver @@ -29,7 +29,7 @@ public interface ProjectDependenciesResolver /** * Resolves the transitive dependencies of a project. - * + * * @param request The resolution request holding the parameters, must not be {@code null}. * @return The resolution result, never {@code null}. * @throws DependencyResolutionException If any project dependency could not be resolved. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java index 43609ce..c64dd73 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java @@ -52,7 +52,7 @@ import org.eclipse.aether.resolution.VersionRangeResult; /** * A model resolver to assist building of projects. This resolver gives priority to those repositories that have been * declared in the POM. - * + * * @author Benjamin Bentmann */ class ProjectModelResolver http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java index 779d96b..9265b89 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java @@ -28,7 +28,7 @@ import org.eclipse.aether.graph.DependencyFilter; * Caches project class realms. <strong>Warning:</strong> This is an internal utility interface that is only public for * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without * prior notice. - * + * * @author Igor Fedorenko * @author Benjamin Bentmann */ @@ -70,7 +70,7 @@ public interface ProjectRealmCache * Registers the specified cache record for usage with the given project. Integrators can use the information * collected from this method in combination with a custom cache implementation to dispose unused records from the * cache. - * + * * @param project The project that employs the plugin realm, must not be {@code null}. * @param record The cache record being used for the project, must not be {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java index 63d9ca5..24425da 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java @@ -26,7 +26,7 @@ import org.apache.maven.model.building.ModelCache; /** * A simple model cache used to accelerate model building during a reactor build. - * + * * @author Benjamin Bentmann */ class ReactorModelCache http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java index e0e9615..294fccd 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java +++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java @@ -26,7 +26,7 @@ import java.util.Map; /** * Holds all POM files that are known to the reactor. This allows the project builder to resolve imported POMs from the * reactor when building another project's effective model. - * + * * @author Benjamin Bentmann */ class ReactorModelPool http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java index d021107..91f665b 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java @@ -26,7 +26,7 @@ import org.codehaus.plexus.component.annotations.Component; * This realizes the metadata source via the default hint to provide backward-compat with Maven 2.x whose Plexus version * registered component descriptors twice: once keyed by role+roleHint and once keyed by role only. This effectively * made the metadata source available with its original role hint ("maven") as well as the default hint. - * + * * @author Benjamin Bentmann */ @Component( role = ArtifactMetadataSource.class ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java index 1750a7b..becd880 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java @@ -200,7 +200,7 @@ public class MavenMetadataSource if ( rel.project == null ) { - // When this happens we have a Maven 1.x POM, or some invalid POM. + // When this happens we have a Maven 1.x POM, or some invalid POM. // It should have never found its way into Maven 2.x repository but it did. dependencies = Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java b/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java index cdcd545..2c3196f 100644 --- a/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java +++ b/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java @@ -29,7 +29,7 @@ import org.codehaus.plexus.util.Os; * Assists the project builder. <strong>Warning:</strong> This is an internal utility class that is only public for * technical reasons, it is not part of the public API. In particular, this class can be changed or deleted without * prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -43,7 +43,7 @@ public class EnvironmentUtils * env.PATH}. Unlike native environment variables, properties are always case-sensitive. For the sake of * determinism, the environment variable names will be normalized to upper case on platforms with case-insensitive * variable lookup. - * + * * @param props The properties to add the environment variables to, may be {@code null}. */ public static void addEnvVars( Properties props ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java index 81489a2..608df2d 100644 --- a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java +++ b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java @@ -28,7 +28,7 @@ public class SystemProperties { /** * Thread-safe System.properties copy implementation. - * + * * @see http://jira.codehaus.org/browse/MNG-5670 */ public static void addSystemProperties( Properties props ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java index 885048e..80189e7 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java +++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java @@ -339,5 +339,5 @@ public class ArtifactTransferEvent } return true; } - + } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java index dd91e7a..8ed081f 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java +++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java @@ -21,7 +21,7 @@ package org.apache.maven.repository; /** * Describes a resource being uploaded or downloaded by the repository system. - * + * * @author Benjamin Bentmann */ public interface ArtifactTransferResource @@ -30,35 +30,35 @@ public interface ArtifactTransferResource /** * The base URL of the repository, e.g. "http://repo1.maven.org/maven2/";. Unless the URL is unknown, it will be * terminated by a trailing slash. - * + * * @return The base URL of the repository or an empty string if unknown, never {@code null}. */ String getRepositoryUrl(); /** * The path of the artifact relative to the repository's base URL. - * + * * @return The path of the artifact, never {@code null}. */ String getName(); /** * Gets the full URL of the artifact. - * + * * @return The full URL of the artifact, never {@code null}. */ String getUrl(); /** * The size of the artifact in bytes. - * + * * @return The of the artifact in bytes or a negative value if unknown. */ long getContentLength(); /** * Gets the timestamp when the transfer of this artifact was started. - * + * * @return The timestamp when the transfer of this artifact was started. */ long getTransferStartTime(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java index 491d575..f47cb4b 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java +++ b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java @@ -185,7 +185,7 @@ public class DelegatingLocalArtifactRepository { return false; } - + DelegatingLocalArtifactRepository other = (DelegatingLocalArtifactRepository) obj; return eq( buildReactor, other.buildReactor ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java index 7e54487..e33789e 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java +++ b/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java @@ -24,10 +24,10 @@ import org.apache.maven.artifact.repository.MavenArtifactRepository; public abstract class LocalArtifactRepository extends MavenArtifactRepository -{ +{ public static final String IDE_WORKSPACE = "ide-workspace"; public abstract Artifact find( Artifact artifact ); - public abstract boolean hasLocalMetadata(); + public abstract boolean hasLocalMetadata(); } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java b/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java index 72c2311..54e4ef4 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java +++ b/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java @@ -23,7 +23,7 @@ import java.io.IOException; /** * Signals a failure to store files within the local repository. - * + * * @author Benjamin Bentmann */ public class LocalRepositoryNotAccessibleException http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java index d334f6b..8d1e516 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java +++ b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java @@ -140,7 +140,7 @@ public interface RepositorySystem void injectProxy( RepositorySystemSession session, List<ArtifactRepository> repositories ); void injectAuthentication( RepositorySystemSession session, List<ArtifactRepository> repositories ); - + ArtifactResolutionResult resolve( ArtifactResolutionRequest request ); // Install http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java index 072baac..67b4080 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java +++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java @@ -27,7 +27,7 @@ import org.apache.maven.artifact.Artifact; * @author <a href="mailto:[email protected]";>Jason van Zyl</a> */ public class ArtifactMetadataRetrievalException - extends Exception + extends Exception { private Artifact artifact; http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java index 63627db..93b9d5d 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java @@ -29,7 +29,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; /** * Forms a request to retrieve artifact metadata. - * + * * @author Benjamin Bentmann */ public class DefaultMetadataResolutionRequest http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java index f0fab77..a652c97 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java @@ -27,7 +27,7 @@ import org.apache.maven.artifact.repository.RepositoryRequest; /** * Forms a request to retrieve artifact metadata. - * + * * @author Benjamin Bentmann */ public interface MetadataResolutionRequest @@ -36,14 +36,14 @@ public interface MetadataResolutionRequest /** * Indicates whether network access to remote repositories has been disabled. - * + * * @return {@code true} if remote access has been disabled, {@code false} otherwise. */ boolean isOffline(); /** * Enables/disables network access to remote repositories. - * + * * @param offline {@code true} to disable remote access, {@code false} to allow network access. * @return This request, never {@code null}. */ @@ -51,14 +51,14 @@ public interface MetadataResolutionRequest /** * Gets the artifact to resolve metadata for. - * + * * @return The artifact to resolve metadata for or {@code null} if not set. */ Artifact getArtifact(); /** * Sets the artifact for which to resolve metadata. - * + * * @param artifact The artifact for which to resolve metadata. * @return This request, never {@code null}. */ @@ -66,14 +66,14 @@ public interface MetadataResolutionRequest /** * Gets the local repository to use for the resolution. - * + * * @return The local repository to use for the resolution or {@code null} if not set. */ ArtifactRepository getLocalRepository(); /** * Sets the local repository to use for the resolution. - * + * * @param localRepository The local repository to use for the resolution. * @return This request, never {@code null}. */ @@ -81,14 +81,14 @@ public interface MetadataResolutionRequest /** * Gets the remote repositories to use for the resolution. - * + * * @return The remote repositories to use for the resolution, never {@code null}. */ List<ArtifactRepository> getRemoteRepositories(); /** * Sets the remote repositories to use for the resolution. - * + * * @param remoteRepositories The remote repositories to use for the resolution. * @return This request, never {@code null}. */ @@ -96,14 +96,14 @@ public interface MetadataResolutionRequest /** * Determines whether the managed version information should be retrieved. - * + * * @return {@code true} if the dependency management information should be retrieved, {@code false} otherwise. */ boolean isResolveManagedVersions(); /** * Enables/disables resolution of the dependency manageemnt information. - * + * * @param resolveManagedVersions {@code true} if the dependency management information should be retrieved, {@code * false} otherwise. * @return This request, never {@code null}. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java b/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java index 5f5fe47..4e3520d 100644 --- a/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java +++ b/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java @@ -21,7 +21,7 @@ package org.apache.maven.rtinfo; /** * Provides information about the current Maven runtime. - * + * * @since 3.0.2 */ public interface RuntimeInformation @@ -29,7 +29,7 @@ public interface RuntimeInformation /** * Retrieves the current Maven version, for example "3.0.2". - * + * * @return The current Maven version or an empty string if unknown, never {@code null}. */ String getMavenVersion(); @@ -38,7 +38,7 @@ public interface RuntimeInformation * Checks whether the current Maven runtime matches the specified version range. A version range can either use the * usual mathematical syntax "[2.0.10,2.1.0),[3.0,)" or use a single version "2.2.1". The latter is a short form for * "[2.2.1,)", i.e. denotes the minimum version required. - * + * * @param versionRange The version range to match the current Maven runtime against, must not be {@code null}. * @return {@code true} if the current Maven runtime matches the specified version range, {@code false} otherwise. * @throws IllegalArgumentException If the specified version range is {@code null}, empty or otherwise not a valid http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java index ea8b677..ae62ea2 100644 --- a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java +++ b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java @@ -31,7 +31,7 @@ import com.google.inject.util.Providers; public class SessionScope implements Scope -{ +{ private static final Provider<Object> SEEDED_KEY_PROVIDER = new Provider<Object>() { public Object get() http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java index 7c39474..733f308 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java @@ -112,17 +112,17 @@ public abstract class DefaultToolchain // should have been AbstractToolchain... { return false; } - + if ( this == obj ) { return true; } - + if ( !( obj instanceof DefaultToolchain ) ) { return false; } - + DefaultToolchain other = (DefaultToolchain) obj; if ( type == null ? other.type != null : !type.equals( other.type ) ) @@ -132,12 +132,12 @@ public abstract class DefaultToolchain // should have been AbstractToolchain... Properties thisProvides = this.getModel().getProvides(); Properties otherProvides = other.getModel().getProvides(); - + if ( thisProvides == null ? otherProvides != null : !thisProvides.equals( otherProvides ) ) { return false; } - + return true; } @@ -145,7 +145,7 @@ public abstract class DefaultToolchain // should have been AbstractToolchain... public int hashCode() { int hashCode = ( type == null ) ? 0 : type.hashCode(); - + if ( this.getModel().getProvides() != null ) { hashCode = 31 * hashCode + this.getModel().getProvides().hashCode(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java index 95fe15f..591afd8 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java @@ -84,7 +84,7 @@ public class DefaultToolchainManager desc.setArtifactId( PluginDescriptor.getDefaultPluginArtifactId( "toolchains" ) ); MavenProject current = session.getCurrentProject(); - + if ( current != null ) { //TODO: why is this using the context http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java index c6c6ebf..2a71346 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java @@ -21,7 +21,7 @@ package org.apache.maven.toolchain; /** * Toolchain interface. - * + * * @author Milos Kleint * @author Jason van Zyl * @since 2.0.9 @@ -31,7 +31,7 @@ public interface Toolchain /** * get the type of toolchain. - * + * * @return the toolchain type */ String getType(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java index c1c2aa9..115eede 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java @@ -23,7 +23,7 @@ import org.apache.maven.toolchain.model.ToolchainModel; /** * Internal toolchain factory, to prepare toolchains instances. - * + * * @author mkleint * @since 2.0.9 */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java index 2150a19..249a1a5 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java @@ -24,7 +24,7 @@ import org.apache.maven.execution.MavenSession; /** * Public API for a toolchain-aware plugin to get expected toolchain instance. - * + * * @author mkleint * @since 2.0.9 */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java index a877772..67131ac 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java @@ -24,7 +24,7 @@ import org.apache.maven.execution.MavenSession; /** * Component for use by the <code>maven-toolchains-plugin</code> only. - * + * * @author mkleint * @since 2.0.9 */ @@ -33,7 +33,7 @@ public interface ToolchainManagerPrivate /** * Retrieves the toolchains of given type from the user settings. - * + * * @since 3.0 (addition of the <code>MavenSession</code> parameter) */ ToolchainPrivate[] getToolchainsForType( String type, MavenSession context ) @@ -41,7 +41,7 @@ public interface ToolchainManagerPrivate /** * Stores the toolchain into build context. - * + * * @since 2.0.9 */ void storeToolchainToBuildContext( ToolchainPrivate toolchain, MavenSession context ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java index 4d94a13..4bb4052 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java @@ -26,7 +26,7 @@ import org.apache.maven.toolchain.model.PersistedToolchains; /** * Builds the toolchains model from a previously configured filesystem path to the toolchains file. * <strong>Note:</strong> This is an internal component whose interface can change without prior notice. - * + * * @author Benjamin Bentmann */ public interface ToolchainsBuilder @@ -34,7 +34,7 @@ public interface ToolchainsBuilder /** * Builds the toolchains model from the configured toolchain files. - * + * * @param userToolchainsFile The path to the toolchains file, may be <code>null</code> to disable parsing. * @return The toolchains model or <code>null</code> if no toolchain file was configured or the configured file does * not exist. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java index 494aaf8..cb14ada 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java @@ -23,7 +23,7 @@ import org.apache.maven.toolchain.Toolchain; /** * JDK toolchain interface. - * + * * @author Jason van Zyl * @author Milos Kleint * @since 2.0.9, renamed from JavaToolChain in 3.2.4 http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java index 9b790d8..017caa6 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java @@ -39,7 +39,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom; * JDK toolchain factory. * This is a <code>ToolchainFactory</code> Plexus component registered with * <code>jdk</code> hint. - * + * * @author mkleint * @since 2.0.9, renamed from <code>DefaultJavaToolchainFactory</code> in 3.2.4 */ @@ -62,7 +62,7 @@ public class JavaToolchainFactory JavaToolchainImpl jtc = new JavaToolchainImpl( model, logger ); // populate the provides section - Properties provides = model.getProvides(); + Properties provides = model.getProvides(); for ( Entry<Object, Object> provide : provides.entrySet() ) { String key = (String) provide.getKey(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java index 71c2ce8..e65bcb1 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java @@ -29,7 +29,7 @@ import org.codehaus.plexus.util.Os; /** * JDK toolchain implementation. - * + * * @author Milos Kleint * @since 2.0.9, renamed from DefaultJavaToolChain in 3.2.4 */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/mdo/toolchains.mdo ---------------------------------------------------------------------- diff --git a/maven-core/src/main/mdo/toolchains.mdo b/maven-core/src/main/mdo/toolchains.mdo index 101d724..2ea3389 100644 --- a/maven-core/src/main/mdo/toolchains.mdo +++ b/maven-core/src/main/mdo/toolchains.mdo @@ -61,10 +61,10 @@ <![CDATA[ public static final String USER_LEVEL = "user-level"; public static final String GLOBAL_LEVEL = "global-level"; - + private String sourceLevel = USER_LEVEL; private boolean sourceLevelSet = false; - + public void setSourceLevel( String sourceLevel ) { if ( sourceLevelSet ) @@ -81,7 +81,7 @@ this.sourceLevelSet = true; } } - + public String getSourceLevel() { return sourceLevel; @@ -139,7 +139,7 @@ <p>Toolchain identification information, which will be matched against project requirements.</p> <p>Actual content structure is completely open: each toolchain type will define its own format and semantics.</p> <p>In general, this is a properties format: <code><name>value</name></code> with - predefined properties names.</p> + predefined properties names.</p> ]]></description> </field> <field> @@ -168,7 +168,7 @@ <p>Toolchain configuration information, like location or any information that is to be retrieved.</p> <p>Actual content structure is completely open: each toochain type will define its own format and semantics.</p> <p>In general, this is a properties format: <code><name>value</name></code> with - per-toolchain defined properties names.</p> + per-toolchain defined properties names.</p> ]]></description> </field> </fields> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml index 855e9b7..05795be 100644 --- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml +++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml @@ -19,7 +19,7 @@ specific language governing permissions and limitations under the License. --> -<!-- +<!-- Artifact handlers are required by the dependency resolution mechanism. @@ -37,8 +37,8 @@ Artifact handlers are required by the dependency resolution mechanism. <configuration> <type>pom</type> </configuration> - </component> - + </component> + <!-- | JAR |--> @@ -52,9 +52,9 @@ Artifact handlers are required by the dependency resolution mechanism. <addedToClasspath>true</addedToClasspath> </configuration> </component> - + <!-- - | EJB + | EJB |--> <component> <role>org.apache.maven.artifact.handler.ArtifactHandler</role> @@ -90,7 +90,7 @@ Artifact handlers are required by the dependency resolution mechanism. <language>java</language> <addedToClasspath>false</addedToClasspath> </configuration> - </component> + </component> <!-- | TEST JAR @@ -141,7 +141,7 @@ Artifact handlers are required by the dependency resolution mechanism. </component> <!-- - | JAVADOC JAR + | JAVADOC JAR |--> <component> <role>org.apache.maven.artifact.handler.ArtifactHandler</role> @@ -157,7 +157,7 @@ Artifact handlers are required by the dependency resolution mechanism. </component> <!-- - | WAR + | WAR |--> <component> <role>org.apache.maven.artifact.handler.ArtifactHandler</role> @@ -172,7 +172,7 @@ Artifact handlers are required by the dependency resolution mechanism. </component> <!-- - | EAR + | EAR |--> <component> <role>org.apache.maven.artifact.handler.ArtifactHandler</role> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml index 7149f2d..79d6c52 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -19,7 +19,7 @@ specific language governing permissions and limitations under the License. --> -<!-- +<!-- Mappings to default lifecycle, specific for each packaging. @@ -51,8 +51,8 @@ Mappings to default lifecycle, specific for each packaging. </lifecycle> </lifecycles> </configuration> - </component> - + </component> + <!-- | JAR |--> @@ -96,9 +96,9 @@ Mappings to default lifecycle, specific for each packaging. </lifecycles> </configuration> </component> - + <!-- - | EJB + | EJB |--> <component> <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role> @@ -139,7 +139,7 @@ Mappings to default lifecycle, specific for each packaging. </lifecycle> </lifecycles> </configuration> - </component> + </component> <component> <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role> <role-hint>ejb3</role-hint> @@ -179,7 +179,7 @@ Mappings to default lifecycle, specific for each packaging. </lifecycle> </lifecycles> </configuration> - </component> + </component> <!-- | MAVEN PLUGIN @@ -202,7 +202,7 @@ Mappings to default lifecycle, specific for each packaging. </compile> <process-classes> org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor - </process-classes> + </process-classes> <process-test-resources> org.apache.maven.plugins:maven-resources-plugin:2.6:testResources </process-test-resources> @@ -227,10 +227,10 @@ Mappings to default lifecycle, specific for each packaging. </lifecycle> </lifecycles> </configuration> - </component> + </component> <!-- - | WAR + | WAR |--> <component> <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role> @@ -271,10 +271,10 @@ Mappings to default lifecycle, specific for each packaging. </lifecycle> </lifecycles> </configuration> - </component> + </component> <!-- - | EAR + | EAR |--> <component> <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role> @@ -350,7 +350,7 @@ Mappings to default lifecycle, specific for each packaging. </lifecycle> </lifecycles> </configuration> - </component> + </component> <!-- | PAR @@ -394,6 +394,6 @@ Mappings to default lifecycle, specific for each packaging. </lifecycle> </lifecycles> </configuration> - </component> + </component> </components> </component-set> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/resources/org/apache/maven/messages/messages_pl.properties ---------------------------------------------------------------------- diff --git a/maven-core/src/main/resources/org/apache/maven/messages/messages_pl.properties b/maven-core/src/main/resources/org/apache/maven/messages/messages_pl.properties index 8360f59..36a292b 100644 --- a/maven-core/src/main/resources/org/apache/maven/messages/messages_pl.properties +++ b/maven-core/src/main/resources/org/apache/maven/messages/messages_pl.properties @@ -25,8 +25,8 @@ not.directory.warning={0} nie jest katalogiem. not.writable.warning=Nie mo\u017cesz zapisa\u0107 {0}. cannot.create.directory.warning=Nie mo\u017cesz utworzy\u0107 katalogu {0}. maven.repo.local.unset.warning=maven.repo.local nie jest zdefiniowane. -single.unsatisfied.dependency.error=Budownaie przerwane z powodu nast\u0119puj\u0105cej niespe\u0142nionej zale\u017cno\u015bci: -multiple.unsatisfied.dependency.error=Budownaie przerwane z powodu nast\u0119puj\u0105cych niespe\u0142nionych zale\u017cno\u015bci: +single.unsatisfied.dependency.error=Budownaie przerwane z powodu nast\u0119puj\u0105cej niespe\u0142nionej zale\u017cno\u015bci: +multiple.unsatisfied.dependency.error=Budownaie przerwane z powodu nast\u0119puj\u0105cych niespe\u0142nionych zale\u017cno\u015bci: offline.snapshot.warning=Pracujesz w trybie offline, wi\u0119c budowanie b\u0119dzie kontunuowane, cho\u0107 {0} mo\u017ce by\u0107 nieaktualny! download.message=Pr\u00f3buj\u0119 \u015bci\u0105gn\u0105\u0107 {0}. plugin.loading.error=Nie uda\u0142o si\u0119 za\u0142adowa\u0107 pluginu {0}. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/configuration-management.apt ---------------------------------------------------------------------- diff --git a/maven-core/src/site/apt/configuration-management.apt b/maven-core/src/site/apt/configuration-management.apt index 7c70abc..4af0f0b 100644 --- a/maven-core/src/site/apt/configuration-management.apt +++ b/maven-core/src/site/apt/configuration-management.apt @@ -23,10 +23,10 @@ Configuration levels in maven - In maven configuration control happens on four differ levels: the site level, the group level, + In maven configuration control happens on four differ levels: the site level, the group level, the project level, and the user level. On the site level you can configure maven for all users - utilizing the local installation, the group level allows configuration management for all the projects - that belong to the same group, the project level allows configuration management at + utilizing the local installation, the group level allows configuration management for all the projects + that belong to the same group, the project level allows configuration management at the project level, and the user level allows users to override settings on the site level, group level and project level. @@ -81,7 +81,7 @@ ${maven.home} User configuration which is utilized site wide are controlled with the ${user.home}/.m2/maven.properties. - User configuration which is utilized at the project level are controlled with the + User configuration which is utilized at the project level are controlled with the ${project.home}/maven.properties file. Plugin configuration @@ -111,7 +111,7 @@ Unified source directory in a known location. This would also help with developer setup i.e. getting new developers up and running. They could run a maven command and have all their source trees set up in the same way as their collegues. - + here's what I do currently in the netbeans part of the mevenide project to find the relevant subprojects/sibling projects. I check if the user has defined the maven.multiproject.includes property in any of his properties http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/default-bindings.apt.vm ---------------------------------------------------------------------- diff --git a/maven-core/src/site/apt/default-bindings.apt.vm b/maven-core/src/site/apt/default-bindings.apt.vm index 607f244..02d6c4a 100644 --- a/maven-core/src/site/apt/default-bindings.apt.vm +++ b/maven-core/src/site/apt/default-bindings.apt.vm @@ -22,7 +22,7 @@ --- 2013-08-02 --- - + Plugin Bindings for <<<default>>> Lifecycle Reference The {{{./lifecycles.html}<<<default>>> lifecycle}} is defined without any plugin binding; plugin bindings are defined separately @@ -65,4 +65,3 @@ Plugin Bindings for <<<default>>> Lifecycle Reference * Plugin bindings for <<<par>>> packaging %{snippet|id=par-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml} - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/getting-to-container-configured-mojos.apt ---------------------------------------------------------------------- diff --git a/maven-core/src/site/apt/getting-to-container-configured-mojos.apt b/maven-core/src/site/apt/getting-to-container-configured-mojos.apt index 4daa6c1..1c4a487 100644 --- a/maven-core/src/site/apt/getting-to-container-configured-mojos.apt +++ b/maven-core/src/site/apt/getting-to-container-configured-mojos.apt @@ -34,9 +34,9 @@ Abstract If these mojos are to be first-class components, the configuration from these various sources must be consolidated and injected using the container. - Currently, mojo configuration is done externally to the container, in the + Currently, mojo configuration is done externally to the container, in the DefaultPluginManager in the maven-core API. In order to get from here to - there, we need to do several things to add capability to the default + there, we need to do several things to add capability to the default configuration of plexus. This document will detail those changes. Container Enhancements @@ -59,7 +59,7 @@ Container Enhancements components. This wouldn't be a problem, except for the local instance of DefaultExpressionEvaluator used within. See the above discussion for more on why this evaluator is bad. We need to provide either an alternative - implementation under a different roleHint, or else replace the + implementation under a different roleHint, or else replace the BasicComponentConfigurator. * Other @@ -95,7 +95,7 @@ Maven Modifications * MavenSession - We may need to enable the context injection here, since this will be + We may need to enable the context injection here, since this will be instantiated per-project. If we always inject the same context parameters, and are careful to inject nulls where things are missing, we should be able to minimize reconfiguration artifacts injected from basic parameters. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/inheritance.apt ---------------------------------------------------------------------- diff --git a/maven-core/src/site/apt/inheritance.apt b/maven-core/src/site/apt/inheritance.apt index 41fa3f9..dbf0e2c 100644 --- a/maven-core/src/site/apt/inheritance.apt +++ b/maven-core/src/site/apt/inheritance.apt @@ -30,7 +30,7 @@ Inheritance in Maven * how parent poms are processed * the order in which elements in the POM are overridden - + * minimum element-set for a valid project pom @@ -70,31 +70,31 @@ Extending the POM in the future In order to anticipate changes in the structure of the POM as new releases of maven occur, the maven inheritance model must be pinned against a particular - modelVersion. This is required so that a change from modelVersion 4.0.0 to - 4.1.0 doesn't cause compatibility problems with users who have not upgraded + modelVersion. This is required so that a change from modelVersion 4.0.0 to + 4.1.0 doesn't cause compatibility problems with users who have not upgraded their projects. It also allows for a certain amount of legacy support into the future. Therefore, we should rename this file from pom.xml in the maven-core - jarfile to pom-4.0.0.xml (and successive revisions to the base pom made to + jarfile to pom-4.0.0.xml (and successive revisions to the base pom made to accommodate changes in the model will be named accordingly - 4.0.1, 4.0.2, ...). - + Minimum Element-Set for a Project POM In order to furnish a basic set of information which we need to distinguish one project from another, maven requires a minimum set of elements to be specified in each project's pom.xml. - + - [modelVersion] tells maven which version of the object model this project is compliant with (to support future legacy concerns) - + - [artifactId] tells maven what the artifact name is for this particular project. Each project should have a distinct artifactId. - + - [version] tells maven what release of this artifact we're trying to produce. The fact that a project has a distinct pom.xml should indicate a separate release cycle that is also distinct to that project, so a concrete version declaration is required. - - - [name] tells maven what the user-friendly name of this project is. The name + + - [name] tells maven what the user-friendly name of this project is. The name element is similar to artifactId in that it is a unique descriptor for this and only this project, and therefore should be concretely defined. - + http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/lifecycles.apt.vm ---------------------------------------------------------------------- diff --git a/maven-core/src/site/apt/lifecycles.apt.vm b/maven-core/src/site/apt/lifecycles.apt.vm index 584a77d..3e47bc9 100644 --- a/maven-core/src/site/apt/lifecycles.apt.vm +++ b/maven-core/src/site/apt/lifecycles.apt.vm @@ -22,7 +22,7 @@ ----- 2013-08-02 ----- - + Lifecycles Reference Maven defines 3 lifecycles in <<<META-INF/plexus/components.xml>>>: http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/offline-mode.apt ---------------------------------------------------------------------- diff --git a/maven-core/src/site/apt/offline-mode.apt b/maven-core/src/site/apt/offline-mode.apt index b64e2da..faec70f 100644 --- a/maven-core/src/site/apt/offline-mode.apt +++ b/maven-core/src/site/apt/offline-mode.apt @@ -22,21 +22,21 @@ --- 08-April-2005 --- - + Offline Mode Design * UPDATE: 18-April-2005 - We cannot take the approach outlined below of detecting which remote - repositories are "really" offline, since offline mode is more of a behavior, + We cannot take the approach outlined below of detecting which remote + repositories are "really" offline, since offline mode is more of a behavior, and this will lead to counter-intuitive results. A different feature may exist unimplemented, which is to detect when the network is down and provide better - feedback for that case. However, when offline mode is declared, nothing + feedback for that case. However, when offline mode is declared, nothing earmarked as remote should be accessed, regardless of whether it is actually a physically local resource. - + NOTE: One side-effect of this design change is that all offline-mode code can - be isolated to maven-core, maven-plugin-descriptor, and [possibly] + be isolated to maven-core, maven-plugin-descriptor, and [possibly] maven-artifact. Usage of maven-wagon will be determined by an offline-aware manager. @@ -64,11 +64,11 @@ Offline Mode Design * Not all "remote" repositories will fail. Specifically, if the remote repo uses the file:// protocol, and it doesn't refer to a shared filesystem, it will continue to be available. - + The question remaining is: Which level of offline mode will we support? It seems reasonable to assume that users will be able to tell when localhost is not active (in most cases, localhost should be available, even if the rest of - the network is not). Therefore, let's concentrate on the state where no + the network is not). Therefore, let's concentrate on the state where no network <beyond localhost> exists, and leave the more extreme state to users to diagnose and correct as necessary. @@ -77,31 +77,31 @@ Offline Mode Design Offline mode is essential for breaking the requirement that m2 operate in a network-connected environment. It means legitimizing a development environment in which there is no network connection, and providing a robust m2 service - offering in such circumstances. Introduction of offline mode allows m2 to + offering in such circumstances. Introduction of offline mode allows m2 to anticipate the inevitable network failures that accompany being physically disconnected from the network, and adjust it's behavior accordingly. - + It is more than simply understanding that m2 cannot go and check for the - latest version of some snapshot artifact. If m2 is offline, SCM operations - cannot succeed; no artifact downloads can take place, regardless of whether - they are snapshot versions; artifact deployment cannot take place; certain - types of tests cannot be setup, since the container used to run them cannot be + latest version of some snapshot artifact. If m2 is offline, SCM operations + cannot succeed; no artifact downloads can take place, regardless of whether + they are snapshot versions; artifact deployment cannot take place; certain + types of tests cannot be setup, since the container used to run them cannot be reached or started. - + All of these operations will produce their own unique errors in the absence of a coordinated offline strategy. In addition, efforts to unite these failing - behaviors behind a consistent user interface is much, much more difficult if + behaviors behind a consistent user interface is much, much more difficult if the system can't tell whether it has access to the network required by these operations. - + Offline mode really means anticipating a lack of network connectivity, and as a result turning off certain services provided by m2 and providing a coherent way of predicting and reporting when network-related failures will take place. - It means warning users that since the network is missing, certain features and - operations will be unavailable, rather than simply waiting for those - operations to fail, then trying to help users decipher the error messages they + It means warning users that since the network is missing, certain features and + operations will be unavailable, rather than simply waiting for those + operations to fail, then trying to help users decipher the error messages they get as a result. - + * Implications for Resolution ** Dependency Resolution @@ -131,7 +131,7 @@ Offline Mode Design This can be a problem if the tests are more than simple unit tests; that is, if they require configuration of a server process, and subsequent testing in-container. - + Since we're only going to concern ourselves with states where localhost is still active, we only need to worry about this case when the server container is <<not>> installed on localhost. This allows the popular pattern of starting @@ -165,11 +165,11 @@ Offline Mode Design ** Maven-Artifact This is wholly dependent on Maven-Wagon, above. - + We could possibly use a flag on a particular Wagon to see whether it supports offline mode, and then test to see if the file-based basedir for an aritfact repository works...if it doesn't work, we can mark that repository offline... - + OTOH, all offline-mode checks can probably be run from Wagon-based APIs. ** Maven-SCM @@ -178,7 +178,7 @@ Offline Mode Design having access to the versioning server. Therefore, it is assumed that any SCM-related activity will be unavailable when m2 is in offline mode. - + ** Maven-Core We'll examine the different parts of maven-core on a case-by-case @@ -195,14 +195,14 @@ Offline Mode Design [true] Online status is required for this mojo to function correctly. - [false] <<(Default)>> Either status is acceptable for the mojo to + [false] <<(Default)>> Either status is acceptable for the mojo to execute. It doesn't care. The majority of mojos will leave the requiresOnline == false, since online/offline status will be irrelevant, provided they have access to their required artifacts and other classpath elements. In the case - of required artifacts and other classpath elemtents, this is assumed by the - mojo API to be in a correct state, and will be handled by the Wagon + of required artifacts and other classpath elemtents, this is assumed by the + mojo API to be in a correct state, and will be handled by the Wagon modifications. @@ -226,44 +226,44 @@ Offline Mode Design a offline status parameter which is used when retrieving the specific Wagon. If <<<offline == true>>>: - + * If the wagon is not bound to "file://", then ignore the request and print a debug message. * If the wagon is bound to "file://" then: Retrieve the file or base-url file to be "downloaded". - + * If the file (or more usefully, the base-url file) exists, proceed. * If the file (or base-url file) doesn't exist, assume that this location - is part of a file-share. Ignore the request and print a debug message + is part of a file-share. Ignore the request and print a debug message as above. ** Control over mojos in the lifecycle - When binding a mojo to the project's lifecycle instance, check the mojo + When binding a mojo to the project's lifecycle instance, check the mojo descriptor's requiredConnectivity field. * If <<<(offline == true) && (requiresOnline != true)>>>, bind - the mojo to the lifecycle. - + the mojo to the lifecycle. + In this case, the client is <<offline>>, and the mojo does not require online status. * If <<<(offline == false) && (requiresOnline == true)>>>, bind the mojo to the lifecycle. - In this case, the client is <<online>>, and the mojo either requires + In this case, the client is <<online>>, and the mojo either requires <<online>> status, or else doesn't care. * Otherwise, don't bind the mojo. Log a debug message to indicate that it is sensitive the the online state of the application, and that this state is currently wrong for execution. - <<NOTE:>> Do we want to fail when we cannot bind a mojo to the lifecycle - because of offline/online status? That would probably indicate that the user - was trying to do something they cannot succeed at for now...so we probably + <<NOTE:>> Do we want to fail when we cannot bind a mojo to the lifecycle + because of offline/online status? That would probably indicate that the user + was trying to do something they cannot succeed at for now...so we probably should throw an exception in this case. - + http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/plugin-execution-isolation.apt ---------------------------------------------------------------------- diff --git a/maven-core/src/site/apt/plugin-execution-isolation.apt b/maven-core/src/site/apt/plugin-execution-isolation.apt index e64ae26..983a9fd 100644 --- a/maven-core/src/site/apt/plugin-execution-isolation.apt +++ b/maven-core/src/site/apt/plugin-execution-isolation.apt @@ -22,7 +22,7 @@ ----- Maven plugin execution isolation - + Maven2 takes advantage of Plexus' ability to execute a component using a ClassWorlds ClassRealm that is populated with the JAR containing the component in question and all of its dependencies. Using ClassWorlds @@ -45,13 +45,13 @@ Maven plugin execution isolation in a hierachical structure where the resources in the parent realms are available but the <<realm is searched first before a search is made in the parent realm>>. - + Plugins are guaranteed to be provided the resources found in <<<plexus.core>>> and <<<plexus.core.maven>>> realms at run-time if required. Plugins can state compile-time dependencies on any of the resources found in the core realms listed above and these dependencies will be included in the - plugin descriptor that is generated but when running within Maven these + plugin descriptor that is generated but when running within Maven these resources will be filtered out. In other words these resources will not be added the realm created for the plugins execution as they are provided in the parent realms. - +
