Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C1B8E200C31 for ; Wed, 8 Mar 2017 17:58:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C0462160B8A; Wed, 8 Mar 2017 16:58:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C38AE160B8C for ; Wed, 8 Mar 2017 17:58:44 +0100 (CET) Received: (qmail 69111 invoked by uid 500); 8 Mar 2017 16:58:43 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 67541 invoked by uid 99); 8 Mar 2017 16:58:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Mar 2017 16:58:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2715CF3226; Wed, 8 Mar 2017 16:58:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: schulte@apache.org To: commits@maven.apache.org Date: Wed, 08 Mar 2017 16:58:57 -0000 Message-Id: <63462bc4274d44f0bb7e78c31d4ee75c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [17/49] maven git commit: [MNG-6146] Several small stylistic and spelling improvements to code and documentation archived-at: Wed, 08 Mar 2017 16:58:46 -0000 [MNG-6146] Several small stylistic and spelling improvements to code and documentation Spelling fixes: * system * tokenizer * toolchain * trailing * transitive * unsupported * version * artifact * attachment * codehaus * colleagues * comparison * concurrency * configure * creation * dependency * descriptor * downstream * efficient * e.g. * elements * encountered * encounters * environments * executed * explicitly * happens * hierarchical * hierarchy * ignore * implemented * implementers * independence * indicates * inheritance * inherited * inherits * install * interface * javascript * laziness * management * maven * metadata * mgmt * minimalist * nonexistent * objects * overridden * print * project * properties * recessive * referring * repository * representation * retrieval * retrieve * rigorous * should * spontaneously * subsequent Literal fixes: * use static final values Style fixes: * use the proper term for char U+002D (-) hyphen(-minus) instead of dash This closes #100 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/17402659 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/17402659 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/17402659 Branch: refs/heads/MNG-5359 Commit: 17402659845ea21b0dd9f9989d484fb32c3aa28b Parents: bd57ec9 Author: Josh Soref Authored: Mon Jan 23 04:56:27 2017 +0000 Committer: Michael Osipov Committed: Fri Feb 3 10:12:28 2017 +0100 ---------------------------------------------------------------------- apache-maven/README.txt | 4 +- .../resolver/CyclicDependencyException.java | 2 +- .../artifact/versioning/ComparableVersion.java | 4 +- .../versioning/DefaultArtifactVersion.java | 2 +- maven-compat/pom.xml | 2 +- .../artifact/installer/ArtifactInstaller.java | 2 +- .../resolver/ResolutionListenerForDepMgmt.java | 2 +- .../maven/profiles/DefaultProfileManager.java | 2 +- .../DefaultModelInheritanceAssembler.java | 4 +- .../inheritance/ModelInheritanceAssembler.java | 2 +- .../DefaultLegacyArtifactCollector.java | 4 +- .../metadata/MetadataGraphVertex.java | 2 +- maven-compat/src/main/mdo/profiles.mdo | 4 +- .../inheritance/t00/ProjectInheritanceTest.java | 2 +- .../inheritance/t01/ProjectInheritanceTest.java | 2 +- .../inheritance/t02/ProjectInheritanceTest.java | 2 +- .../inheritance/t03/ProjectInheritanceTest.java | 2 +- .../inheritance/t04/ProjectInheritanceTest.java | 2 +- .../inheritance/t05/ProjectInheritanceTest.java | 2 +- .../inheritance/t06/ProjectInheritanceTest.java | 2 +- .../inheritance/t07/ProjectInheritanceTest.java | 2 +- .../inheritance/t08/ProjectInheritanceTest.java | 2 +- .../inheritance/t09/ProjectInheritanceTest.java | 2 +- .../inheritance/t10/ProjectInheritanceTest.java | 4 +- .../inheritance/t11/ProjectInheritanceTest.java | 4 +- .../t12scm/ProjectInheritanceTest.java | 2 +- maven-core/lifecycle-executor.txt | 2 +- maven-core/plugin-manager.txt | 2 +- .../repository/MavenArtifactRepository.java | 2 +- .../resolver/ArtifactResolutionResult.java | 2 +- .../DefaultBeanConfigurationRequest.java | 6 +- .../org/apache/maven/eventspy/EventSpy.java | 2 +- .../DefaultRepositorySystemSessionFactory.java | 6 +- .../maven/lifecycle/internal/GoalTask.java | 2 +- .../maven/lifecycle/internal/TaskSegment.java | 2 +- .../multithreaded/ThreadOutputMuxer.java | 6 +- .../plugin/DebugConfigurationListener.java | 2 +- .../maven/plugin/ExtensionRealmCache.java | 4 +- .../plugin/version/PluginVersionRequest.java | 2 +- .../project/DefaultProjectBuildingHelper.java | 2 +- .../project/DefaultProjectBuildingResult.java | 4 +- .../DefaultProjectDependenciesResolver.java | 6 +- .../maven/project/MavenProjectHelper.java | 2 +- .../maven/project/ProjectBuildingRequest.java | 2 +- .../project/artifact/MavenMetadataSource.java | 4 +- .../maven/project/artifact/ProjectArtifact.java | 4 +- .../metadata/MetadataResolutionRequest.java | 2 +- maven-core/src/main/mdo/toolchains.mdo | 2 +- .../src/site/apt/configuration-management.apt | 8 +- maven-core/src/site/apt/offline-mode.apt | 4 +- .../src/site/apt/plugin-execution-isolation.apt | 4 +- .../DefaultProjectDependencyGraphTest.java | 8 +- .../LifecycleExecutorSubModulesTest.java | 2 +- .../lifecycle/internal/stub/AboutTheStubs.html | 2 +- .../stub/ProjectDependencyGraphStub.java | 2 +- .../apache/maven/plugin/PluginManagerTest.java | 2 +- .../internal/DefaultLegacySupportTest.java | 2 +- .../project/DefaultMavenProjectBuilderTest.java | 2 +- .../project/EmptyProjectBuildingHelper.java | 2 +- .../maven/project/PomConstructionTest.java | 52 ++++++------- .../apache/maven/project/ProjectSorterTest.java | 10 +-- .../merge/MavenToolchainMergerTest.java | 4 +- .../apache/maven/lifecycle/test/AppTest.java | 2 +- .../dependency-order/w-plugin-mgmt/pom.xml | 68 +++++++++++++++++ .../dependency-order/w-plugin-mngt/pom.xml | 68 ----------------- .../dependency-order/wo-plugin-mgmt/pom.xml | 66 +++++++++++++++++ .../dependency-order/wo-plugin-mngt/pom.xml | 66 ----------------- .../w-plugin-mgmt/pom.xml | 64 ++++++++++++++++ .../w-plugin-mgmt/sub/pom.xml | 64 ++++++++++++++++ .../w-plugin-mngt/pom.xml | 64 ---------------- .../w-plugin-mngt/sub/pom.xml | 64 ---------------- .../wo-plugin-mgmt/pom.xml | 62 ++++++++++++++++ .../wo-plugin-mgmt/sub/pom.xml | 64 ++++++++++++++++ .../wo-plugin-mngt/pom.xml | 62 ---------------- .../wo-plugin-mngt/sub/pom.xml | 64 ---------------- .../w-plugin-mgmt/pom.xml | 59 +++++++++++++++ .../w-plugin-mgmt/sub/pom.xml | 59 +++++++++++++++ .../w-plugin-mngt/pom.xml | 59 --------------- .../w-plugin-mngt/sub/pom.xml | 59 --------------- .../wo-plugin-mgmt/pom.xml | 57 ++++++++++++++ .../wo-plugin-mgmt/sub/pom.xml | 59 +++++++++++++++ .../wo-plugin-mngt/pom.xml | 57 -------------- .../wo-plugin-mngt/sub/pom.xml | 59 --------------- .../w-plugin-mgmt/pom.xml | 71 ++++++++++++++++++ .../w-plugin-mgmt/sub/pom.xml | 71 ++++++++++++++++++ .../w-plugin-mngt/pom.xml | 71 ------------------ .../w-plugin-mngt/sub/pom.xml | 71 ------------------ .../wo-plugin-mgmt/pom.xml | 69 +++++++++++++++++ .../wo-plugin-mgmt/sub/pom.xml | 71 ++++++++++++++++++ .../wo-plugin-mngt/pom.xml | 69 ----------------- .../wo-plugin-mngt/sub/pom.xml | 71 ------------------ .../w-plugin-mgmt/pom.xml | 62 ++++++++++++++++ .../w-plugin-mngt/pom.xml | 62 ---------------- .../wo-plugin-mgmt/pom.xml | 53 +++++++++++++ .../wo-plugin-mngt/pom.xml | 53 ------------- .../plugin-config-order/w-plugin-mgmt/pom.xml | 68 +++++++++++++++++ .../plugin-config-order/w-plugin-mngt/pom.xml | 68 ----------------- .../plugin-config-order/wo-plugin-mgmt/pom.xml | 60 +++++++++++++++ .../plugin-config-order/wo-plugin-mngt/pom.xml | 60 --------------- .../w-plugin-mgmt/pom.xml | 78 ++++++++++++++++++++ .../w-plugin-mngt/pom.xml | 78 -------------------- .../wo-plugin-mgmt/pom.xml | 70 ++++++++++++++++++ .../wo-plugin-mngt/pom.xml | 70 ------------------ .../w-plugin-mgmt/pom.xml | 66 +++++++++++++++++ .../w-plugin-mngt/pom.xml | 66 ----------------- .../wo-plugin-mgmt/pom.xml | 57 ++++++++++++++ .../wo-plugin-mngt/pom.xml | 57 -------------- .../plugin-exec-merging/w-plugin-mgmt/pom.xml | 58 +++++++++++++++ .../w-plugin-mgmt/sub/pom.xml | 59 +++++++++++++++ .../plugin-exec-merging/w-plugin-mngt/pom.xml | 58 --------------- .../w-plugin-mngt/sub/pom.xml | 59 --------------- .../plugin-exec-merging/wo-plugin-mgmt/pom.xml | 56 ++++++++++++++ .../wo-plugin-mgmt/sub/pom.xml | 59 +++++++++++++++ .../plugin-exec-merging/wo-plugin-mngt/pom.xml | 56 -------------- .../wo-plugin-mngt/sub/pom.xml | 59 --------------- .../plugin-exec-order/w-plugin-mgmt/pom.xml | 76 +++++++++++++++++++ .../plugin-exec-order/w-plugin-mngt/pom.xml | 76 ------------------- .../plugin-exec-order/wo-plugin-mgmt/pom.xml | 67 +++++++++++++++++ .../plugin-exec-order/wo-plugin-mngt/pom.xml | 67 ----------------- .../w-plugin-mgmt/pom.xml | 72 ++++++++++++++++++ .../w-plugin-mngt/pom.xml | 72 ------------------ .../wo-plugin-mgmt/pom.xml | 64 ++++++++++++++++ .../wo-plugin-mngt/pom.xml | 64 ---------------- .../plugin-inheritance-order/pom.xml | 2 +- .../pom-inheritance/sub/pom.xml | 2 +- .../prerequisites-inheritance/child/pom.xml | 2 +- .../repo-inheritance/pom.xml | 2 +- .../system-property-interpolation/pom.xml | 30 ++++++++ .../sytem-property-interpolation/pom.xml | 30 -------- .../dep-mgmt-in-profile/pom.xml | 49 ++++++++++++ .../unique-dependency-key/dep-mgmt/pom.xml | 44 +++++++++++ .../dep-mngt-in-profile/pom.xml | 49 ------------ .../unique-dependency-key/dep-mngt/pom.xml | 44 ----------- .../xml-coalesce-text/pom.xml | 2 +- .../maven/maven-parent/5/maven-parent-5.pom | 2 +- .../java/org/apache/maven/embedder/AppTest.java | 2 +- .../java/org/apache/maven/cli/MavenCli.java | 2 +- .../src/test/java/org/apache/maven/AppTest.java | 2 +- .../maven/test/error/mojoFailure/AppTest.java | 2 +- .../child1/src/test/java/org/test/AppTest.java | 2 +- .../src/main/java/org/plugin/TestPlugin.java | 2 +- .../maven/test/error/mojoFailure/AppTest.java | 2 +- .../maven/test/error/mojoFailure/AppTest.java | 2 +- .../java/org/codehaus/m2eclipse/AppTest.java | 2 +- .../model/building/DefaultModelBuilder.java | 42 +++++------ .../model/building/ModelBuildingListener.java | 2 +- .../model/building/ModelBuildingRequest.java | 2 +- .../DefaultDependencyManagementImporter.java | 12 +-- .../DefaultInheritanceAssembler.java | 2 +- .../model/validation/DefaultModelValidator.java | 12 +-- maven-model-builder/src/main/mdo/profiles.mdo | 4 +- .../DefaultInheritanceAssemblerTest.java | 2 +- maven-model/src/main/mdo/maven.mdo | 6 +- .../maven/plugin/descriptor/MojoDescriptor.java | 4 +- maven-plugin-api/src/main/mdo/lifecycle.mdo | 2 +- .../src/site/apt/index.apt | 2 +- .../ArtifactDescriptorReaderDelegate.java | 12 +-- .../DefaultArtifactDescriptorReader.java | 6 +- .../internal/RepositorySystemTest.java | 2 +- maven-settings/src/main/mdo/settings.mdo | 4 +- 160 files changed, 2246 insertions(+), 2244 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/apache-maven/README.txt ---------------------------------------------------------------------- diff --git a/apache-maven/README.txt b/apache-maven/README.txt index 935aa67..827fdb7 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java ---------------------------------------------------------------------- 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 d370617..bbc6733 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 */ http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java ---------------------------------------------------------------------- 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 e7d24c4..f434ef0 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: *

    - *
  • mixing of '-' (dash) and '.' (dot) separators,
    • + *
  • mixing of '-' (hyphen) and '.' (dot) separators,
    • *
  • transition between characters and digits also constitutes a separator: * 1.0alpha1 => [1, 0, alpha, 1]
    • *
  • unlimited number of version components,
    • @@ -50,7 +50,7 @@ import java.util.Stack; *
* 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java ---------------------------------------------------------------------- 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 99b2b85..b5e43d4 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; http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index c740504..2b205f7 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java ---------------------------------------------------------------------- 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 376eba2..ca6bb20 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java ---------------------------------------------------------------------- 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 06da7e3..6ca4fe7 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. http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java ---------------------------------------------------------------------- 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 7a9ec09..e3e0cb7 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 ) { http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java ---------------------------------------------------------------------- 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 fa67041..eab3660 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 ) http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java ---------------------------------------------------------------------- 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 ef4edca..bf8a63b 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 ); } http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java ---------------------------------------------------------------------- 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 4601eee..88168f1 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java ---------------------------------------------------------------------- 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 bdccf6a..eb87121 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; http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/main/mdo/profiles.mdo ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/mdo/profiles.mdo b/maven-compat/src/main/mdo/profiles.mdo index 3dcc996..bcaabd2 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 8e4f39d..98da0f5 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 e6efcc4..1aa749b 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 6e9a7a3..2b78343 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 73f518e..edb6107 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 1bb4ef8..ab775ec 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 2773c19..1517157 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 1b80dfe..60e3771 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 d0d013e..b9685e3 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 1afb8e8..b0a7873 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 6a29b73..0dc4ccf 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 9e5137f..c785176 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 78b7640..d8a3926 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java ---------------------------------------------------------------------- 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 3b08662..7627c13 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: // http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/lifecycle-executor.txt ---------------------------------------------------------------------- diff --git a/maven-core/lifecycle-executor.txt b/maven-core/lifecycle-executor.txt index 41e98bf..d039036 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 i n 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/plugin-manager.txt ---------------------------------------------------------------------- diff --git a/maven-core/plugin-manager.txt b/maven-core/plugin-manager.txt index f3fcf8e..73e79be 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java ---------------------------------------------------------------------- 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 8e45b20..450d139 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java ---------------------------------------------------------------------- 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 7795dec..07331f2 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java ---------------------------------------------------------------------- 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 0fdec4f..5ec69f5 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() ) ) { http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java ---------------------------------------------------------------------- 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 4284fce..353d4f6 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java ---------------------------------------------------------------------- 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 a0c5444..248a3b6 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 ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java ---------------------------------------------------------------------- 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 5c43dbd..89e456b 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java ---------------------------------------------------------------------- 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 14671ff..492bcda 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 } http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java ---------------------------------------------------------------------- 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 51244be..0a99f75 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 ) ) { http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java ---------------------------------------------------------------------- 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 57084ce..0ce3ae2 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. http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java ---------------------------------------------------------------------- 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 d50df0e..803b4b0 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; } http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java ---------------------------------------------------------------------- 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 b22f9e1..d947b2a 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(); http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java ---------------------------------------------------------------------- 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 7004feb..d0e3f6b 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 ); http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java ---------------------------------------------------------------------- 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 7d02810..06e4101 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 ) { http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java ---------------------------------------------------------------------- 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 50c9e35..2486057 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 ) ); } http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java ---------------------------------------------------------------------- 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 0b54c00..ec5c390 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 ); http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java index 0380278..d8ab195 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(); http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java index 05fba19..9c1e9e3 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(); } http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java ---------------------------------------------------------------------- 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 1d4a2a3..924523f 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java index a652c97..028c4d4 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. http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/main/mdo/toolchains.mdo ---------------------------------------------------------------------- diff --git a/maven-core/src/main/mdo/toolchains.mdo b/maven-core/src/main/mdo/toolchains.mdo index 4740d1b..9a8b0c4 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.

    ]]> http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/site/apt/configuration-management.apt ---------------------------------------------------------------------- diff --git a/maven-core/src/site/apt/configuration-management.apt b/maven-core/src/site/apt/configuration-management.apt index 4af0f0b..695ea99 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. http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/site/apt/offline-mode.apt ---------------------------------------------------------------------- diff --git a/maven-core/src/site/apt/offline-mode.apt b/maven-core/src/site/apt/offline-mode.apt index faec70f..ff91bb5 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. http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/site/apt/plugin-execution-isolation.apt ---------------------------------------------------------------------- diff --git a/maven-core/src/site/apt/plugin-execution-isolation.apt b/maven-core/src/site/apt/plugin-execution-isolation.apt index 983a9fd..b298312 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 <>. http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java ---------------------------------------------------------------------- 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 e2caaeb..6ce201d 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( http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java ---------------------------------------------------------------------- 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 01ebeac..df585fb 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 ); http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html ---------------------------------------------------------------------- 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 8ad74b9..621318d 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java ---------------------------------------------------------------------- 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 92c3adb..b913caf 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 ) http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java ---------------------------------------------------------------------- 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 025e772..f976601 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java ---------------------------------------------------------------------- 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 d350770..25aa176 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 } http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java ---------------------------------------------------------------------- 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 d61fc6e..84fb784 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 http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java ---------------------------------------------------------------------- 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 fb5c4c0..c843ca7 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 );