You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/07/18 17:22:28 UTC
[maven] branch master updated: Fix minor typos
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 5ce5591ae Fix minor typos
5ce5591ae is described below
commit 5ce5591ae341188230d6ecca76c90bd0a786fcb2
Author: Marc Wrobel <ma...@gmail.com>
AuthorDate: Mon Jul 18 18:06:59 2022 +0200
Fix minor typos
Fix various minor typos in :
- project documentations,
- javadoc and comments,
- test files.
---
.github/workflows/maven_build_itself.yml | 2 +-
.../src/assembly/maven/lib/jansi-native/README.txt | 2 +-
.../maven/artifact/InvalidArtifactRTException.java | 2 +-
.../apache/maven/artifact/repository/Authentication.java | 2 +-
.../resolver/MultipleArtifactsNotFoundException.java | 2 +-
.../src/main/java/org/apache/maven/repository/Proxy.java | 4 ++--
.../artifact/repository/DefaultArtifactRepository.java | 2 +-
.../main/java/org/apache/maven/project/ProjectUtils.java | 2 +-
.../maven/repository/legacy/DefaultWagonManager.java | 2 +-
.../maven/repository/legacy/LegacyRepositorySystem.java | 2 +-
.../legacy/resolver/DefaultLegacyArtifactCollector.java | 2 +-
.../resolver/transform/ArtifactTransformation.java | 8 ++++----
.../transform/ArtifactTransformationManager.java | 8 ++++----
.../maven/repository/metadata/ArtifactMetadata.java | 2 +-
.../repository/metadata/ClasspathTransformation.java | 2 +-
.../metadata/DefaultGraphConflictResolver.java | 2 +-
.../repository/metadata/MetadataResolutionResult.java | 2 +-
.../maven/plugin-expressions/settings.paramdoc.xml | 4 ++--
.../maven/artifact/resolver/ArtifactResolverTest.java | 8 ++++----
.../apache/maven/artifact/resolver/TestFileWagon.java | 2 +-
.../project/inheritance/t00/ProjectInheritanceTest.java | 2 +-
.../project/inheritance/t02/ProjectInheritanceTest.java | 2 +-
.../project/inheritance/t03/ProjectInheritanceTest.java | 2 +-
maven-core/lifecycle-executor.txt | 2 +-
maven-core/plugin-manager.txt | 16 ++++++++--------
.../repository/metadata/io/MetadataParseException.java | 2 +-
.../maven/configuration/BeanConfigurationRequest.java | 2 +-
.../main/java/org/apache/maven/eventspy/EventSpy.java | 2 +-
.../maven/eventspy/internal/EventSpyDispatcher.java | 2 +-
.../eventspy/internal/EventSpyExecutionListener.java | 2 +-
.../eventspy/internal/EventSpyRepositoryListener.java | 2 +-
.../maven/execution/DefaultMavenExecutionRequest.java | 2 +-
.../apache/maven/execution/ProjectDependencyGraph.java | 4 ++--
.../maven/graph/DefaultProjectDependencyGraph.java | 2 +-
.../org/apache/maven/lifecycle/LifecycleExecutor.java | 2 +-
.../internal/DefaultLifecycleMappingDelegate.java | 2 +-
.../lifecycle/internal/LifecycleDependencyResolver.java | 2 +-
.../maven/lifecycle/internal/ProjectBuildList.java | 2 +-
.../apache/maven/lifecycle/internal/ProjectSegment.java | 2 +-
.../apache/maven/lifecycle/internal/builder/Builder.java | 2 +-
.../java/org/apache/maven/plugin/MavenPluginManager.java | 2 +-
.../apache/maven/plugin/PluginContainerException.java | 2 +-
.../main/java/org/apache/maven/project/MavenProject.java | 12 ++++++------
.../java/org/apache/maven/project/ProjectBuilder.java | 4 ++--
.../java/org/apache/maven/project/ProjectSorter.java | 4 ++--
.../project/collector/MultiModuleCollectionStrategy.java | 8 ++++----
maven-core/src/site/apt/configuration-management.apt | 2 +-
maven-core/src/site/apt/inheritance.apt | 2 +-
.../multithreaded/ConcurrencyDependencyGraphTest.java | 2 +-
.../internal/stub/ProjectDependencyGraphStub.java | 2 +-
.../org/apache/maven/project/PomConstructionTest.java | 2 +-
.../id-container-joining-with-empty-elements/pom.xml | 2 +-
.../id-container-joining-with-empty-elements/sub/pom.xml | 2 +-
.../limited-inheritance/pom.xml | 2 +-
.../java/org/apache/maven/cli/CLIReportingUtils.java | 2 +-
.../src/main/java/org/apache/maven/cli/MavenCli.java | 2 +-
.../model/building/DefaultModelBuildingRequest.java | 2 +-
.../maven/model/building/DefaultModelProcessor.java | 4 ++--
.../maven/model/building/ModelBuildingException.java | 2 +-
.../java/org/apache/maven/model/building/ModelData.java | 2 +-
.../maven/model/building/ModelProblemCollectorExt.java | 2 +-
.../maven/model/building/ModelSourceTransformer.java | 2 +-
.../org/apache/maven/model/io/ModelParseException.java | 2 +-
.../org/apache/maven/model/locator/ModelLocator.java | 2 +-
.../org/apache/maven/model/resolution/ModelResolver.java | 4 ++--
maven-model-builder/src/site/apt/index.apt | 4 ++--
.../validation/missing-plugin-dependency-groupId.xml | 2 +-
.../maven/model/transform/ParentXMLFilterTest.java | 2 +-
maven-model/src/main/mdo/maven.mdo | 4 ++--
.../apache/maven/plugin/descriptor/MojoDescriptor.java | 6 +++---
maven-plugin-api/src/main/mdo/plugin.mdo | 2 +-
maven-repository-metadata/src/site/apt/index.apt | 3 +--
.../building/DefaultSettingsBuildingRequest.java | 2 +-
.../settings/building/SettingsBuildingException.java | 2 +-
.../apache/maven/settings/io/SettingsParseException.java | 2 +-
.../main/java/org/apache/maven/settings/RuntimeInfo.java | 2 +-
.../toolchain/building/ToolchainsBuildingException.java | 2 +-
.../maven/toolchain/io/ToolchainsParseException.java | 2 +-
78 files changed, 113 insertions(+), 114 deletions(-)
diff --git a/.github/workflows/maven_build_itself.yml b/.github/workflows/maven_build_itself.yml
index 8f805ebb9..c181d23d1 100644
--- a/.github/workflows/maven_build_itself.yml
+++ b/.github/workflows/maven_build_itself.yml
@@ -49,7 +49,7 @@ jobs:
tar -xzf ${{ env.TAR_BALL }} -C "$temp_dir" --strip 1
maven_bin_dir=$temp_dir/bin
if [ -d $maven_bin_dir ]; then
- echo "tar.gz file \"${{ env.TAR_BALL }}\" succesfully extracted in temporarily directory \"$temp_dir.\""
+ echo "tar.gz file \"${{ env.TAR_BALL }}\" successfully extracted in temporarily directory \"$temp_dir.\""
echo "TEMP_MAVEN_BIN_DIR=$maven_bin_dir" >> $GITHUB_ENV
else
echo "$maven_bin_dir does not exist."
diff --git a/apache-maven/src/assembly/maven/lib/jansi-native/README.txt b/apache-maven/src/assembly/maven/lib/jansi-native/README.txt
index 26a957e1b..bf7c1082e 100644
--- a/apache-maven/src/assembly/maven/lib/jansi-native/README.txt
+++ b/apache-maven/src/assembly/maven/lib/jansi-native/README.txt
@@ -1,7 +1,7 @@
This directory contains Jansi native libraries extracted from Jansi JAR.
You can add your own build for platforms not natively supported by Jansi.
-See here [1] on how to compile for your platform and and here [2] how libraries
+See here [1] on how to compile for your platform and here [2] how libraries
follow Jansi's directory and filename conventions.
[1] https://github.com/fusesource/jansi/tree/master/src/main/native
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
index adf656d16..357ec7134 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
@@ -21,7 +21,7 @@ package org.apache.maven.artifact;
/**
* Exception thrown when the identity of an artifact can not be established,
- * eg. one of groupId, artifactId, version or type is null.
+ * e.g. one of groupId, artifactId, version or type is null.
*/
public class InvalidArtifactRTException
extends RuntimeException
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
index f02d1c5d7..b6f1d93a6 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
@@ -36,7 +36,7 @@ public class Authentication
}
/**
- * Username used to login to the host
+ * Username used to log in to the host
*/
private String username;
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
index f6689502d..24dcdb42f 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
@@ -52,7 +52,7 @@ public class MultipleArtifactsNotFoundException
}
/**
- * Create an instance of the exception with allrequired information.
+ * Create an instance of the exception with all required information.
*
* @param originatingArtifact the artifact that was being resolved
* @param resolvedArtifacts artifacts that could be resolved
diff --git a/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java b/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
index 960d7beb7..4669276ea 100644
--- a/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
+++ b/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
@@ -91,7 +91,7 @@ public class Proxy
}
/**
- * Get user's password used to login to proxy server.
+ * Get user's password used to log in to proxy server.
*
* @return user's password at proxy host
*/
@@ -103,7 +103,7 @@ public class Proxy
/**
* Set the user's password for the proxy server.
*
- * @param password password to use to login to a proxy server
+ * @param password password to use to log in to a proxy server
*/
public void setPassword( String password )
{
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
index ef487b8ad..4c9da3831 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
@@ -31,7 +31,7 @@ import org.apache.maven.wagon.repository.Repository;
/**
* This class is an abstraction of the location from/to resources can be
- * transfered.
+ * transferred.
*
* @author <a href="michal.maczka@dimatics.com">Michal Maczka </a>
*/
diff --git a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
index 21a4ac745..8d4234427 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
@@ -34,7 +34,7 @@ import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.eclipse.aether.RepositorySystemSession;
-// This class needs to stick around because it was exposed the the remote resources plugin started using it instead of
+// This class needs to stick around because it was exposed the remote resources plugin started using it instead of
// getting the repositories from the project.
/**
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index ab6383afe..3272ddec9 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -633,7 +633,7 @@ public class DefaultWagonManager
// We do this in here so we can checksum the artifact metadata too, otherwise it could be metadata itself
for ( String extension : checksums.keySet() )
{
- // TODO shouldn't need a file intermediatary - improve wagon to take a stream
+ // TODO shouldn't need a file intermediary - improve wagon to take a stream
File temp = File.createTempFile( "maven-artifact", null );
temp.deleteOnExit();
FileUtils.fileWrite( temp.getAbsolutePath(), "UTF-8", sums.get( extension ) );
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index 8c95385e5..a89ea37cd 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -299,7 +299,7 @@ public class LegacyRepositorySystem
// So now we have an url of the form file://<path>
// We want to eliminate any relative path nonsense and lock down the path so we
- // need to fully resolve it before any sub-modules use the path. This can happen
+ // need to fully resolve it before any submodules use the path. This can happen
// when you are using a custom settings.xml that contains a relative path entry
// for the local repository setting.
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 048ce8fd5..a14db6c41 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
@@ -301,7 +301,7 @@ public class DefaultLegacyArtifactCollector
Artifact resetArtifact = resetNodes[j].getArtifact();
// MNG-2123: if the previous node was not a range, then it wouldn't have any available
- // versions. We just clobbered the selected version above. (why? i have no idea.)
+ // versions. We just clobbered the selected version above. (why? I have no idea.)
// So since we are here and this is ranges we must go figure out the version (for a
// third time...)
if ( resetArtifact.getVersion() == null && resetArtifact.getVersionRange() != null )
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
index 42604d754..4d20391cf 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
@@ -37,7 +37,7 @@ public interface ArtifactTransformation
String ROLE = ArtifactTransformation.class.getName();
/**
- * Take in a artifact and return the transformed artifact for locating in the remote repository. If no
+ * Take in an artifact and return the transformed artifact for locating in the remote repository. If no
* transformation has occurred the original artifact is returned.
*
* @param artifact Artifact to be transformed.
@@ -47,7 +47,7 @@ public interface ArtifactTransformation
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
- * Take in a artifact and return the transformed artifact for locating in the remote repository. If no
+ * Take in an artifact and return the transformed artifact for locating in the remote repository. If no
* transformation has occurred the original artifact is returned.
*
* @param artifact Artifact to be transformed.
@@ -60,7 +60,7 @@ public interface ArtifactTransformation
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
- * Take in a artifact and return the transformed artifact for locating in the local repository. If no
+ * Take in an artifact and return the transformed artifact for locating in the local repository. If no
* transformation has occurred the original artifact is returned.
*
* @param artifact Artifact to be transformed.
@@ -71,7 +71,7 @@ public interface ArtifactTransformation
throws ArtifactInstallationException;
/**
- * Take in a artifact and return the transformed artifact for distributing to remote repository. If no
+ * Take in an artifact and return the transformed artifact for distributing to remote repository. If no
* transformation has occurred the original artifact is returned.
*
* @param artifact Artifact to be transformed.
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
index ed3ee9a62..de88de84c 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
@@ -37,7 +37,7 @@ public interface ArtifactTransformationManager
String ROLE = ArtifactTransformationManager.class.getName();
/**
- * Take in a artifact and return the transformed artifact for locating in the remote repository. If no
+ * Take in an artifact and return the transformed artifact for locating in the remote repository. If no
* transformation has occurred the original artifact is returned.
*
* @param artifact Artifact to be transformed.
@@ -47,7 +47,7 @@ public interface ArtifactTransformationManager
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
- * Take in a artifact and return the transformed artifact for locating in the remote repository. If no
+ * Take in an artifact and return the transformed artifact for locating in the remote repository. If no
* transformation has occurred the original artifact is returned.
*
* @param artifact Artifact to be transformed.
@@ -59,7 +59,7 @@ public interface ArtifactTransformationManager
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
- * Take in a artifact and return the transformed artifact for locating in the local repository. If no
+ * Take in an artifact and return the transformed artifact for locating in the local repository. If no
* transformation has occurred the original artifact is returned.
*
* @param artifact Artifact to be transformed.
@@ -69,7 +69,7 @@ public interface ArtifactTransformationManager
throws ArtifactInstallationException;
/**
- * Take in a artifact and return the transformed artifact for distributing to a remote repository. If no
+ * Take in an artifact and return the transformed artifact for distributing to a remote repository. If no
* transformation has occurred the original artifact is returned.
*
* @param artifact Artifact to be transformed.
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
index 13b00c3a6..8d03a31f6 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
@@ -42,7 +42,7 @@ public class ArtifactMetadata
protected String classifier;
/**
- * explanation: why this MD was chosen over it's siblings
+ * explanation: why this MD was chosen over its siblings
* in the resulting structure (classpath for now)
*/
protected String why;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
index eece41330..26d5f3ed9 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
@@ -22,7 +22,7 @@ package org.apache.maven.repository.metadata;
import org.apache.maven.artifact.ArtifactScopeEnum;
/**
- * Helper class to conver an Md Graph into some form of a classpath
+ * Helper class to convert a metadata Graph into some form of a classpath
*
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
*
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
index 287ffec75..976fcb80b 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
@@ -100,7 +100,7 @@ public class DefaultGraphConflictResolver
final MetadataGraphEdge edge = cleanEdges( v, ins, requestedScope );
if ( edge == null )
- { // no edges - don't need this vertex any more
+ { // no edges - don't need this vertex anymore
if ( entry.equals( v ) )
{ // unless it's an entry point.
// currently processing the entry point - it should not have any entry incident edges
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
index 74a342773..0f35bd664 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
@@ -34,7 +34,7 @@ public class MetadataResolutionResult
MetadataTreeNode treeRoot;
/**
- * these components are are initialized on demand by
+ * these components are initialized on demand by
* explicit call of the initTreeProcessing()
*/
ClasspathTransformation classpathTransformation;
diff --git a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml b/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml
index e058218a4..36c61e8ba 100644
--- a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml
+++ b/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml
@@ -46,8 +46,8 @@ under the License.
If false, flags the system to skip prompting the user for any information, or holding up the build
waiting for any input.
- NOTE: It's also possible to switch to batch (ie. non-interactive) mode using the '-B' command-line option.
+ NOTE: It's also possible to switch to batch (i.e. non-interactive) mode using the '-B' command-line option.
]]></description>
</expression>
</expressions>
-</paramdoc>
\ No newline at end of file
+</paramdoc>
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
index 6aa065297..9a3934ea9 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
@@ -43,10 +43,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.inject.Inject;
-// It would be cool if there was a hook that i could use to setup a test environment.
-// I want to setup a local/remote repositories for testing but i don't want to have
-// to change them when i change the layout of the repositories. So i want to generate
-// the structure i want to test by using the artifact handler manager which dictates
+// It would be cool if there was a hook that I could use to set up a test environment.
+// I want to set up a local/remote repositories for testing but I don't want to have
+// to change them when I change the layout of the repositories. So I want to generate
+// the structure I want to test by using the artifact handler manager which dictates
// the layout used for a particular artifact type.
/**
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java
index c78c1901b..4e24fe853 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java
@@ -30,7 +30,7 @@ import org.apache.maven.wagon.providers.file.FileWagon;
import org.apache.maven.wagon.resource.Resource;
/**
- * Wagon used for test cases that annotates some methods. Note that this is not a thread-safe implementation.
+ * Wagon used for test cases that annotate some methods. Note that this is not a thread-safe implementation.
*/
public class TestFileWagon
extends FileWagon
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 936424dba..0300d5667 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
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* A test which demonstrates maven's recursive inheritance where
- * a distinct value is taken from each parent contributing to the
+ * a distinct value is taken from each parent contributing to
* the final model of the project being assembled. There is no
* overriding going on amongst the models being used in this test:
* each model in the lineage is providing a value that is not present
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 61a393238..adacaf860 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
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* A test which demonstrates maven's recursive inheritance where
- * a distinct value is taken from each parent contributing to the
+ * a distinct value is taken from each parent contributing to
* the final model of the project being assembled. There is no
* overriding going on amongst the models being used in this test:
* each model in the lineage is providing a value that is not present
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 3c658d8db..ca8565a66 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
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* A test which demonstrates maven's recursive inheritance where
- * a distinct value is taken from each parent contributing to the
+ * a distinct value is taken from each parent contributing to
* the final model of the project being assembled. There is no
* overriding going on amongst the models being used in this test:
* each model in the lineage is providing a value that is not present
diff --git a/maven-core/lifecycle-executor.txt b/maven-core/lifecycle-executor.txt
index d03903601..b911f9497 100644
--- a/maven-core/lifecycle-executor.txt
+++ b/maven-core/lifecycle-executor.txt
@@ -18,7 +18,7 @@ We have a lifecycle mapping for the packaging of *jar* below. You see that for t
</lifecycles>
</configuration>
-We need to turn this list of phases into a set of plugin objects that have an xml representation like the following:
+We need to turn this list of phases into a set of plugin objects that have an XML representation like the following:
<plugins>
<plugin>
diff --git a/maven-core/plugin-manager.txt b/maven-core/plugin-manager.txt
index 73e79be76..37a9489a9 100644
--- a/maven-core/plugin-manager.txt
+++ b/maven-core/plugin-manager.txt
@@ -32,8 +32,8 @@ TODO
- jar
- hooks for loading
-- i could make an annotation that marked another class as its plugin discoverer, i could just add it to the
- the component descriptor and when it's loaded we can add the discoverer, that would be simpler. i could
+- I could make an annotation that marked another class as its plugin discoverer, I could just add it to
+ the component descriptor and when it's loaded we can add the discoverer, that would be simpler. I could
also do this with the lister as well
i'l
// 1 the metadata -> model plugin/mojo descriptor
@@ -51,8 +51,8 @@ i'l
* h2. Concerns for the plugin manager
*
* h3. resolving the dependencies of a plugin - these could be resolved remotely at runtime or, -
- * they could be resolved from a local repository - i think we need a simple dependency model here
- * that is more mercury related and not Maven related i.e no POMs - workspace resolver - we need
+ * they could be resolved from a local repository - I think we need a simple dependency model here
+ * that is more mercury related and not Maven related i.e. no POMs - workspace resolver - we need
* tools to pre-populate this repository
*
* h3. create an isolated classloader
@@ -71,7 +71,7 @@ i'l
*
* - nexus - the plugin class - UI to contribute - what JS to hook into the UI - what resources to
* load into the UI - having packed or unpacked plugins, and positioning resources if necessary -
- * maven can work out of the classloader, nexus plugins probably couldn't given the js and image
+ * maven can work out of the classloader, nexus plugins probably couldn't give the js and image
* resources
*
* We need to look at Maven, and Nexus as use cases and figure out what each of them needs to be
@@ -103,7 +103,7 @@ h4. Working with POMs during development
During the development of a plugin we would want to make it easy for a developer to create a plugin which means we would allow the direct use of a POM to state the dependencies of a given plugin and any tooling we created would be responsible for turning the dependency information in the POM into plugin metadata which described the dependencies of the plugin.
-We are looking at using Mercury for the resolution and retrieval of the plugin dependencies so during development we would translate the POMs into dependency information that Mercury can understand, and in production we would have the pre-digested format that Mercury could utilize to resolve and retrieve dependencies. We need to be careful that we are using Mercury during development and production so that we don’t get in the situation where Maven 2.x is resolving different then Mercury [...]
+We are looking at using Mercury for the resolution and retrieval of the plugin dependencies so during development we would translate the POMs into dependency information that Mercury can understand, and in production we would have the pre-digested format that Mercury could utilize to resolve and retrieve dependencies. We need to be careful that we are using Mercury during development and production so that we don’t get in the situation where Maven 2.x is resolving differently than Mercur [...]
With respect to development inside an IDE the workspace from which we would like to resolve and retrieve dependencies is a read-only local repository to Mercury which is put at the front-end of the search order of any repository that Mercury will consult for artifacts.
@@ -133,7 +133,7 @@ I still need to do some work here to figure out how a dispatching to a particula
In the short term we are working with the model where the URI maps to a resource, and the resource itself is a Plexus component which can itself have a reference to the host application in order to perform its work. This may not occur in the first versions of the plugin API but a resource needs to simply become the mapping mechanism by which parameters are taken from the REST side of the application and mapped into a method call within a given Plexus component. Whether that be the core N [...]
-At the very least in the short term the resource needs to know how to lookup the component that is required to perform the work. This needs to be made simple, for the time being we can write and test plugins working in the same realm until we get complete isolation working.
+At the very least in the short term the resource needs to know how to look up the component that is required to perform the work. This needs to be made simple, for the time being we can write and test plugins working in the same realm until we get complete isolation working.
h3. Plugins need a specific metadata model
@@ -168,7 +168,7 @@ The plugin metadata:
* what JS to hook into the UI
* what resources to load into the UI
* having packed or unpacked plugins, and positioning resources if necessary
-* maven can work out of the classloader, nexus plugins probably couldn't given the js and image resources
+* maven can work out of the classloader, nexus plugins probably couldn't give the js and image resources
h3. Other issues
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java
index e3e141b10..427141a39 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java
@@ -22,7 +22,7 @@ package org.apache.maven.artifact.repository.metadata.io;
import java.io.IOException;
/**
- * Signals a failure to parse the metadata due to invalid syntax (e.g. non-wellformed XML or unknown elements).
+ * Signals a failure to parse the metadata due to invalid syntax (e.g. non well formed XML or unknown elements).
*
* @author Benjamin Bentmann
*/
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java
index d19aa2044..91d687f6d 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java
@@ -63,7 +63,7 @@ public interface BeanConfigurationRequest
* Sets the configuration to unmarshal into the bean. The configuration should be taken from
* {@link org.apache.maven.model.ConfigurationContainer#getConfiguration()} or a similar source.
* If {@code element} is not {@code null}, child configuration element with the specified name will
- * be unmarshaled.
+ * be unmarshalled.
*
* @param configuration The configuration to unmarshal, may be {@code null}.
* @param element Configuration element name to unmarshal or {@code null} to unmarshal entire configuration.
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 3a513052c..cd7e1cc8b 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
@@ -23,7 +23,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
+ * system property {@code maven.ext.class.path} on the command line. As soon as dependency injection is set up, Maven
* looks up all implementers of this interface and calls their {@link #init(Context)} method. <em>Note:</em>
* Implementors are strongly advised to inherit from {@link AbstractEventSpy} instead of directly implementing this
* interface.
diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java
index 748ef3943..4b04a1830 100644
--- a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java
+++ b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java
@@ -33,7 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Dispatches callbacks to all registered eventspies.
+ * Dispatches callbacks to all registered EventSpies.
* @since 3.0.2
*/
@Named
diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java
index cc0a31133..b79b7208a 100644
--- a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java
@@ -24,7 +24,7 @@ import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.execution.ExecutionListener;
/**
- * Forwards execution events to eventspies.
+ * Forwards execution events to EventSpies.
* @since 3.0.2
*/
class EventSpyExecutionListener
diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java
index a2bce1284..aef3226ca 100644
--- a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java
+++ b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java
@@ -24,7 +24,7 @@ import org.eclipse.aether.RepositoryEvent;
import org.eclipse.aether.RepositoryListener;
/**
- * Forwards repository events to eventspies.
+ * Forwards repository events to EventSpies.
* @since 3.0.2
*/
class EventSpyRepositoryListener
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 066d27f15..b559fb990 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -85,7 +85,7 @@ public class DefaultMavenExecutionRequest
// ----------------------------------------------------------------------------
// We need to allow per execution user and global settings as the embedder
- // might be running in a mode where its executing many threads with totally
+ // might be running in a mode where it's executing many threads with totally
// different settings.
// ----------------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
index bbc827200..f28b50267 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.maven.project.MavenProject;
/**
- * Describes the inter-dependencies between projects in the reactor.
+ * Describes the interdependencies between projects in the reactor.
*
* @author Benjamin Bentmann
* @since 3.0-alpha
@@ -43,7 +43,7 @@ public interface ProjectDependencyGraph
/**
* Gets all projects in their intended build order, i.e. after topologically sorting the projects according to their
- * inter-dependencies.
+ * interdependencies.
*
* @return The projects in the build order, never {@code null}.
*/
diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
index 521698817..c5553d9c8 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
@@ -38,7 +38,7 @@ import org.apache.maven.project.ProjectSorter;
import org.codehaus.plexus.util.dag.CycleDetectedException;
/**
- * Describes the inter-dependencies between projects in the reactor.
+ * Describes the interdependencies between projects in the reactor.
*
* @author Benjamin Bentmann
*/
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
index 04c602cfe..26156db07 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
@@ -53,7 +53,7 @@ public interface LifecycleExecutor
// by the POM builder because they will have to be defined in plugin management. Once this is setComplete then it
// can be passed back so that the default configuration information can be populated.
//
- // We need to know the specific version so that we can lookup the right version of the plugin descriptor
+ // We need to know the specific version so that we can look up the right version of the plugin descriptor
// which tells us what the default configuration is.
//
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
index 68890c2b4..cd7c81266 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
@@ -115,7 +115,7 @@ public class DefaultLifecycleMappingDelegate
}
}
}
- // if not then i need to grab the mojo descriptor and look at the phase that is specified
+ // if not then I need to grab the mojo descriptor and look at the phase that is specified
else
{
for ( String goal : execution.getGoals() )
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
index 444f959fb..1eb7bebea 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -165,7 +165,7 @@ public class LifecycleDependencyResolver
for ( Artifact artifact : resolvedArtifacts )
{
/**
- * MNG-6300: resolvedArtifacts can be cache result; this ensures reactor files are always up to date
+ * MNG-6300: resolvedArtifacts can be cache result; this ensures reactor files are always up-to-date
* During lifecycle the Artifact.getFile() can change from target/classes to the actual jar.
* This clearly shows that target/classes should not be abused as artifactFile just for the classpath
*/
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
index 29a6aa5b3..6e54398fb 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
@@ -55,7 +55,7 @@ public class ProjectBuildList
// TODO Optimize; or maybe just rewrite the whole way aggregating mojos are being run.
/**
* Returns aProjectBuildList that contains only items for the specified taskSegment
- * @param taskSegment the requested tasksegment
+ * @param taskSegment the requested task segment
* @return a project build list for the supplied task segment
*/
public ProjectBuildList getByTaskSegment( TaskSegment taskSegment )
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java
index 89f8354c7..6b736a135 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java
@@ -26,7 +26,7 @@ import org.apache.maven.project.MavenProject;
import java.util.List;
/**
- * A build context that matches a mavenproject to a given tasksegment, and the session to be used.
+ * A build context that matches a Maven project to a given task segment, and the session to be used.
* <p>
* A note to the reader;
* </p>
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java
index 5d78f80c1..95e387de1 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java
@@ -39,7 +39,7 @@ import org.apache.maven.lifecycle.internal.TaskSegment;
public interface Builder
{
//
- // Be nice to whittle this down to Session, maybe add task segments to the session. The session really is the
+ // Be nice to whittle this down to Session, maybe add task segments to the session. The session really is
// the place to store reactor related information.
//
void build( MavenSession session, ReactorContext reactorContext, ProjectBuildList projectBuilds,
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
index c1ef63e7f..5616ad249 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
@@ -105,7 +105,7 @@ public interface MavenPluginManager
/**
* Looks up the mojo for the specified mojo execution and populates its parameters from the configuration given by
* the mojo execution. The mojo/plugin descriptor associated with the mojo execution provides the class realm to
- * lookup the mojo from. <strong>Warning:</strong> The returned mojo instance must be released via
+ * look up the mojo from. <strong>Warning:</strong> The returned mojo instance must be released via
* {@link #releaseMojo(Object, MojoExecution)} when the mojo is no longer needed to free any resources allocated for
* it.
*
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java
index d35ac6c37..91c49f20f 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java
@@ -31,7 +31,7 @@ import org.codehaus.plexus.configuration.PlexusConfigurationException;
* to some deeper problem with Plexus. Context information includes the groupId,
* artifactId, and version for the plugin; at times, the goal name for which
* execution failed; a message detailing the problem; the ClassRealm used to
- * lookup the plugin; and the Plexus exception that caused this error.
+ * look up the plugin; and the Plexus exception that caused this error.
*
* @author jdcasey
*
diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index 57069a5e6..4501d799f 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -295,7 +295,7 @@ public class MavenProject
}
// ----------------------------------------------------------------------
- // Test and compile sourceroots.
+ // Test and compile source roots.
// ----------------------------------------------------------------------
private void addPath( List<String> paths, String path )
@@ -703,7 +703,7 @@ public class MavenProject
/**
* All dependencies that this project has, including transitive ones. Contents are lazily populated, so depending on
- * what phases have run dependencies in some scopes won't be included. eg. if only compile phase has run,
+ * what phases have run dependencies in some scopes won't be included. e.g. if only compile phase has run,
* dependencies with scope test won't be included.
*
* @return {@link Set} < {@link Artifact} >
@@ -1273,7 +1273,7 @@ public class MavenProject
if ( project.getAttachedArtifacts() != null )
{
- // clone properties modifyable by plugins in a forked lifecycle
+ // clone properties modifiable by plugins in a forked lifecycle
setAttachedArtifacts( new ArrayList<>( project.getAttachedArtifacts() ) );
}
@@ -1884,7 +1884,7 @@ public class MavenProject
Xpp3Dom dom = null;
// ----------------------------------------------------------------------
- // I would like to be able to lookup the Mojo object using a key but
+ // I would like to be able to look up the Mojo object using a key but
// we have a limitation in modello that will be remedied shortly. So
// for now I have to iterate through and see what we have.
// ----------------------------------------------------------------------
@@ -1962,7 +1962,7 @@ public class MavenProject
/**
* Gets the project building request from which this project instance was created. <strong>Warning:</strong> This is
- * an utility method that is meant to assist integrators of Maven, it must not be used by Maven plugins.
+ * a utility method that is meant to assist integrators of Maven, it must not be used by Maven plugins.
*
* @return The project building request or {@code null}.
* @since 2.1
@@ -1975,7 +1975,7 @@ public class MavenProject
/**
* Sets the project building request from which this project instance was created. <strong>Warning:</strong> This is
- * an utility method that is meant to assist integrators of Maven, it must not be used by Maven plugins.
+ * a utility method that is meant to assist integrators of Maven, it must not be used by Maven plugins.
*
* @param projectBuildingRequest The project building request, may be {@code null}.
* @since 2.1
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
index 4ac83972b..a2db80ed1 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
@@ -70,7 +70,7 @@ public interface ProjectBuilder
/**
* Builds a project descriptor for the specified model source.
*
- * @param modelSource The source of the model to built the project descriptor from, must not be {@code null}.
+ * @param modelSource The source of the model to build the project descriptor from, must not be {@code null}.
* @param request The project building request that holds further parameters, must not be {@code null}.
* @return The result of the project building, never {@code null}.
* @throws ProjectBuildingException If the project descriptor could not be successfully built.
@@ -84,7 +84,7 @@ public interface ProjectBuilder
* Builds the projects for the specified POM files and optionally their children.
*
* @param pomFiles The POM files to build, must not be {@code null}.
- * @param recursive {@code true} to recursively build sub modules referenced by the POM files, {@code false} to
+ * @param recursive {@code true} to recursively build submodules referenced by the POM files, {@code false} to
* build only the specified POM files.
* @param request The project builder configuration that provides further parameters, must not be {@code null}.
* @return The results of the project builder where each result corresponds to one project that was built, never
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
index a73641034..1051638b3 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
@@ -63,13 +63,13 @@ public class ProjectSorter
// MAVENAPI FIXME: the DAG used is NOT only used to represent the dependency relation,
// but also for <parent>, <build><plugin>, <reports>. We need multiple DAG's
// since a DAG can only handle 1 type of relationship properly.
- // Usecase: This is detected as a cycle:
+ // Use case: This is detected as a cycle:
// org.apache.maven:maven-plugin-api -(PARENT)->
// org.apache.maven:maven -(inherited REPORTING)->
// org.apache.maven.plugins:maven-checkstyle-plugin -(DEPENDENCY)->
// org.apache.maven:maven-plugin-api
// In this case, both the verify and the report goals are called
- // in a different lifecycle. Though the compiler-plugin has a valid usecase, although
+ // in a different lifecycle. Though the compiler-plugin has a valid use case, although
// that seems to work fine. We need to take versions and lifecycle into account.
public ProjectSorter( Collection<MavenProject> projects )
throws CycleDetectedException, DuplicateProjectException
diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java b/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
index 30e77223a..d6c4cd702 100644
--- a/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
+++ b/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
@@ -92,7 +92,7 @@ public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy
if ( fallThrough )
{
LOGGER.debug( "Multi module project collection failed:{}"
- + "Detected that one of the modules of this multi module project uses another module as "
+ + "Detected that one of the modules of this multi-module project uses another module as "
+ "plugin extension which still needed to be built. This is not possible within the same "
+ "reactor build. Another project collection strategy will be executed as result.",
System.lineSeparator() );
@@ -114,8 +114,8 @@ public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy
File multiModuleProjectPom = modelLocator.locatePom( request.getMultiModuleProjectDirectory() );
if ( !multiModuleProjectPom.exists() )
{
- LOGGER.info( "Maven detected that the requested POM file is part of a multi module project, "
- + "but could not find a pom.xml file in the multi module root directory '{}'.",
+ LOGGER.info( "Maven detected that the requested POM file is part of a multi-module project, "
+ + "but could not find a pom.xml file in the multi-module root directory '{}'.",
request.getMultiModuleProjectDirectory() );
LOGGER.info( "The reactor is limited to all projects under: " + request.getPom().getParent() );
return request.getPom();
@@ -141,7 +141,7 @@ public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy
/**
* This method finds out whether collecting projects failed because of the following scenario:
- * - A multi module project containing a module which is a plugin and another module which depends on it.
+ * - A multi-module project containing a module which is a plugin and another module which depends on it.
* - Just the plugin is being built with the -f <pom> flag.
* - Because of inter-module dependency collection, all projects in the multi-module project are collected.
* - The plugin is not yet installed in a repository.
diff --git a/maven-core/src/site/apt/configuration-management.apt b/maven-core/src/site/apt/configuration-management.apt
index 695ea99d6..6ad6e904b 100644
--- a/maven-core/src/site/apt/configuration-management.apt
+++ b/maven-core/src/site/apt/configuration-management.apt
@@ -106,7 +106,7 @@ Plugin configuration
Unified source directory
- Unified source directory structure that is analagous to the repository
+ Unified source directory structure that is analogous to the repository
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
diff --git a/maven-core/src/site/apt/inheritance.apt b/maven-core/src/site/apt/inheritance.apt
index dbf0e2c2b..46e240f0f 100644
--- a/maven-core/src/site/apt/inheritance.apt
+++ b/maven-core/src/site/apt/inheritance.apt
@@ -43,7 +43,7 @@ Maven super model
the top of that lineage to provide default values.
The super model is where we place all the values which we believe to be standard, values that can be shared and
- utilized across all your maven projects.
+ utilized across all your Maven projects.
+-----+
m0 <- m1 <- m2
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java
index acad88894..674435c42 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java
@@ -42,7 +42,7 @@ public class ConcurrencyDependencyGraphTest {
assertEquals( 6, graph.getNumberOfBuilds() );
List<MavenProject> rootSchedulableBuilds = graph.getRootSchedulableBuilds();
- // only Project.A has no dependences
+ // only Project.A has no dependencies
assertEquals( 1, rootSchedulableBuilds.size() );
assertEquals( ProjectDependencyGraphStub.A, rootSchedulableBuilds.iterator().next() );
// double check A deps
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 8df505527..961dc7ca8 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
@@ -41,7 +41,7 @@ import java.util.Arrays;
import java.util.List;
/**
- * A stub dependency graph that is custom made for testing concurrent build graph evaluations.
+ * A stub dependency graph that is custom-made for testing concurrent build graph evaluations.
* <p>
* Implements a graph as follows:
* A has no dependencies
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 3b2d63aae..c2ab83cce 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
@@ -111,7 +111,7 @@ public class PomConstructionTest
}
/**
- * Will throw exception if doesn't find parent(s) in build
+ * Will throw an exception if it doesn't find parent(s) in build
*
* @throws Exception in case of issue
*/
diff --git a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
index 8464f9c3d..2f2f3712c 100644
--- a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
+++ b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
@@ -29,7 +29,7 @@ under the License.
<name>Maven Integration Test :: MNG-3979</name>
<description>
- Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
+ Test that during inheritance the merging/joining of subtrees with equal identifier doesn't crash if the parent
POM has a non-empty element and the child POM has an empty element to join.
</description>
diff --git a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
index 277207e30..b15fa1fdb 100644
--- a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
@@ -32,7 +32,7 @@ under the License.
<name>Maven Integration Test :: MNG-3979</name>
<description>
- Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
+ Test that during inheritance the merging/joining of subtrees with equal identifier doesn't crash if the parent
POM has a non-empty element and the child POM has an empty element to join.
</description>
diff --git a/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml
index 2774294df..f9c0825ce 100644
--- a/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml
+++ b/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml
@@ -29,7 +29,7 @@ under the License.
<name>Maven Integration Test :: MNG-3845</name>
<description>
- Test that inheritance is all-or-nothing for certain sub-trees of the POM.
+ Test that inheritance is all-or-nothing for certain subtrees of the POM.
</description>
<organization>
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 57be19632..4cdfbfd4d 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -83,7 +83,7 @@ public final class CLIReportingUtils
}
/**
- * Create a human readable string containing the Maven version, buildnumber, and time of build
+ * Create a human-readable string containing the Maven version, buildnumber, and time of build
*
* @param buildProperties The build properties
* @return Readable build info
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 27e726dd5..0ac2cc95e 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
@@ -1220,7 +1220,7 @@ public class MavenCli
// is always available in the core and likely always will be, but we may have another ConfigurationProcessor
// present supplied by the user. The rule is that we only allow the execution of one ConfigurationProcessor.
// If there is more than one then we execute the one supplied by the user, otherwise we execute the
- // the default SettingsXmlConfigurationProcessor.
+ // default SettingsXmlConfigurationProcessor.
//
int userSuppliedConfigurationProcessorCount = configurationProcessors.size() - 1;
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
index 379b5e7e1..e01b363f1 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
@@ -290,7 +290,7 @@ public class DefaultModelBuildingRequest
{
this.systemProperties = new Properties();
synchronized ( systemProperties )
- { // avoid concurrentmodification if someone else sets/removes an unrelated system property
+ { // avoid concurrent modification if someone else sets/removes an unrelated system property
this.systemProperties.putAll( systemProperties );
}
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
index cc2daf8ff..168612d39 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
@@ -42,12 +42,12 @@ import org.eclipse.sisu.Typed;
* made this component available under all its interfaces then it could end up being injected
* into itself leading to a stack overflow.
*
- * A side-effect of using @Typed is that it translates to explicit bindings in the container.
+ * A side effect of using @Typed is that it translates to explicit bindings in the container.
* So instead of binding the component under a 'wildcard' key it is now bound with an explicit
* key. Since this is a default component this will be a plain binding of ModelProcessor to
* this implementation type, ie. no hint/name.
*
- * This leads to a second side-effect in that any @Inject request for just ModelProcessor in
+ * This leads to a second side effect in that any @Inject request for just ModelProcessor in
* the same injector is immediately matched to this explicit binding, which means extensions
* cannot override this binding. This is because the lookup is always short-circuited in this
* specific situation (plain @Inject request, and plain explicit binding for the same type.)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
index e9d18e456..0485b84b6 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
@@ -44,7 +44,7 @@ public class ModelBuildingException
*
* @param model The model that could not be built, may be {@code null}.
* @param modelId The identifier of the model that could not be built, may be {@code null}.
- * @param problems The problems that causes this exception, may be {@code null}.
+ * @param problems The problems that cause this exception, may be {@code null}.
* @deprecated Use {@link #ModelBuildingException(ModelBuildingResult)} instead.
*/
@Deprecated
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
index 1ef4341a8..7a3e5e616 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
@@ -122,7 +122,7 @@ class ModelData
*/
public String getId()
{
- // if source is null, it is the supermodel, which can be accessed via empty string
+ // if source is null, it is the super model, which can be accessed via empty string
return Objects.toString( source, "" );
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java
index 7977d3a6e..8bbaf8035 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java
@@ -22,7 +22,7 @@ package org.apache.maven.model.building;
import java.util.List;
/**
- * Extends the ModelproblemCollector by the capacity of returning the collected problems.
+ * Extends the ModelProblemCollector by the capacity of returning the collected problems.
* @author Milos Kleint
*/
public interface ModelProblemCollectorExt extends ModelProblemCollector
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java
index a2504ef38..56c80ce72 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java
@@ -28,7 +28,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParser;
* The ModelSourceTransformer is a way to transform the local pom while streaming the input.
*
* The {@link #transform(XmlPullParser, Path, TransformerContext)} method uses a Path on purpose, to ensure the
- * local pom is the the original source.
+ * local pom is the original source.
*
* @author Robert Scholte
* @author Guillaume Nodet
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java
index 1b2cbc341..cd3f14dd1 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java
@@ -22,7 +22,7 @@ package org.apache.maven.model.io;
import java.io.IOException;
/**
- * Signals a failure to parse the POM due to invalid syntax (e.g. non-wellformed XML or unknown elements).
+ * Signals a failure to parse the POM due to invalid syntax (e.g. non well formed XML or unknown elements).
*
* @author Benjamin Bentmann
*/
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java b/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java
index 3aa0045c2..831fed6a3 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java
@@ -31,7 +31,7 @@ public interface ModelLocator
/**
* Locates the POM file within the specified project directory. In case the given project directory does not exist
- * or does not contain a POM file, the return value indicates the expected path to the POM file. Sub directories of
+ * or does not contain a POM file, the return value indicates the expected path to the POM file. Subdirectories of
* the project directory will not be considered when locating the POM file. The return value will be an absolute
* path if the project directory is given as an absolute path.
*
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
index 146d4531f..a07eaf6a4 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
@@ -102,9 +102,9 @@ public interface ModelResolver
/**
* Adds a repository to use for subsequent resolution requests. The order in which repositories are added matters,
* repositories that were added first should also be searched first. When multiple repositories with the same
- * identifier are added, then the value of the replace argument is determines the behaviour.
+ * identifier are added, then the value of the replace argument determines the behaviour.
*
- * If replace is false than any existing repository with the same Id will remain in use. If replace
+ * If replace is false then any existing repository with the same Id will remain in use. If replace
* is true the new repository replaces the original.
*
* @param repository The repository to add to the internal search chain, must not be {@code null}.
diff --git a/maven-model-builder/src/site/apt/index.apt b/maven-model-builder/src/site/apt/index.apt
index fb85167c1..5eb2374fa 100644
--- a/maven-model-builder/src/site/apt/index.apt
+++ b/maven-model-builder/src/site/apt/index.apt
@@ -53,7 +53,7 @@ Maven Model Builder
** Build up a raw model by re-reading the file and enrich it based on information available in the reactor. Some features:
- *** Resolve version of versionless parents based on realtivePath (including ci-friendly versions)
+ *** Resolve version of versionless parents based on relativePath (including ci-friendly versions)
*** Resolve version of versionless dependencies that are part of the reactor
@@ -141,7 +141,7 @@ Maven Model Builder
** since Maven 3.5.0, if <<<project.directory>>> POM property value is defined, it is used instead of artifact id:
this permits default inheritance calculations when module directory name is not equal to artifact id. Notice that this
- property is not inherited from a POM to its child: childs POM will use child artifact id if property is not
+ property is not inherited from a POM to its child: child's POM will use child artifact id if property is not
set.
** since Maven 3.6.1, inheritance can avoid appending any path to parent value by setting model attribute value to
diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-groupId.xml b/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-groupId.xml
index 831c05f26..eaf4a9712 100644
--- a/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-groupId.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-groupId.xml
@@ -30,7 +30,7 @@ under the License.
<version>1.0</version>
<dependencies>
<dependency>
- <!-- groupd id missing -->
+ <!-- groupId missing -->
<artifactId>a</artifactId>
<version>2.0</version>
</dependency>
diff --git a/maven-model-transform/src/test/java/org/apache/maven/model/transform/ParentXMLFilterTest.java b/maven-model-transform/src/test/java/org/apache/maven/model/transform/ParentXMLFilterTest.java
index 98191cb1f..85714934d 100644
--- a/maven-model-transform/src/test/java/org/apache/maven/model/transform/ParentXMLFilterTest.java
+++ b/maven-model-transform/src/test/java/org/apache/maven/model/transform/ParentXMLFilterTest.java
@@ -180,7 +180,7 @@ public class ParentXMLFilterTest
}
/**
- * An empty relative path means it must downloaded from a repository.
+ * An empty relative path means it must be downloaded from a repository.
* That implies that the version cannot be solved (if missing, Maven should complain)
*
* @throws Exception
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index 3de0f2e02..b669128b2 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -1291,7 +1291,7 @@
<![CDATA[
Gives the status of this artifact in the remote repository.
This must not be set in your local project, as it is updated by
- tools placing it in the reposiory. Valid values are: <code>none</code> (default),
+ tools placing it in the repository. Valid values are: <code>none</code> (default),
<code>converted</code> (repository manager converted this from an Maven 1 POM),
<code>partner</code>
(directly synced from a partner Maven 2 repository), <code>deployed</code> (was deployed from a Maven 2
@@ -2836,7 +2836,7 @@
<version>4.0.0+</version>
<description>
<![CDATA[
- The version of the reporting plugin to be used. Starting with Maven 3, if no version is defined explicitely,
+ The version of the reporting plugin to be used. Starting with Maven 3, if no version is defined explicitly,
version is searched in <code>build/plugins</code> then in <code>build/pluginManagement</code>.
]]>
</description>
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 b41eba987..f32fbe411 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
@@ -94,7 +94,7 @@ public class MojoDescriptor
private String deprecated;
/**
- * Flags this Mojo to run it in a multi module way, i.e. aggregate the build with the set of projects listed as
+ * Flags this Mojo to run it in a multi-module way, i.e. aggregate the build with the set of projects listed as
* modules. By default, no need to aggregate the Maven project and its child modules
*/
private boolean aggregator = false;
@@ -345,7 +345,7 @@ public class MojoDescriptor
}
/**
- * @return the binded phase name of the Mojo
+ * @return the bound phase name of the Mojo
*/
public String getPhase()
{
@@ -353,7 +353,7 @@ public class MojoDescriptor
}
/**
- * @param phase the new binded phase name of the Mojo
+ * @param phase the new bound phase name of the Mojo
*/
public void setPhase( String phase )
{
diff --git a/maven-plugin-api/src/main/mdo/plugin.mdo b/maven-plugin-api/src/main/mdo/plugin.mdo
index 0bb1b511e..ee80045df 100644
--- a/maven-plugin-api/src/main/mdo/plugin.mdo
+++ b/maven-plugin-api/src/main/mdo/plugin.mdo
@@ -240,7 +240,7 @@ under the License.
<version>1.0.0</version>
<type>boolean</type>
<description>
- Flags this Mojo to run it in a multi module way, i.e. aggregate the build with the set of projects
+ Flags this Mojo to run it in a multi-module way, i.e. aggregate the build with the set of projects
listed as modules.
</description>
<defaultValue>false</defaultValue>
diff --git a/maven-repository-metadata/src/site/apt/index.apt b/maven-repository-metadata/src/site/apt/index.apt
index 1a484f9f5..75f067ad6 100644
--- a/maven-repository-metadata/src/site/apt/index.apt
+++ b/maven-repository-metadata/src/site/apt/index.apt
@@ -44,7 +44,7 @@ Maven Repository Metadata Model
gives data about available versions (<<<latest>>>, <<<release>>>, <<<versions>>> list and <<<lastUpdated>>>),
[[3]] in a "groupId/artifactId/version" snapshot artifact directory: metadata describes <<<groupId>>>, <<<artifactId>>>, <<<version>>> (base version, i.e. ending in <<<-SNAPSHOT>>>) and
- <<<versioning>>> element that gives data about snaphot (<<<snapshot>>>, <<<lastUpdated>>> and <<<snapshotVersions>>> list). Notice that a
+ <<<versioning>>> element that gives data about snapshot (<<<snapshot>>>, <<<lastUpdated>>> and <<<snapshotVersions>>> list). Notice that a
release artifact directory is not expected to provide metadata.
[]
@@ -61,4 +61,3 @@ Maven Repository Metadata Model
~~ 2. this will remove the code that updates plugins data: see MNG-7375/MPLUGIN-384 https://maven.apache.org/ref/3.8.4/maven-compat/apidocs/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.html
~~ 3. this will lead to inconsistent data: removing it will be safer/more clear
~~ but this logic still remains to be confirmed by clear consensus of the whole team
-
\ No newline at end of file
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
index 4bb691b4b..f39f57924 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
@@ -117,7 +117,7 @@ public class DefaultSettingsBuildingRequest
{
this.systemProperties = new Properties();
synchronized ( systemProperties )
- { // avoid concurrentmodification if someone else sets/removes an unrelated system property
+ { // avoid concurrent modification if someone else sets/removes an unrelated system property
this.systemProperties.putAll( systemProperties );
}
}
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
index 530d522ed..89ce8d4da 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
@@ -40,7 +40,7 @@ public class SettingsBuildingException
/**
* Creates a new exception with the specified problems.
*
- * @param problems The problems that causes this exception, may be {@code null}.
+ * @param problems The problems that cause this exception, may be {@code null}.
*/
public SettingsBuildingException( List<SettingsProblem> problems )
{
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java
index 425e6d8eb..b8772a919 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java
@@ -22,7 +22,7 @@ package org.apache.maven.settings.io;
import java.io.IOException;
/**
- * Signals a failure to parse the settings due to invalid syntax (e.g. non-wellformed XML or unknown elements).
+ * Signals a failure to parse the settings due to invalid syntax (e.g. non well formed XML or unknown elements).
*
* @author Benjamin Bentmann
*/
diff --git a/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java b/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java
index 9020037f8..39ffb7ef9 100644
--- a/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java
+++ b/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java
@@ -22,7 +22,7 @@ package org.apache.maven.settings;
import java.io.File;
/**
- * To handle runtime informations like local repository or profiles.
+ * To handle runtime information like local repository or profiles.
*
*/
@Deprecated
diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
index ccd354bb2..c598f7653 100644
--- a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
+++ b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
@@ -39,7 +39,7 @@ public class ToolchainsBuildingException
/**
* Creates a new exception with the specified problems.
*
- * @param problems The problems that causes this exception, must not be {@code null}.
+ * @param problems The problems that cause this exception, must not be {@code null}.
*/
public ToolchainsBuildingException( List<Problem> problems )
{
diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java
index 95c2aed82..71608ff1f 100644
--- a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java
+++ b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java
@@ -22,7 +22,7 @@ package org.apache.maven.toolchain.io;
import java.io.IOException;
/**
- * Signals a failure to parse the toolchains due to invalid syntax (e.g. non-wellformed XML or unknown elements).
+ * Signals a failure to parse the toolchains due to invalid syntax (e.g. non well formed XML or unknown elements).
*
* @author Robert Scholte
* @since 3.3.0