Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -273,7 +273,7 @@ public void setNeedsProcessing(boolean needsProcessing) {
}

/**
* @return teturns the overWriteSnapshots
* @return the overWriteSnapshots
*/
public String getOverWrite() {
return this.overWrite;
Expand All @@ -287,7 +287,7 @@ public void setOverWrite(String overWrite) {
}

/**
* @return returns the encoding
* @return the encoding
* @since 3.0
*/
public String getEncoding() {
Expand All @@ -303,7 +303,7 @@ public void setEncoding(String encoding) {
}

/**
* @return returns the artifact
* @return the artifact
*/
public Artifact getArtifact() {
return this.artifact;
Expand All @@ -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);
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> "
+ "<graphml xmlns=\"http://graphml.graphdrawing.org/xmlns\" "
Expand All @@ -48,7 +48,7 @@ public class GraphmlDependencyNodeVisitor extends AbstractSerializingVisitor imp
+ "<graph id=\"dependencies\" edgedefault=\"directed\">" + System.lineSeparator();

/**
* Graphml xml file footer.
* GraphML XML file footer.
*/
private static final String GRAPHML_FOOTER = "</graph></graphml>";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/analyze-report_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion src/site/apt/examples/copying-artifacts.apt.vm
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ Copying specific artifacts
<version>${project.version}</version>
<executions>
<execution>
<id>copy-with-alternalte-repo</id>
<id>copy-with-alternate-repo</id>
<phase>install</phase>
<goals>
<goal>copy</goal>
Expand Down
2 changes: 1 addition & 1 deletion src/site/apt/examples/purging-local-repository.apt.vm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down Expand Up @@ -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<ArtifactItem> list = stubFactory.getArtifactItems(stubFactory.getClassifiedArtifacts());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<excludeArtifactIds>skip-this-artifact,skip-this-artifact-too
</excludeArtifactIds>
<!-- the maven-common-artifact-filters library does not support
comma delimited scope exclusions. only one at a time. the other filters support
comma delimited lists -->
comma-delimited scope exclusions. only one at a time. the other filters support
comma-delimited lists -->
<!-- <excludeScope>compile,system</excludeScope> -->
<excludeScope>system</excludeScope>
<excludeTypes>ear,pom</excludeTypes>
Expand Down
Loading