diff --git a/src/it/projects/build-classpath-changeparams/test.properties b/src/it/projects/build-classpath-changeparams/test.properties index a4f45b9d0..dda8dd88d 100644 --- a/src/it/projects/build-classpath-changeparams/test.properties +++ b/src/it/projects/build-classpath-changeparams/test.properties @@ -19,7 +19,7 @@ mdep.outputFile = target/classpath.txt mdep.fileSeparator = / mdep.pathSeparator = : -# for test we change default parameters +# for test, we change default parameters mdep.prependGroupId = true mdep.stripClassifier = true mdep.prefix = PREFIX diff --git a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java index 619c5986c..48d37908d 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java @@ -80,7 +80,7 @@ public class GetMojo extends AbstractMojo { private final DefaultDependableCoordinate coordinate = new DefaultDependableCoordinate(); /** - * Repositories in the format id::[layout]::url or just url, separated by comma. ie. + * Repositories in the format id::[layout]::url or just url, separated by comma. i.e. * central::default::https://repo.maven.apache.org/maven2,myrepo::::https://repo.acme.com,https://repo.acme2.com. */ @Parameter(property = "remoteRepositories") diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java index 26ef281e5..f00c45f93 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java @@ -104,7 +104,7 @@ public abstract class AbstractAnalyzeMojo extends AbstractMojo { private boolean ignoreAllNonTestScoped; /** - * Output the xml for the missing dependencies (used but not declared). + * Output the XML for the missing dependencies (used but not declared). * * @since 2.0-alpha-5 */ diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java index 4fbea1c3f..b697533ce 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java +++ b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java @@ -200,7 +200,7 @@ public void setVersion(String version) { } /** - * @return teturns the base version + * @return the base version */ public String getBaseVersion() { return ArtifactUtils.toSnapshotVersion(version); @@ -273,7 +273,7 @@ public void setNeedsProcessing(boolean needsProcessing) { } /** - * @return teturns the overWriteSnapshots + * @return the overWriteSnapshots */ public String getOverWrite() { return this.overWrite; @@ -287,7 +287,7 @@ public void setOverWrite(String overWrite) { } /** - * @return returns the encoding + * @return the encoding * @since 3.0 */ public String getEncoding() { @@ -303,7 +303,7 @@ public void setEncoding(String encoding) { } /** - * @return returns the artifact + * @return the artifact */ public Artifact getArtifact() { return this.artifact; @@ -317,7 +317,7 @@ public void setArtifact(Artifact artifact) { } /** - * @return returns a comma separated list of excluded items + * @return a comma separated list of excluded items */ public String getExcludes() { return DependencyUtil.cleanToBeTokenizedString(this.excludes); @@ -331,7 +331,7 @@ public void setExcludes(String excludes) { } /** - * @return returns a comma separated list of items to include + * @return a comma separated list of items to include */ public String getIncludes() { return DependencyUtil.cleanToBeTokenizedString(this.includes); diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java index b14f0113d..c7e1a50b6 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java @@ -383,7 +383,7 @@ private MavenProject buildProjectFromArtifact(Artifact artifact) throws MojoExec buildingRequest.setProcessPlugins(false); return projectBuilder.build(artifact, buildingRequest).getProject(); } catch (ProjectBuildingException e) { - throw new MojoExecutionException("Coud not build project for " + artifact.getId(), e); + throw new MojoExecutionException("Could not build project for " + artifact.getId(), e); } } diff --git a/src/main/java/org/apache/maven/plugins/dependency/tree/GraphmlDependencyNodeVisitor.java b/src/main/java/org/apache/maven/plugins/dependency/tree/GraphmlDependencyNodeVisitor.java index c81a81a61..78811c626 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/tree/GraphmlDependencyNodeVisitor.java +++ b/src/main/java/org/apache/maven/plugins/dependency/tree/GraphmlDependencyNodeVisitor.java @@ -35,7 +35,7 @@ public class GraphmlDependencyNodeVisitor extends AbstractSerializingVisitor implements DependencyNodeVisitor { /** - * Graphml xml file header. Define Schema and root element. We also define 2 key as meta data. + * GraphML XML file header. Define Schema and root element. We also define 2 key as meta data. */ private static final String GRAPHML_HEADER = " " + "" + System.lineSeparator(); /** - * Graphml xml file footer. + * GraphML XML file footer. */ private static final String GRAPHML_FOOTER = ""; diff --git a/src/main/java/org/apache/maven/plugins/dependency/tree/JsonDependencyNodeVisitor.java b/src/main/java/org/apache/maven/plugins/dependency/tree/JsonDependencyNodeVisitor.java index 5faefbf1a..719d36cd8 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/tree/JsonDependencyNodeVisitor.java +++ b/src/main/java/org/apache/maven/plugins/dependency/tree/JsonDependencyNodeVisitor.java @@ -146,8 +146,8 @@ private void appendNodeValues(StringBuilder sb, int indent, Artifact artifact, b * * @param sb the string builder to append to * @param indent the current indent level - * @param key the key used as json key - * @param value the value used as json value + * @param key the key used as JSON key + * @param value the value used as JSON value */ private void appendKeyValue(StringBuilder sb, int indent, String key, String value) { if (value == null) { @@ -171,8 +171,8 @@ private void appendKeyValue(StringBuilder sb, int indent, String key, String val * * @param sb the string builder to append to * @param indent the current indent level - * @param key the key used as json key - * @param value the value used as json value + * @param key the key used as JSON key + * @param value the value used as JSON value */ private void appendKeyWithoutComma(StringBuilder sb, int indent, String key, String value) { if (value == null) { diff --git a/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java b/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java index 11e8be21a..620be36b9 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java +++ b/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java @@ -92,7 +92,7 @@ public static String getFormattedFileName( * @param removeVersion specifies if the version should be removed from the file name * @param prependGroupId specifies if the groupId should be prepended to the file name * @param useBaseVersion specifies if the baseVersion of the artifact should be used instead of the version - * @param removeClassifier specifies if the classifier of the artifact should be remved from the file name + * @param removeClassifier specifies if the classifier of the artifact should be removed from the file name * @return formatted file name in the format [groupId].artifactId-[version]-[classifier].[type] */ public static String getFormattedFileName( diff --git a/src/main/resources/analyze-report_en.properties b/src/main/resources/analyze-report_en.properties index 607b4bf3a..256563d3e 100644 --- a/src/main/resources/analyze-report_en.properties +++ b/src/main/resources/analyze-report_en.properties @@ -18,5 +18,5 @@ # NOTE: # This bundle is intentionally empty because English strings are provided by the base bundle via the parent chain. It # must be provided nevertheless such that a request for locale "en" will not erroneously pick up the bundle for the -# JVM's default locale (which need not be "en"). See the method javadoc about +# JVM's default locale (which need not be "en"). See the method Javadoc about # ResourceBundle.getBundle(String, Locale, ClassLoader) diff --git a/src/site/apt/examples/copying-artifacts.apt.vm b/src/site/apt/examples/copying-artifacts.apt.vm index 7c4d707bd..4fe758670 100644 --- a/src/site/apt/examples/copying-artifacts.apt.vm +++ b/src/site/apt/examples/copying-artifacts.apt.vm @@ -201,7 +201,7 @@ Copying specific artifacts ${project.version} - copy-with-alternalte-repo + copy-with-alternate-repo install copy diff --git a/src/site/apt/examples/purging-local-repository.apt.vm b/src/site/apt/examples/purging-local-repository.apt.vm index cc08a749f..e7029fdec 100644 --- a/src/site/apt/examples/purging-local-repository.apt.vm +++ b/src/site/apt/examples/purging-local-repository.apt.vm @@ -47,7 +47,7 @@ mvn dependency:purge-local-repository dependency tree information before beginning the purge process. To avoid this pre-download step, the plugin can be configured to operate only - on the direct dependencies of the project using the "actTranstively" parameter. + on the direct dependencies of the project using the "actTransitively" parameter. +---+ mvn dependency:purge-local-repository -DactTransitively=false diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java index 57c4e0da4..cd664a0cf 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java @@ -201,7 +201,7 @@ void testSkip(CopyMojo mojo) throws Exception { assertFalse(mojo.getArtifactItems().isEmpty()); for (ArtifactItem item : mojo.getArtifactItems()) { - // these will be null because no processing has occured only when everything is skipped + // these will be null because no processing has occurred only when everything is skipped assertNull(item.getOutputDirectory()); assertNull(item.getDestFileName()); } @@ -736,7 +736,7 @@ void testCopyOverWriteIfNewer(CopyMojo mojo) throws Exception { @Test @InjectMojo(goal = "copy") - void testCopyFileWithOverideLocalRepo(CopyMojo mojo) throws Exception { + void testCopyFileWithOverrideLocalRepo(CopyMojo mojo) throws Exception { List list = stubFactory.getArtifactItems(stubFactory.getClassifiedArtifacts()); diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java index 453322c4a..c67d9967c 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java @@ -72,9 +72,9 @@ void setUp() throws Exception { stubFactory = new DependencyArtifactStubFactory(tempDir, true, false); session.getRequest().setLocalRepositoryPath(new File(tempDir, "localTestRepo")); - // it needs to get the archivermanager + // it needs to get the archiverManager stubFactory.setUnpackableFile(archiverManager); - // i'm using one file repeatedly to archive so I can test the name + // I'm using one file repeatedly to archive so I can test the name // programmatically. stubFactory.setSrcFile(MojoExtension.getTestFile(UNPACKABLE_FILE)); diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java index 0f61cd5a9..feae529aa 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java @@ -70,9 +70,9 @@ void setUp() throws Exception { stubFactory = new DependencyArtifactStubFactory(tempDir, true, false); session.getRequest().setLocalRepositoryPath(new File(tempDir, "localTestRepo")); - // it needs to get the archivermanager + // it needs to get the archiverManager stubFactory.setUnpackableFile(archiverManager); - // i'm using one file repeatedly to archive so I can test the name + // I'm using one file repeatedly to archive so I can test the name // programmatically. stubFactory.setSrcFile(MojoExtension.getTestFile(UNPACKABLE_FILE)); diff --git a/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java b/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java index 1931fc987..487a1e847 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java @@ -206,7 +206,7 @@ void testTreeJsonCircularDependency() throws IOException { } /* - * Test parsing of Json output and verify all key-value pairs + * Test parsing of JSON output and verify all key-value pairs */ @Test @InjectMojo(goal = "tree") diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java b/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java index 569cb6a72..1b7a28801 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java +++ b/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java @@ -311,7 +311,7 @@ void fileNameClassifierWithFile() { expectedResult = "two.war"; assertEquals(expectedResult, name); - // test that we pickup the correct extension in the file name if set. + // test that we pick up the correct extension in the file name if set. ah = new DefaultArtifactHandlerStub("jar", null); artifact = new DefaultArtifact("test", "two", vr, Artifact.SCOPE_PROVIDED, "war", "", ah, false); name = DependencyUtil.getFormattedFileName(artifact, true); diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java b/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java index 52b8cd377..b959f9254 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java +++ b/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java @@ -113,7 +113,7 @@ void markerTimeStamp() throws Exception { theArtifact.setFile(theFile); DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler(theArtifact, this.outputFolder); assertFalse(handler.isMarkerSet()); - // if the marker is not set, assume it is infinately older than the + // if the marker is not set, assume it is infinitely older than the // artifact. assertTrue(handler.isMarkerOlder(theArtifact)); handler.setMarker(); diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java b/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java index c488b7220..333c93173 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java +++ b/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java @@ -197,7 +197,7 @@ private void doTestMarkerTimeStamp(boolean resolved) throws MojoExecutionExcepti assertFalse(resolvedHandler.isMarkerSet()); assertFalse(unResolvedHandler.isMarkerSet()); - // if the marker is not set, assume it is infinately older than the + // if the marker is not set, assume it is infinitely older than the // artifact. assertTrue(resolvedHandler.isMarkerOlder(theArtifact)); assertTrue(unResolvedHandler.isMarkerOlder(theArtifact)); diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java b/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java index 8c7ad4536..a3e8717b4 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java +++ b/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java @@ -118,7 +118,7 @@ void markerTimeStamp() throws Exception { theArtifact.setFile(theFile); UnpackFileMarkerHandler handler = new UnpackFileMarkerHandler(theArtifactItem, this.outputFolder); assertFalse(handler.isMarkerSet()); - // if the marker is not set, assume it is infinately older than the + // if the marker is not set, assume it is infinitely older than the // artifact. assertTrue(handler.isMarkerOlder(theArtifact)); handler.setMarker(); diff --git a/src/test/resources/unit/go-offline-test/exclude-plugin-config.xml b/src/test/resources/unit/go-offline-test/exclude-plugin-config.xml index c80cf3433..20cf7c3db 100644 --- a/src/test/resources/unit/go-offline-test/exclude-plugin-config.xml +++ b/src/test/resources/unit/go-offline-test/exclude-plugin-config.xml @@ -21,8 +21,8 @@ skip-this-artifact,skip-this-artifact-too + comma-delimited scope exclusions. only one at a time. the other filters support + comma-delimited lists --> system ear,pom