diff --git a/apache-maven/README.txt b/apache-maven/README.txt index 935aa67342..827fdb79ba 100644 --- a/apache-maven/README.txt +++ b/apache-maven/README.txt @@ -39,7 +39,7 @@ Installing Maven ---------------- - 1) Unpack the archive where you would like to store the binaries, eg: + 1) Unpack the archive where you would like to store the binaries, e.g.: Unix-based operating systems (Linux, Solaris and Mac OS X) tar zxvf apache-maven-3.x.y.tar.gz @@ -48,7 +48,7 @@ 2) A directory called "apache-maven-3.x.y" will be created. - 3) Add the bin directory to your PATH, eg: + 3) Add the bin directory to your PATH, e.g.: Unix-based operating systems (Linux, Solaris and Mac OS X) export PATH=/usr/local/apache-maven-3.x.y/bin:$PATH diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java index d3706179a6..bbc6733e90 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java @@ -22,7 +22,7 @@ package org.apache.maven.artifact.resolver; import org.apache.maven.artifact.Artifact; /** - * Indiciates a cycle in the dependency graph. + * Indicates a cycle in the dependency graph. * * @author Brett Porter */ diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index e7d24c43fa..f434ef0693 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@ -33,7 +33,7 @@ import java.util.Stack; * *

Features: *

* Unknown qualifiers are considered after known qualifiers, with lexical order (always case insensitive), * - *
  • a dash usually precedes a qualifier, and is always less important than something preceded with a dot.
    • + *
  • a hyphen usually precedes a qualifier, and is always less important than something preceded with a dot.
    • *

    * * @see "Versioning" on Maven Wiki diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java index 99b2b85b81..b5e43d4209 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java @@ -180,7 +180,7 @@ public class DefaultArtifactVersion fallback = Pattern.compile( "\\d+" ).matcher( qualifier ).matches(); } - // string tokenzier won't detect these and ignores them + // string tokenizer won't detect these and ignores them if ( part1.contains( ".." ) || part1.startsWith( "." ) || part1.endsWith( "." ) ) { fallback = true; diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index c7405047c2..2b205f77e0 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -34,7 +34,7 @@ under the License. Maven2 classes maintained as compatibility layer. - false + false diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java b/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java index 376eba20e3..ca6bb206a2 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java @@ -40,7 +40,7 @@ public interface ArtifactInstaller * @param artifact the artifact definition * @param localRepository the local repository to install into * @throws ArtifactInstallationException if an error occurred installing the artifact - * @deprecated to be removed before 2.0 after the instlal/deploy plugins use the alternate + * @deprecated to be removed before 2.0 after the install/deploy plugins use the alternate * method */ @Deprecated diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java index 06da7e3e75..6ca4fe7221 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java @@ -24,7 +24,7 @@ import org.apache.maven.artifact.Artifact; /** * Do not use! *

    - * Should only be implmemented by DebugResolutionListener. Remove this + * Should only be implemented by DebugResolutionListener. Remove this * when the ResolutionListener interface deprecation of the manageArtifact * method (and the [yet to be done] addition of these methods to that * interface) has had a chance to propagate to all interested plugins. diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java index 7a9ec09039..e3e0cb788b 100644 --- a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java +++ b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java @@ -62,7 +62,7 @@ public class DefaultProfileManager /** * @deprecated without passing in the system properties, the SystemPropertiesProfileActivator will not work - * correctly in embedded envirnments. + * correctly in embedded environments. */ public DefaultProfileManager( PlexusContainer container ) { diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java index fa67041b1a..eab3660105 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java +++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java @@ -230,7 +230,7 @@ public class DefaultModelInheritanceAssembler } } - assembleDistributionInheritence( child, parent, childPathAdjustment, appendPaths ); + assembleDistributionInheritance( child, parent, childPathAdjustment, appendPaths ); // issueManagement if ( child.getIssueManagement() == null ) @@ -569,7 +569,7 @@ public class DefaultModelInheritanceAssembler } } - private void assembleDistributionInheritence( Model child, Model parent, String childPathAdjustment, + private void assembleDistributionInheritance( Model child, Model parent, String childPathAdjustment, boolean appendPaths ) { if ( parent.getDistributionManagement() != null ) diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java index ef4edca512..bf8a63b4e4 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java +++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java @@ -35,7 +35,7 @@ public interface ModelInheritanceAssembler void assembleModelInheritance( Model child, Model parent ); - void assembleBuildInheritance( Build childBuild, Build parentBuild, boolean handleAsInheriance ); + void assembleBuildInheritance( Build childBuild, Build parentBuild, boolean handleAsInheritance ); void copyModel( Model dest, Model source ); } diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java index 4601eee5dc..88168f1f2d 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java @@ -477,7 +477,7 @@ public class DefaultLegacyArtifactCollector manageArtifact( child, managedVersions, listeners ); // Also, we need to ensure that any exclusions it presents are - // added to the artifact before we retrive the metadata + // added to the artifact before we retrieve the metadata // for the artifact; otherwise we may end up with unwanted // dependencies. Artifact ma = managedVersions.get( childKey ); @@ -691,7 +691,7 @@ public class DefaultLegacyArtifactCollector { fireEvent( ResolutionListener.UPDATE_SCOPE, listeners, nearest, farthestArtifact ); - // previously we cloned the artifact, but it is more effecient to just update the artifactScope + // previously we cloned the artifact, but it is more efficient to just update the artifactScope // if problems are later discovered that the original object needs its original artifactScope value, // cloning may // again be appropriate diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java index bdccf6a5c0..eb871216d1 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java @@ -31,7 +31,7 @@ public class MetadataGraphVertex { ArtifactMetadata md; - // indications to use these in comparrison + // indications to use these in comparison private boolean compareVersion = false; private boolean compareScope = false; diff --git a/maven-compat/src/main/mdo/profiles.mdo b/maven-compat/src/main/mdo/profiles.mdo index 3dcc9962f6..bcaabd202a 100644 --- a/maven-compat/src/main/mdo/profiles.mdo +++ b/maven-compat/src/main/mdo/profiles.mdo @@ -187,7 +187,7 @@ under the License. 1.0.0 @@ -249,7 +249,7 @@ under the License. RepositoryBase 1.0.0 - Repository contains the information needed for establishing connections with remote repoistory + Repository contains the information needed for establishing connections with remote repository diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java index 8e4f39d02e..98da0f5aa4 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java @@ -42,7 +42,7 @@ public class ProjectInheritanceTest // p3 inherits from p2 // p2 inherits from p1 // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java index e6efcc4d7e..1aa749b598 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java @@ -38,7 +38,7 @@ public class ProjectInheritanceTest // p3 inherits from p2 // p2 inherits from p1 // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java index 6e9a7a3d4d..2b783431ce 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java @@ -49,7 +49,7 @@ public class ProjectInheritanceTest // p3 inherits from p2 // p2 inherits from p1 // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java index 73f518e417..edb6107ac9 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java @@ -41,7 +41,7 @@ public class ProjectInheritanceTest // ---------------------------------------------------------------------- // // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java index 1bb4ef88be..ab775ec1d6 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java @@ -39,7 +39,7 @@ public class ProjectInheritanceTest // ---------------------------------------------------------------------- // // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java index 2773c199fa..1517157033 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java @@ -37,7 +37,7 @@ public class ProjectInheritanceTest // ---------------------------------------------------------------------- // // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java index 1b80dfebe6..60e37719a2 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java @@ -38,7 +38,7 @@ public class ProjectInheritanceTest // ---------------------------------------------------------------------- // // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java index d0d013e27a..b9685e39a6 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java @@ -37,7 +37,7 @@ public class ProjectInheritanceTest // ---------------------------------------------------------------------- // // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java index 1afb8e8e68..b0a7873bdf 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java @@ -38,7 +38,7 @@ public class ProjectInheritanceTest // ---------------------------------------------------------------------- // // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java index 6a29b73260..0dc4ccff52 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java @@ -36,7 +36,7 @@ public class ProjectInheritanceTest // ---------------------------------------------------------------------- // // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java index 9e5137f275..c785176224 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java @@ -27,7 +27,7 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase; /** - * Verifies scope inheritence of direct and transitive dependencies. + * Verifies scope inheritance of direct and transitive dependencies. * * Should show three behaviors: * @@ -44,7 +44,7 @@ public class ProjectInheritanceTest // ---------------------------------------------------------------------- // // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java index 78b76406de..d8a3926742 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java @@ -25,7 +25,7 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase; /** - * Verifies scope of root project is preserved regardless of parent depenedency management. + * Verifies scope of root project is preserved regardless of parent dependency management. * * @author Patrick Schneider * @see MNG-2919 @@ -36,7 +36,7 @@ public class ProjectInheritanceTest // ---------------------------------------------------------------------- // // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java index 3b08662489..7627c1355d 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java +++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java @@ -35,7 +35,7 @@ public class ProjectInheritanceTest // ---------------------------------------------------------------------- // // p1 inherits from p0 - // p0 inhertis from super model + // p0 inherits from super model // // or we can show it graphically as: // diff --git a/maven-core/lifecycle-executor.txt b/maven-core/lifecycle-executor.txt index 41e98bfdb5..d039036016 100644 --- a/maven-core/lifecycle-executor.txt +++ b/maven-core/lifecycle-executor.txt @@ -57,7 +57,7 @@ We need this form so that the model builder can make the first pass at merging. . -Once we have the version of the plugins the appropriate call to the plugin manager can be made to get the MojoDescriptor for the goal that needs to be run. In the MojoDescriptor we are interested in the element and element. From these elements we need to make a component configuration for the MojoExecution. The actual DOM like structure we create is of type PlexusConfiguration and is the type we use with the ComponentConfigurator to initialize fields in a Plexus component. Typically this is done within Plexus with the configuration supplied with component configuration, but in Maven we take configuration values from the POM. So we have to use the ComponentConfigurator outside of Plexus in order to configurure the Maven Mojo which is just a Plexus component. We can use the information from the MojoDescriptor along with the merged configuration information that is now present in the POM to create the complete PlexusConfiguration used to populate values in the Maven Mojo. +Once we have the version of the plugins the appropriate call to the plugin manager can be made to get the MojoDescriptor for the goal that needs to be run. In the MojoDescriptor we are interested in the element and element. From these elements we need to make a component configuration for the MojoExecution. The actual DOM like structure we create is of type PlexusConfiguration and is the type we use with the ComponentConfigurator to initialize fields in a Plexus component. Typically this is done within Plexus with the configuration supplied with component configuration, but in Maven we take configuration values from the POM. So we have to use the ComponentConfigurator outside of Plexus in order to configure the Maven Mojo which is just a Plexus component. We can use the information from the MojoDescriptor along with the merged configuration information that is now present in the POM to create the complete PlexusConfiguration used to populate values in the Maven Mojo. foreach configuration element: - if read only and being set squawk diff --git a/maven-core/plugin-manager.txt b/maven-core/plugin-manager.txt index f3fcf8e962..73e79be765 100644 --- a/maven-core/plugin-manager.txt +++ b/maven-core/plugin-manager.txt @@ -140,7 +140,7 @@ h3. Plugins need a specific metadata model Each application will have its own model for plugins. Much of this model will be common across applications but there will always be issues specific to a particular applications’s plugins. Some of the issues that need to be taken into consideration: * Plugin dependencies -* Plugin resources like Javascript files or images +* Plugin resources like JavaScript files or images * Configuration metadata and default configuration values * Extension points that plugins might expose diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java index 8e45b20305..450d139c63 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java @@ -213,7 +213,7 @@ public class MavenArtifactRepository * Return the protocol name. *
    * E.g: for input - * http://www.codehause.org this method will return http + * http://www.codehaus.org this method will return http * * @param url the url * @return the host name diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java index 7795dec620..07331f2994 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java @@ -37,7 +37,7 @@ import org.apache.maven.artifact.versioning.OverConstrainedVersionException; * * @author Jason van Zyl * @TODO carlos: all these possible has*Exceptions and get*Exceptions methods make the clients too - * complex requiring a long list of checks, need to create a parent/interfact/encapsulation + * complex requiring a long list of checks, need to create a parent/interface/encapsulation * for the types of exceptions */ public class ArtifactResolutionResult diff --git a/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java b/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java index 0fdec4f480..5ec69f5976 100644 --- a/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java +++ b/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java @@ -137,10 +137,10 @@ public class DefaultBeanConfigurationRequest } } - PluginManagement mngt = build.getPluginManagement(); - if ( mngt != null ) + PluginManagement mgmt = build.getPluginManagement(); + if ( mgmt != null ) { - for ( Plugin plugin : mngt.getPlugins() ) + for ( Plugin plugin : mgmt.getPlugins() ) { if ( groupId.equals( plugin.getGroupId() ) && artifactId.equals( plugin.getArtifactId() ) ) { diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java b/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java index 4284fce9be..353d4f6623 100644 --- a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java +++ b/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java @@ -24,7 +24,7 @@ import java.util.Map; /** * A core extension to monitor Maven's execution. Typically, such an extension gets loaded into Maven by specifying the * system property {@code maven.ext.class.path} on the command line. As soon as dependency injection is setup, Maven - * looks up all implementators of this interface and calls their {@link #init(Context)} method. Note: + * looks up all implementers of this interface and calls their {@link #init(Context)} method. Note: * Implementors are strongly advised to inherit from {@link AbstractEventSpy} instead of directly implementing this * interface. * @since 3.0.2 diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java index a0c54442a3..248a3b6dd1 100644 --- a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java +++ b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java @@ -121,8 +121,10 @@ public class DefaultRepositorySystemSessionFactory } int errorPolicy = 0; - errorPolicy |= request.isCacheNotFound() ? ResolutionErrorPolicy.CACHE_NOT_FOUND : 0; - errorPolicy |= request.isCacheTransferError() ? ResolutionErrorPolicy.CACHE_TRANSFER_ERROR : 0; + errorPolicy |= request.isCacheNotFound() ? ResolutionErrorPolicy.CACHE_NOT_FOUND + : ResolutionErrorPolicy.CACHE_DISABLED; + errorPolicy |= request.isCacheTransferError() ? ResolutionErrorPolicy.CACHE_TRANSFER_ERROR + : ResolutionErrorPolicy.CACHE_DISABLED; session.setResolutionErrorPolicy( new SimpleResolutionErrorPolicy( errorPolicy, errorPolicy | ResolutionErrorPolicy.CACHE_NOT_FOUND ) ); diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java index 5c43dbd4c3..89e456b1b6 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java @@ -22,7 +22,7 @@ package org.apache.maven.lifecycle.internal; /** * A task that is a goal *

    - * TODO: From a concurrecy perspective, this class is not good. The combination of mutable/immutable state is not nice + * TODO: From a concurrency perspective, this class is not good. The combination of mutable/immutable state is not nice * * @since 3.0 * @author Benjamin Bentmann diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java index 14671ffac8..492bcda167 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java @@ -69,5 +69,5 @@ public final class TaskSegment return aggregating; } - // TODO: Consider throwing UnsupprtedSomething on hashCode/equals + // TODO: Consider throwing UnsupportedSomething on hashCode/equals } diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java index 51244be5f5..0a99f75b18 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java @@ -37,7 +37,7 @@ import org.apache.maven.lifecycle.internal.ProjectSegment; * @author Kristian Rosenvold *

    * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. - * This class in particular may spontaneusly self-combust and be replaced by a plexus-compliant thread aware + * This class in particular may spontaneously self-combust and be replaced by a plexus-compliant thread aware * logger implementation at any time. */ @SuppressWarnings( { "SynchronizationOnLocalVariableOrMethodParameter" } ) @@ -54,7 +54,7 @@ public class ThreadOutputMuxer private final ByteArrayOutputStream defaultOutputStreamForUnknownData = new ByteArrayOutputStream(); - private final PrintStream defaultPringStream = new PrintStream( defaultOutputStreamForUnknownData ); + private final PrintStream defaultPrintStream = new PrintStream( defaultOutputStreamForUnknownData ); private final Set completedBuilds = Collections.synchronizedSet( new HashSet() ); @@ -175,7 +175,7 @@ public class ThreadOutputMuxer ProjectSegment threadProject = projectBuildThreadLocal.get(); if ( threadProject == null ) { - return defaultPringStream; + return defaultPrintStream; } if ( ownsRealOutputStream( threadProject ) ) { diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java index 57084ceb08..0ce3ae258a 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java @@ -57,7 +57,7 @@ public class DebugConfigurationListener } /** - * Creates a human-friendly string represenation of the specified object. + * Creates a human-friendly string representation of the specified object. * * @param obj The object to create a string representation for, may be null. * @return The string representation, never null. diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java index d50df0e94f..803b4b0527 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java @@ -49,14 +49,14 @@ public interface ExtensionRealmCache public final ClassRealm realm; - public final ExtensionDescriptor desciptor; + public final ExtensionDescriptor descriptor; public final List artifacts; public CacheRecord( ClassRealm realm, ExtensionDescriptor descriptor, List artifacts ) { this.realm = realm; - this.desciptor = descriptor; + this.descriptor = descriptor; this.artifacts = artifacts; } diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java index b22f9e1d63..d947b2acc1 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java @@ -67,7 +67,7 @@ public interface PluginVersionRequest /** * Gets the POM whose build plugins are to be scanned for the version. * - * @return The POM whose build plugins are to be scanned for the verion or {@code null} to only search the plugin + * @return The POM whose build plugins are to be scanned for the version or {@code null} to only search the plugin * repositories. */ Model getPom(); diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java index 7004febddc..d0e3f6b216 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java @@ -197,7 +197,7 @@ public class DefaultProjectBuildingHelper pluginManager.setupExtensionsRealm( project, plugin, request.getRepositorySession() ); final ClassRealm extensionRealm = recordRealm.realm; - final ExtensionDescriptor extensionDescriptor = recordRealm.desciptor; + final ExtensionDescriptor extensionDescriptor = recordRealm.descriptor; final List artifacts = recordRealm.artifacts; extensionRealms.add( extensionRealm ); diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java index 7d0281034c..06e41017ca 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java @@ -48,7 +48,7 @@ class DefaultProjectBuildingResult * Creates a new result with the specified contents. * * @param project The project that was built, may be {@code null}. - * @param problems The problems that were encouterned, may be {@code null}. + * @param problems The problems that were encountered, may be {@code null}. * @param dependencyResolutionResult The result of the resolution for the project dependencies, may be {@code null}. */ public DefaultProjectBuildingResult( MavenProject project, List problems, @@ -68,7 +68,7 @@ class DefaultProjectBuildingResult * * @param projectId The identifier of the project, may be {@code null}. * @param pomFile The POM file from which the project was built, may be {@code null}. - * @param problems The problems that were encouterned, may be {@code null}. + * @param problems The problems that were encountered, may be {@code null}. */ public DefaultProjectBuildingResult( String projectId, File pomFile, List problems ) { diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java index 50c9e3560d..24860578e5 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java @@ -153,10 +153,10 @@ public class DefaultProjectDependenciesResolver } } - DependencyManagement depMngt = project.getDependencyManagement(); - if ( depMngt != null ) + DependencyManagement depMgmt = project.getDependencyManagement(); + if ( depMgmt != null ) { - for ( Dependency dependency : depMngt.getDependencies() ) + for ( Dependency dependency : depMgmt.getDependencies() ) { collect.addManagedDependency( RepositoryUtils.toDependency( dependency, stereotypes ) ); } diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java index 0b54c0049c..ec5c3907e4 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java @@ -41,7 +41,7 @@ public interface MavenProjectHelper * * See {@link #attachArtifact(MavenProject, String, String, java.io.File)}, but with classifier set to null. * @param project project reference. * @param artifactType artifact type. - * @param artifactFile arrifact file. + * @param artifactFile artifact file. */ void attachArtifact( MavenProject project, String artifactType, File artifactFile ); 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 0380278bf9..d8ab1959ee 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 @@ -38,7 +38,7 @@ public interface ProjectBuildingRequest List getRemoteRepositories(); - ProjectBuildingRequest setPluginArtifactRepositories( List pluginArtifacgRepositories ); + ProjectBuildingRequest setPluginArtifactRepositories( List pluginArtifactRepositories ); List getPluginArtifactRepositories(); 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 05fba193f3..9c1e9e36ca 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 @@ -208,8 +208,8 @@ public class MavenMetadataSource { dependencies = rel.project.getDependencies(); - DependencyManagement depMngt = rel.project.getDependencyManagement(); - managedDependencies = ( depMngt != null ) ? depMngt.getDependencies() : null; + DependencyManagement depMgmt = rel.project.getDependencyManagement(); + managedDependencies = ( depMgmt != null ) ? depMgmt.getDependencies() : null; pomRepositories = rel.project.getRemoteArtifactRepositories(); } diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java index 1d4a2a313b..924523f985 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java @@ -55,8 +55,8 @@ public class ProjectArtifact public List getManagedDependencies() { - DependencyManagement depMngt = project.getDependencyManagement(); - return ( depMngt != null ) ? depMngt.getDependencies() : Collections.emptyList(); + DependencyManagement depMgmt = project.getDependencyManagement(); + return ( depMgmt != null ) ? depMgmt.getDependencies() : Collections.emptyList(); } static class PomArtifactHandler 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 a652c97766..028c4d4025 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 @@ -102,7 +102,7 @@ public interface MetadataResolutionRequest boolean isResolveManagedVersions(); /** - * Enables/disables resolution of the dependency manageemnt information. + * Enables/disables resolution of the dependency management information. * * @param resolveManagedVersions {@code true} if the dependency management information should be retrieved, {@code * false} otherwise. diff --git a/maven-core/src/main/mdo/toolchains.mdo b/maven-core/src/main/mdo/toolchains.mdo index 4740d1b96c..9a8b0c4426 100644 --- a/maven-core/src/main/mdo/toolchains.mdo +++ b/maven-core/src/main/mdo/toolchains.mdo @@ -168,7 +168,7 @@ Toolchain configuration information, like location or any information that is to be retrieved.

    -

    Actual content structure is completely open: each toochain type will define its own format and semantics.

    +

    Actual content structure is completely open: each toolchain type will define its own format and semantics.

    In general, this is a properties format: <name>value</name> with per-toolchain defined properties names.

    ]]> diff --git a/maven-core/src/site/apt/configuration-management.apt b/maven-core/src/site/apt/configuration-management.apt index 4af0f0b1c5..695ea99d6d 100644 --- a/maven-core/src/site/apt/configuration-management.apt +++ b/maven-core/src/site/apt/configuration-management.apt @@ -66,7 +66,7 @@ ${maven.home} We once had a document that Vincent and I agreed upon and I was about to implement it and then I disappeared for 8 months so it never came to pass. - So I guess it's important to figure out what people are using propeties + So I guess it's important to figure out what people are using properties files for and see if we can't incorporate it all into the POM. Or if we do have properties file (something I would like to avoid) say they don't contribute in any meaningful way to information in the POM. For example a @@ -110,9 +110,9 @@ Unified source directory itself. This way locations of intermediary artifacts of a build would be 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. + their source trees set up in the same way as their colleagues. - here's what I do currently in the netbeans part of the mevenide project to + here's what I do currently in the netbeans part of the mavenide 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 files for the current project. if yes. then I'm able to find projects that @@ -120,7 +120,7 @@ Unified source directory problems with the current solution are: 1. information is duplicate. once in POM's dependencies and once in the maven.multiproject.includes property. - 2. it works without problems only for projects with relative paths, eg. from + 2. it works without problems only for projects with relative paths, e.g., from one CVS repository.. for projects from multiple SCM repositories it's harder to maintain the same relative links on all developer computers. not sure the unified source directory structure addresses this issue. diff --git a/maven-core/src/site/apt/offline-mode.apt b/maven-core/src/site/apt/offline-mode.apt index faec70fa97..ff91bb5059 100644 --- a/maven-core/src/site/apt/offline-mode.apt +++ b/maven-core/src/site/apt/offline-mode.apt @@ -167,7 +167,7 @@ Offline Mode Design 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 + offline mode, and then test to see if the file-based basedir for an artifact 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. @@ -201,7 +201,7 @@ Offline Mode Design 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 + of required artifacts and other classpath elements, this is assumed by the mojo API to be in a correct state, and will be handled by the Wagon modifications. diff --git a/maven-core/src/site/apt/plugin-execution-isolation.apt b/maven-core/src/site/apt/plugin-execution-isolation.apt index 983a9fde81..b2983120e8 100644 --- a/maven-core/src/site/apt/plugin-execution-isolation.apt +++ b/maven-core/src/site/apt/plugin-execution-isolation.apt @@ -40,9 +40,9 @@ Maven plugin execution isolation The <<>> realm contains the resources required to run any plexus application; The <<>> realm contains all of the - resources required to run Maven. Each subseqent plugin realm contains the + resources required to run Maven. Each subsequent plugin realm contains the JAR plugin as well as its dependencies. The realms noted above are setup - in a hierachical structure where the resources in the parent realms are + in a hierarchical structure where the resources in the parent realms are available but the <>. diff --git a/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java b/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java index e2caaeb1bf..6ce201d41d 100644 --- a/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java +++ b/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java @@ -57,7 +57,7 @@ public class DefaultProjectDependencyGraphTest public void testVerifyExpectedParentStructure() throws CycleDetectedException, DuplicateProjectException { - // This test verifies the baseline structure used in susequent tests. If this fails, the rest will fail. + // This test verifies the baseline structure used in subsequent tests. If this fails, the rest will fail. ProjectDependencyGraph graph = threeProjectsDependingOnASingle(); final List sortedProjects = graph.getSortedProjects(); assertEquals( aProject, sortedProjects.get( 0 ) ); @@ -66,7 +66,7 @@ public class DefaultProjectDependencyGraphTest assertEquals( depender3, sortedProjects.get( 3 ) ); } - public void testVerifyThatDownsteamProjectsComeInSortedOrder() + public void testVerifyThatDownstreamProjectsComeInSortedOrder() throws CycleDetectedException, DuplicateProjectException { final List downstreamProjects = @@ -102,7 +102,7 @@ public class DefaultProjectDependencyGraphTest assertEquals( depender2, downstreamProjects.get( 3 ) ); } - public void testWithTranistiveOnly() + public void testWithTransitiveOnly() throws CycleDetectedException, DuplicateProjectException { final ProjectDependencyGraph graph = new DefaultProjectDependencyGraph( @@ -115,7 +115,7 @@ public class DefaultProjectDependencyGraphTest assertEquals( depender2, downstreamProjects.get( 3 ) ); } - public void testWithMissingTranistiveOnly() + public void testWithMissingTransitiveOnly() throws CycleDetectedException, DuplicateProjectException { final ProjectDependencyGraph graph = new DefaultProjectDependencyGraph( diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java index 01ebeac08b..df585fbd00 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java @@ -83,7 +83,7 @@ public class LifecycleExecutorSubModulesTest return "src/test/projects/lifecycle-executor"; } - public void testCrweation() + public void testCreation() throws Exception { assertNotNull( defaultLifeCycles ); diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html index 8ad74b96bc..621318dcd0 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html @@ -25,7 +25,7 @@ under the License.

    Design

    -These stubs can be thought of as hand-coded mock obects. They allow unit tests to test only specific +These stubs can be thought of as hand-coded mock objects. They allow unit tests to test only specific aspects of a component while ignoring others. These stubs form an internally consistent data-set that is not expected to change. They are diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java index 92c3adbd9b..b913caf5fc 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java @@ -171,7 +171,7 @@ public class ProjectDependencyGraphStub public List getSortedProjects() { - return Arrays.asList( A, B, C, X, Y, Z ); // I'm not entirely sure about the order but this shold do... + return Arrays.asList( A, B, C, X, Y, Z ); // I'm not entirely sure about the order but this should do... } public List getDownstreamProjects( MavenProject project, boolean transitive ) diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java index 025e77255b..f9766017dd 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java @@ -119,7 +119,7 @@ public class PluginManagerTest This will not work until the RR plugin is released to get rid of the binding to the reporting exception which is a mistake. - This happpens after removing the reporting API from the core: + This happens after removing the reporting API from the core: java.lang.NoClassDefFoundError: org/apache/maven/reporting/MavenReportException diff --git a/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java b/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java index d350770cbc..25aa176cc6 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java @@ -59,7 +59,7 @@ public class DefaultLegacySupportTest extends TestCase { { latch.await(); } - catch (InterruptedException ingore) + catch (InterruptedException ignore) { // Test may fail if we get interrupted } diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java index d61fc6ea10..84fb784d08 100644 --- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java @@ -86,7 +86,7 @@ public class DefaultMavenProjectBuilderTest } /** - * Check that we can build ok from the middle pom of a (parent,child,grandchild) heirarchy + * Check that we can build ok from the middle pom of a (parent,child,grandchild) hierarchy * @throws Exception */ public void testBuildFromMiddlePom() throws Exception diff --git a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java index fb5c4c0356..c843ca722f 100644 --- a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java +++ b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java @@ -49,7 +49,7 @@ public class EmptyProjectBuildingHelper } } - public ProjectRealmCache.CacheRecord createProjectRealm( MavenProject proejct, + public ProjectRealmCache.CacheRecord createProjectRealm( MavenProject project, Model model, ProjectBuildingRequest request ) { return new ProjectRealmCache.CacheRecord( null, null ); diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index 988df76b2b..ba5e3a0e54 100644 --- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -94,7 +94,7 @@ public class PomConstructionTest } /** - * Tests that modules is not overriden by profile + * Tests that modules is not overridden by profile * * @throws Exception */ @@ -207,7 +207,7 @@ public class PomConstructionTest { try { - buildPom( "unique-dependency-key/dep-mngt" ); + buildPom( "unique-dependency-key/dep-mgmt" ); fail( "Non-unique dependency keys did not cause validation error" ); } catch ( ProjectBuildingException e ) @@ -235,7 +235,7 @@ public class PomConstructionTest { try { - buildPom( "unique-dependency-key/dep-mngt-in-profile" ); + buildPom( "unique-dependency-key/dep-mgmt-in-profile" ); fail( "Non-unique dependency keys did not cause validation error" ); } catch ( ProjectBuildingException e ) @@ -414,7 +414,7 @@ public class PomConstructionTest public void testOrderOfGoalsFromPluginExecutionWithoutPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-exec-goals-order/wo-plugin-mngt" ); + PomTestWrapper pom = buildPom( "plugin-exec-goals-order/wo-plugin-mgmt" ); assertEquals( 5, ( (List) pom.getValue( "build/plugins[1]/executions[1]/goals" ) ).size() ); assertEquals( "b", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) ); assertEquals( "a", pom.getValue( "build/plugins[1]/executions[1]/goals[2]" ) ); @@ -427,7 +427,7 @@ public class PomConstructionTest public void testOrderOfGoalsFromPluginExecutionWithPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-exec-goals-order/w-plugin-mngt" ); + PomTestWrapper pom = buildPom( "plugin-exec-goals-order/w-plugin-mgmt" ); assertEquals( 5, ( (List) pom.getValue( "build/plugins[1]/executions[1]/goals" ) ).size() ); assertEquals( "b", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) ); assertEquals( "a", pom.getValue( "build/plugins[1]/executions[1]/goals[2]" ) ); @@ -439,7 +439,7 @@ public class PomConstructionTest public void testOrderOfPluginExecutionsWithoutPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-exec-order/wo-plugin-mngt" ); + PomTestWrapper pom = buildPom( "plugin-exec-order/wo-plugin-mgmt" ); assertEquals( 5, ( (List) pom.getValue( "build/plugins[1]/executions" ) ).size() ); assertEquals( "b", pom.getValue( "build/plugins[1]/executions[1]/id" ) ); assertEquals( "a", pom.getValue( "build/plugins[1]/executions[2]/id" ) ); @@ -452,7 +452,7 @@ public class PomConstructionTest public void testOrderOfPluginExecutionsWithPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-exec-order/w-plugin-mngt" ); + PomTestWrapper pom = buildPom( "plugin-exec-order/w-plugin-mgmt" ); assertEquals( 5, ( (List) pom.getValue( "build/plugins[1]/executions" ) ).size() ); assertEquals( "b", pom.getValue( "build/plugins[1]/executions[1]/id" ) ); assertEquals( "a", pom.getValue( "build/plugins[1]/executions[2]/id" ) ); @@ -488,7 +488,7 @@ public class PomConstructionTest public void testOrderOfMergedPluginExecutionsWithoutPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "merged-plugin-exec-order/wo-plugin-mngt/sub" ); + PomTestWrapper pom = buildPom( "merged-plugin-exec-order/wo-plugin-mgmt/sub" ); assertEquals( 5, ( (List) pom.getValue( "build/plugins[1]/executions" ) ).size() ); assertEquals( "parent-1", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) ); assertEquals( "parent-2", pom.getValue( "build/plugins[1]/executions[2]/goals[1]" ) ); @@ -500,7 +500,7 @@ public class PomConstructionTest public void testOrderOfMergedPluginExecutionsWithPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "merged-plugin-exec-order/w-plugin-mngt/sub" ); + PomTestWrapper pom = buildPom( "merged-plugin-exec-order/w-plugin-mgmt/sub" ); assertEquals( 5, ( (List) pom.getValue( "build/plugins[1]/executions" ) ).size() ); assertEquals( "parent-1", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) ); assertEquals( "parent-2", pom.getValue( "build/plugins[1]/executions[2]/goals[1]" ) ); @@ -522,7 +522,7 @@ public class PomConstructionTest public void testOrderOfMergedPluginExecutionGoalsWithoutPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "merged-plugin-exec-goals-order/wo-plugin-mngt/sub" ); + PomTestWrapper pom = buildPom( "merged-plugin-exec-goals-order/wo-plugin-mgmt/sub" ); assertEquals( 5, ( (List) pom.getValue( "build/plugins[1]/executions[1]/goals" ) ).size() ); assertEquals( "child-a", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) ); @@ -535,7 +535,7 @@ public class PomConstructionTest public void testOrderOfMergedPluginExecutionGoalsWithPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "merged-plugin-exec-goals-order/w-plugin-mngt/sub" ); + PomTestWrapper pom = buildPom( "merged-plugin-exec-goals-order/w-plugin-mgmt/sub" ); assertEquals( 5, ( (List) pom.getValue( "build/plugins[1]/executions[1]/goals" ) ).size() ); assertEquals( "child-a", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) ); assertEquals( "merged", pom.getValue( "build/plugins[1]/executions[1]/goals[2]" ) ); @@ -548,7 +548,7 @@ public class PomConstructionTest public void testOverridingOfInheritedPluginExecutionsWithoutPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-exec-merging/wo-plugin-mngt/sub" ); + PomTestWrapper pom = buildPom( "plugin-exec-merging/wo-plugin-mgmt/sub" ); assertEquals( 2, ( (List) pom.getValue( "build/plugins[1]/executions" ) ).size() ); assertEquals( "child-default", pom.getValue( "build/plugins[1]/executions[@id='default']/phase" ) ); assertEquals( "child-non-default", pom.getValue( "build/plugins[1]/executions[@id='non-default']/phase" ) ); @@ -558,7 +558,7 @@ public class PomConstructionTest public void testOverridingOfInheritedPluginExecutionsWithPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-exec-merging/w-plugin-mngt/sub" ); + PomTestWrapper pom = buildPom( "plugin-exec-merging/w-plugin-mgmt/sub" ); assertEquals( 2, ( (List) pom.getValue( "build/plugins[1]/executions" ) ).size() ); assertEquals( "child-default", pom.getValue( "build/plugins[1]/executions[@id='default']/phase" ) ); assertEquals( "child-non-default", pom.getValue( "build/plugins[1]/executions[@id='non-default']/phase" ) ); @@ -569,7 +569,7 @@ public class PomConstructionTest public void testOrderOfMergedPluginDependenciesWithoutPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "merged-plugin-class-path-order/wo-plugin-mngt/sub" ); + PomTestWrapper pom = buildPom( "merged-plugin-class-path-order/wo-plugin-mgmt/sub" ); assertEquals( 5, ( (List) pom.getValue( "build/plugins[1]/dependencies" ) ).size() ); assertNotNull( pom.getValue( "build/plugins[1]/dependencies[1]" ) ); @@ -588,7 +588,7 @@ public class PomConstructionTest public void testOrderOfMergedPluginDependenciesWithPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "merged-plugin-class-path-order/w-plugin-mngt/sub" ); + PomTestWrapper pom = buildPom( "merged-plugin-class-path-order/w-plugin-mgmt/sub" ); assertEquals( 5, ( (List) pom.getValue( "build/plugins[1]/dependencies" ) ).size() ); assertEquals( "c", pom.getValue( "build/plugins[1]/dependencies[1]/artifactId" ) ); assertEquals( "1", pom.getValue( "build/plugins[1]/dependencies[1]/version" ) ); @@ -769,7 +769,7 @@ public class PomConstructionTest public void testOrderOfPluginConfigurationElementsWithoutPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-config-order/wo-plugin-mngt" ); + PomTestWrapper pom = buildPom( "plugin-config-order/wo-plugin-mgmt" ); assertEquals( "one", pom.getValue( "build/plugins[1]/configuration/stringParams/stringParam[1]" ) ); assertEquals( "two", pom.getValue( "build/plugins[1]/configuration/stringParams/stringParam[2]" ) ); assertEquals( "three", pom.getValue( "build/plugins[1]/configuration/stringParams/stringParam[3]" ) ); @@ -780,7 +780,7 @@ public class PomConstructionTest public void testOrderOfPluginConfigurationElementsWithPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-config-order/w-plugin-mngt" ); + PomTestWrapper pom = buildPom( "plugin-config-order/w-plugin-mgmt" ); assertEquals( "one", pom.getValue( "build/plugins[1]/configuration/stringParams/stringParam[1]" ) ); assertEquals( "two", pom.getValue( "build/plugins[1]/configuration/stringParams/stringParam[2]" ) ); assertEquals( "three", pom.getValue( "build/plugins[1]/configuration/stringParams/stringParam[3]" ) ); @@ -790,7 +790,7 @@ public class PomConstructionTest public void testOrderOfPluginExecutionConfigurationElementsWithoutPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-exec-config-order/wo-plugin-mngt" ); + PomTestWrapper pom = buildPom( "plugin-exec-config-order/wo-plugin-mgmt" ); String prefix = "build/plugins[1]/executions[1]/configuration/"; assertEquals( "one", pom.getValue( prefix + "stringParams/stringParam[1]" ) ); assertEquals( "two", pom.getValue( prefix + "stringParams/stringParam[2]" ) ); @@ -804,7 +804,7 @@ public class PomConstructionTest public void testOrderOfPluginExecutionConfigurationElementsWithPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-exec-config-order/w-plugin-mngt" ); + PomTestWrapper pom = buildPom( "plugin-exec-config-order/w-plugin-mgmt" ); String prefix = "build/plugins[1]/executions[1]/configuration/"; assertEquals( "one", pom.getValue( prefix + "stringParams/stringParam[1]" ) ); assertEquals( "two", pom.getValue( prefix + "stringParams/stringParam[2]" ) ); @@ -876,7 +876,7 @@ public class PomConstructionTest public void testMultiplePluginExecutionsWithAndWithoutIdsWithoutPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-exec-w-and-wo-id/wo-plugin-mngt" ); + PomTestWrapper pom = buildPom( "plugin-exec-w-and-wo-id/wo-plugin-mgmt" ); assertEquals( 2, ( (List) pom.getValue( "build/plugins[1]/executions" ) ).size() ); assertEquals( "log-string", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) ); assertEquals( "log-string", pom.getValue( "build/plugins[1]/executions[2]/goals[1]" ) ); @@ -885,7 +885,7 @@ public class PomConstructionTest public void testMultiplePluginExecutionsWithAndWithoutIdsWithPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-exec-w-and-wo-id/w-plugin-mngt" ); + PomTestWrapper pom = buildPom( "plugin-exec-w-and-wo-id/w-plugin-mgmt" ); assertEquals( 2, ( (List) pom.getValue( "build/plugins[1]/executions" ) ).size() ); assertEquals( "log-string", pom.getValue( "build/plugins[1]/executions[1]/goals[1]" ) ); assertEquals( "log-string", pom.getValue( "build/plugins[1]/executions[2]/goals[1]" ) ); @@ -894,7 +894,7 @@ public class PomConstructionTest public void testDependencyOrderWithoutPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "dependency-order/wo-plugin-mngt" ); + PomTestWrapper pom = buildPom( "dependency-order/wo-plugin-mgmt" ); assertEquals( 4, ( (List) pom.getValue( "dependencies" ) ).size() ); assertEquals( "a", pom.getValue( "dependencies[1]/artifactId" ) ); assertEquals( "c", pom.getValue( "dependencies[2]/artifactId" ) ); @@ -905,7 +905,7 @@ public class PomConstructionTest public void testDependencyOrderWithPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "dependency-order/w-plugin-mngt" ); + PomTestWrapper pom = buildPom( "dependency-order/w-plugin-mgmt" ); assertEquals( 4, ( (List) pom.getValue( "dependencies" ) ).size() ); assertEquals( "a", pom.getValue( "dependencies[1]/artifactId" ) ); assertEquals( "c", pom.getValue( "dependencies[2]/artifactId" ) ); @@ -1033,7 +1033,7 @@ public class PomConstructionTest public void testPluginConfigurationUsingAttributesWithoutPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-config-attributes/wo-plugin-mngt" ); + PomTestWrapper pom = buildPom( "plugin-config-attributes/wo-plugin-mgmt" ); assertEquals( "src", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@todir" ) ); assertEquals( "true", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@overwrite" ) ); assertEquals( "target", pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@dir" ) ); @@ -1045,7 +1045,7 @@ public class PomConstructionTest public void testPluginConfigurationUsingAttributesWithPluginManagement() throws Exception { - PomTestWrapper pom = buildPom( "plugin-config-attributes/w-plugin-mngt" ); + PomTestWrapper pom = buildPom( "plugin-config-attributes/w-plugin-mgmt" ); assertEquals( "src", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@todir" ) ); assertEquals( "true", pom.getValue( "build/plugins[1]/configuration/domParam/copy/@overwrite" ) ); assertEquals( "target", pom.getValue( "build/plugins[1]/configuration/domParam/copy/fileset/@dir" ) ); @@ -1518,7 +1518,7 @@ public class PomConstructionTest { Properties sysProps = new Properties(); sysProps.setProperty( "system.property", "PASSED" ); - PomTestWrapper pom = buildPom( "sytem-property-interpolation", sysProps ); + PomTestWrapper pom = buildPom( "system-property-interpolation", sysProps ); assertEquals( "PASSED", pom.getValue( "name" ) ); } diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java index eda9010b64..c145ee00bb 100644 --- a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java @@ -64,11 +64,11 @@ public class ProjectSorterTest private Dependency createDependency( String groupId, String artifactId, String version ) { - Dependency depdendency = new Dependency(); - depdendency.setGroupId( groupId ); - depdendency.setArtifactId( artifactId ); - depdendency.setVersion( version ); - return depdendency; + Dependency dependency = new Dependency(); + dependency.setGroupId( groupId ); + dependency.setArtifactId( artifactId ); + dependency.setVersion( version ); + return dependency; } private Plugin createPlugin( MavenProject project ) diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java index 536e1a66d9..5ad762a4e6 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java @@ -84,7 +84,7 @@ public class MavenToolchainMergerTest PersistedToolchains jdksExtra = reader.read( jdksExtraIS ); assertEquals( 2, jdks.getToolchains().size() ); - // switch dominant with reccessive + // switch dominant with recessive merger.merge( jdksExtra, jdks, TrackableBase.USER_LEVEL ); assertEquals( 4, jdksExtra.getToolchains().size() ); assertEquals( 2, jdks.getToolchains().size() ); @@ -119,7 +119,7 @@ public class MavenToolchainMergerTest PersistedToolchains jdksExtend = reader.read( jdksExtendIS ); assertEquals( 2, jdks.getToolchains().size() ); - // switch dominant with reccessive + // switch dominant with recessive merger.merge( jdksExtend, jdks, TrackableBase.USER_LEVEL ); assertEquals( 2, jdksExtend.getToolchains().size() ); Xpp3Dom config0 = (Xpp3Dom) jdksExtend.getToolchains().get( 0 ).getConfiguration(); diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java index 469cb2c4b2..b1ae1ed5ee 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java @@ -29,7 +29,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() { diff --git a/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml rename to maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml rename to maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml rename to maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml rename to maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml rename to maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml rename to maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml b/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml index f66ae25c64..477a759531 100644 --- a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml @@ -29,7 +29,7 @@ under the License. Maven Integration Test :: MNG-3808 - Test the reports are executeed in the order given in the POM. + Test the reports are executed in the order given in the POM. diff --git a/maven-core/src/test/resources-project-builder/pom-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/pom-inheritance/sub/pom.xml index ae74902875..2dbddd6b96 100644 --- a/maven-core/src/test/resources-project-builder/pom-inheritance/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/pom-inheritance/sub/pom.xml @@ -23,7 +23,7 @@ under the License. 4.0.0 diff --git a/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml b/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml index 349a0c3856..910018abb8 100644 --- a/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml +++ b/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml @@ -23,7 +23,7 @@ under the License. 4.0.0 diff --git a/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml index 5c1dacab08..5905657a3a 100644 --- a/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml +++ b/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0-SNAPSHOT Maven Integration Test :: it0043 - Test for repository inheritence - ensure using the same id overrides the defaults + Test for repository inheritance - ensure using the same id overrides the defaults diff --git a/maven-core/src/test/resources-project-builder/sytem-property-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/system-property-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/sytem-property-interpolation/pom.xml rename to maven-core/src/test/resources-project-builder/system-property-interpolation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mngt-in-profile/pom.xml b/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt-in-profile/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mngt-in-profile/pom.xml rename to maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt-in-profile/pom.xml diff --git a/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mngt/pom.xml b/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mngt/pom.xml rename to maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml b/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml index 5822d8d390..c5df7aade1 100644 --- a/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml +++ b/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml @@ -47,7 +47,7 @@ under the License. 00 KB 1 2 3 4 5 6 X diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom index b33504011a..e6100b45d4 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom @@ -295,7 +295,7 @@ under the License. maven-release-plugin 2.0-beta-4 - + https://svn.apache.org/repos/asf/maven/pom/tags false deploy diff --git a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java b/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java index ee90c20619..ab1b1a0aed 100644 --- a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java +++ b/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java @@ -44,7 +44,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() { diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index a27517b8e8..d239884d34 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -1530,7 +1530,7 @@ public class MavenCli } // - // Allow the builder to be overriden by the user if requested. The builders are now pluggable. + // Allow the builder to be overridden by the user if requested. The builders are now pluggable. // if ( commandLine.hasOption( CLIManager.BUILDER ) ) { diff --git a/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java b/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java index 7a879cec36..0c9e7ad746 100644 --- a/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java +++ b/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java @@ -29,7 +29,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() { diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java index 7e0144acd3..94e6877a1f 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java +++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java @@ -29,7 +29,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() { diff --git a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java index e4e81e21f2..027000bcca 100644 --- a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java +++ b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java @@ -29,7 +29,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() { diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java index bc2e712d85..71301e6d5e 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java @@ -19,7 +19,7 @@ public class TestPlugin private Log log; /** - * @component role-hint="nonexistant" + * @component role-hint="nonexistent" */ private MavenProject project; diff --git a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java index 7e0144acd3..94e6877a1f 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java +++ b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java @@ -29,7 +29,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() { diff --git a/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java index 7e0144acd3..94e6877a1f 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java +++ b/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java @@ -29,7 +29,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() { diff --git a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java index 69af061340..7275a8d6f4 100644 --- a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java +++ b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java @@ -29,7 +29,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() { diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index a6a872570a..6b38926cf3 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -195,15 +195,15 @@ public class DefaultModelBuilder return this; } - public DefaultModelBuilder setDependencyManagementImporter( DependencyManagementImporter depMngmntImporter ) + public DefaultModelBuilder setDependencyManagementImporter( DependencyManagementImporter depMgmtImporter ) { - this.dependencyManagementImporter = depMngmntImporter; + this.dependencyManagementImporter = depMgmtImporter; return this; } - public DefaultModelBuilder setDependencyManagementInjector( DependencyManagementInjector depMngmntInjector ) + public DefaultModelBuilder setDependencyManagementInjector( DependencyManagementInjector depMgmtInjector ) { - this.dependencyManagementInjector = depMngmntInjector; + this.dependencyManagementInjector = depMgmtInjector; return this; } @@ -683,10 +683,10 @@ public class DefaultModelBuilder plugins.put( key, plugin ); } } - PluginManagement mngt = build.getPluginManagement(); - if ( mngt != null ) + PluginManagement mgmt = build.getPluginManagement(); + if ( mgmt != null ) { - for ( Plugin plugin : mngt.getPlugins() ) + for ( Plugin plugin : mgmt.getPlugins() ) { String key = plugin.getKey(); if ( managedVersions.get( key ) == null ) @@ -1081,9 +1081,9 @@ public class DefaultModelBuilder private void importDependencyManagement( Model model, ModelBuildingRequest request, DefaultModelProblemCollector problems, Collection importIds ) { - DependencyManagement depMngt = model.getDependencyManagement(); + DependencyManagement depMgmt = model.getDependencyManagement(); - if ( depMngt == null ) + if ( depMgmt == null ) { return; } @@ -1097,9 +1097,9 @@ public class DefaultModelBuilder ModelBuildingRequest importRequest = null; - List importMngts = null; + List importMgmts = null; - for ( Iterator it = depMngt.getDependencies().iterator(); it.hasNext(); ) + for ( Iterator it = depMgmt.getDependencies().iterator(); it.hasNext(); ) { Dependency dependency = it.next(); @@ -1154,10 +1154,10 @@ public class DefaultModelBuilder continue; } - DependencyManagement importMngt = getCache( request.getModelCache(), groupId, artifactId, version, + DependencyManagement importMgmt = getCache( request.getModelCache(), groupId, artifactId, version, ModelCacheTag.IMPORT ); - if ( importMngt == null ) + if ( importMgmt == null ) { if ( workspaceResolver == null && modelResolver == null ) { @@ -1236,27 +1236,27 @@ public class DefaultModelBuilder importModel = importResult.getEffectiveModel(); } - importMngt = importModel.getDependencyManagement(); + importMgmt = importModel.getDependencyManagement(); - if ( importMngt == null ) + if ( importMgmt == null ) { - importMngt = new DependencyManagement(); + importMgmt = new DependencyManagement(); } - putCache( request.getModelCache(), groupId, artifactId, version, ModelCacheTag.IMPORT, importMngt ); + putCache( request.getModelCache(), groupId, artifactId, version, ModelCacheTag.IMPORT, importMgmt ); } - if ( importMngts == null ) + if ( importMgmts == null ) { - importMngts = new ArrayList<>(); + importMgmts = new ArrayList<>(); } - importMngts.add( importMngt ); + importMgmts.add( importMgmt ); } importIds.remove( importing ); - dependencyManagementImporter.importManagement( model, importMngts, request, problems ); + dependencyManagementImporter.importManagement( model, importMgmts, request, problems ); } private void putCache( ModelCache modelCache, String groupId, String artifactId, String version, diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java index 21029cc87b..186507cb7c 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java @@ -20,7 +20,7 @@ package org.apache.maven.model.building; */ /** - * Defines events that the model builder fires during construction of the effective model. When a listener encounteres + * Defines events that the model builder fires during construction of the effective model. When a listener encounters * errors while processing the event, it can report these problems via {@link ModelBuildingEvent#getProblems()}. * Note: To cope with future extensions to this interface, it is strongly recommended to extend * {@link AbstractModelBuildingListener} rather than to directly implement this interface. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java index c10274dbce..d20f2446ad 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java @@ -124,7 +124,7 @@ public interface ModelBuildingRequest /** * Sets the level of validation to perform on processed models. For building of projects, - * {@link #VALIDATION_LEVEL_STRICT} should be used to ensure proper building. For the mere retrievel of dependencies + * {@link #VALIDATION_LEVEL_STRICT} should be used to ensure proper building. For the mere retrieval of dependencies * during artifact resolution, {@link #VALIDATION_LEVEL_MINIMAL} should be used to account for models of poor * quality. By default, models are validated in strict mode. * diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java index d895913eb6..cce7d7f867 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java @@ -49,19 +49,19 @@ public class DefaultDependencyManagementImporter { Map dependencies = new LinkedHashMap<>(); - DependencyManagement depMngt = target.getDependencyManagement(); + DependencyManagement depMgmt = target.getDependencyManagement(); - if ( depMngt != null ) + if ( depMgmt != null ) { - for ( Dependency dependency : depMngt.getDependencies() ) + for ( Dependency dependency : depMgmt.getDependencies() ) { dependencies.put( dependency.getManagementKey(), dependency ); } } else { - depMngt = new DependencyManagement(); - target.setDependencyManagement( depMngt ); + depMgmt = new DependencyManagement(); + target.setDependencyManagement( depMgmt ); } for ( DependencyManagement source : sources ) @@ -76,7 +76,7 @@ public class DefaultDependencyManagementImporter } } - depMngt.setDependencies( new ArrayList<>( dependencies.values() ) ); + depMgmt.setDependencies( new ArrayList<>( dependencies.values() ) ); } } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java index 8206da99b8..51150dbbfc 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java @@ -94,7 +94,7 @@ public class DefaultInheritanceAssembler String childName = child.getArtifactId(); /* - * This logic (using filesystem, against wanted independance from the user environment) exists only for the + * This logic (using filesystem, against wanted independence from the user environment) exists only for the * sake of backward-compat with 2.x (MNG-5000). In general, it is wrong to * base URL inheritance on the module directory names as this information is unavailable for POMs in the * repository. In other words, modules where artifactId != moduleDirName will see different effective URLs diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java index cea2a743e4..9af30c1cb1 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java @@ -146,10 +146,10 @@ public class DefaultModelValidator { validate20RawPlugins( problems, build.getPlugins(), "build.plugins.plugin", request ); - PluginManagement mngt = build.getPluginManagement(); - if ( mngt != null ) + PluginManagement mgmt = build.getPluginManagement(); + if ( mgmt != null ) { - validate20RawPlugins( problems, mngt.getPlugins(), "build.pluginManagement.plugins.plugin", + validate20RawPlugins( problems, mgmt.getPlugins(), "build.pluginManagement.plugins.plugin", request ); } } @@ -189,10 +189,10 @@ public class DefaultModelValidator { validate20RawPlugins( problems, buildBase.getPlugins(), prefix + ".plugins.plugin", request ); - PluginManagement mngt = buildBase.getPluginManagement(); - if ( mngt != null ) + PluginManagement mgmt = buildBase.getPluginManagement(); + if ( mgmt != null ) { - validate20RawPlugins( problems, mngt.getPlugins(), prefix + ".pluginManagement.plugins.plugin", + validate20RawPlugins( problems, mgmt.getPlugins(), prefix + ".pluginManagement.plugins.plugin", request ); } } diff --git a/maven-model-builder/src/main/mdo/profiles.mdo b/maven-model-builder/src/main/mdo/profiles.mdo index 892544daa6..a55677cd05 100644 --- a/maven-model-builder/src/main/mdo/profiles.mdo +++ b/maven-model-builder/src/main/mdo/profiles.mdo @@ -188,7 +188,7 @@ under the License. 1.0.0 @@ -250,7 +250,7 @@ under the License. RepositoryBase 1.0.0 - Repository contains the information needed for establishing connections with remote repoistory + Repository contains the information needed for establishing connections with remote repository diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java index 96eed6fa47..1b47ec19b2 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java @@ -79,7 +79,7 @@ public class DefaultInheritanceAssemblerTest /** * Check most classical urls inheritance: directory structure where parent POM in parent directory - * and child directory == artifatId + * and child directory == artifactId * @throws Exception */ public void testUrls() diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index 5322c35c5c..1187b11433 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -1359,7 +1359,7 @@ The classifier of the dependency. It is appended to the filename after the version. This allows:
      -
    • refering to attached artifact, for example sources and javadoc: +
    • referring to attached artifact, for example sources and javadoc: see default artifact handlers for a list,
    • distinguishing two artifacts that belong to the same POM but were built differently. @@ -1532,8 +1532,8 @@ */ public String getArtifact() { - // If the jar name has been explicty set then use that. This - // is when the element is explicity used in the POM. + // If the jar name has been explicitly set then use that. This + // is when the element is explicitly used in the POM. if ( getJar() != null) { return getJar(); diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java index 515b1104a0..3f7eccc478 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java @@ -513,7 +513,7 @@ public class MojoDescriptor } /** - * @return true if the Mojo is herited, false otherwise. + * @return true if the Mojo is inherited, false otherwise. */ public boolean isInheritedByDefault() { @@ -521,7 +521,7 @@ public class MojoDescriptor } /** - * @param inheritedByDefault true if the Mojo is herited, false otherwise. + * @param inheritedByDefault true if the Mojo is inherited, false otherwise. */ public void setInheritedByDefault( boolean inheritedByDefault ) { diff --git a/maven-plugin-api/src/main/mdo/lifecycle.mdo b/maven-plugin-api/src/main/mdo/lifecycle.mdo index 2a46647439..7dfce74be9 100644 --- a/maven-plugin-api/src/main/mdo/lifecycle.mdo +++ b/maven-plugin-api/src/main/mdo/lifecycle.mdo @@ -84,7 +84,7 @@ under the License. true 1.0.0 String - The ID of this phase, eg <code>generate-sources</code>. + The ID of this phase, e.g., <code>generate-sources</code>. executions diff --git a/maven-repository-metadata/src/site/apt/index.apt b/maven-repository-metadata/src/site/apt/index.apt index 194fc0df5b..ed2bff9680 100644 --- a/maven-repository-metadata/src/site/apt/index.apt +++ b/maven-repository-metadata/src/site/apt/index.apt @@ -41,7 +41,7 @@ Maven Repository Metadata Model * <<>> in a remote repository, - * <<.xml>>> in a local repository, for metatada from a repository with <<>> identifier. + * <<.xml>>> in a local repository, for metadata from a repository with <<>> identifier. [] diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java index 2395b36fbd..53c04752f2 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java @@ -65,10 +65,10 @@ public class ArtifactDescriptorReaderDelegate result.addDependency( convert( dependency, stereotypes ) ); } - DependencyManagement mngt = model.getDependencyManagement(); - if ( mngt != null ) + DependencyManagement mgmt = model.getDependencyManagement(); + if ( mgmt != null ) { - for ( org.apache.maven.model.Dependency dependency : mngt.getDependencies() ) + for ( org.apache.maven.model.Dependency dependency : mgmt.getDependencies() ) { result.addManagedDependency( convert( dependency, stereotypes ) ); } @@ -137,10 +137,10 @@ public class ArtifactDescriptorReaderDelegate private void setArtifactProperties( ArtifactDescriptorResult result, Model model ) { String downloadUrl = null; - DistributionManagement distMngt = model.getDistributionManagement(); - if ( distMngt != null ) + DistributionManagement distMgmt = model.getDistributionManagement(); + if ( distMgmt != null ) { - downloadUrl = distMngt.getDownloadUrl(); + downloadUrl = distMgmt.getDownloadUrl(); } if ( downloadUrl != null && downloadUrl.length() > 0 ) { diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java index 0f313301d0..1df1c12a04 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java @@ -372,10 +372,10 @@ public class DefaultArtifactDescriptorReader private Relocation getRelocation( Model model ) { Relocation relocation = null; - DistributionManagement distMngt = model.getDistributionManagement(); - if ( distMngt != null ) + DistributionManagement distMgmt = model.getDistributionManagement(); + if ( distMgmt != null ) { - relocation = distMngt.getRelocation(); + relocation = distMgmt.getRelocation(); } return relocation; } diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java index db77a441af..7943dc802d 100644 --- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java +++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java @@ -195,7 +195,7 @@ public class RepositorySystemTest { //InstallResult install( RepositorySystemSession session, InstallRequest request ) // throws InstallationException; - // release, snapshot unique ou non unique, attachement + // release, snapshot unique ou non unique, attachment } public void testDeploy() diff --git a/maven-settings/src/main/mdo/settings.mdo b/maven-settings/src/main/mdo/settings.mdo index 7fa00de8b8..0d32e405ec 100644 --- a/maven-settings/src/main/mdo/settings.mdo +++ b/maven-settings/src/main/mdo/settings.mdo @@ -600,7 +600,7 @@ 1.0.0+ String - The server ID of the repository being mirrored, eg + The server ID of the repository being mirrored, e.g., "central". This MUST NOT match the mirror id. @@ -809,7 +809,7 @@