You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2017/03/08 17:03:15 UTC
[11/46] maven git commit: [MNG-6146] Several small stylistic and
spelling improvements to code and documentation
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml
deleted file mode 100644
index fbae181..0000000
--- a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.mng4000</groupId>
- <artifactId>test2</artifactId>
- <version>0.1</version>
-
- <name>Maven Integration Test :: MNG-4000</name>
- <description>
- Test that plugin executions without id are not lost among other plugin executions.
- </description>
-
- <build>
- <!-- NOTE: This test uses plugin management for the IT plugin. -->
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-log-file</artifactId>
- <version>2.1-SNAPSHOT</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-log-file</artifactId>
- <configuration>
- <logFile>target/exec.log</logFile>
- <string>exec</string>
- </configuration>
- <executions>
- <execution>
- <id>exec-1</id>
- <phase>validate</phase>
- <goals>
- <goal>log-string</goal>
- </goals>
- </execution>
- <execution>
- <!-- NOTE: <id> deliberately omitted here! -->
- <phase>validate</phase>
- <goals>
- <goal>log-string</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml
new file mode 100644
index 0000000..7910084
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4000</groupId>
+ <artifactId>test1</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-4000</name>
+ <description>
+ Test that plugin executions without id are not lost among other plugin executions.
+ </description>
+
+ <build>
+ <!-- NOTE: This test does not use plugin management for the IT plugin. -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <logFile>target/exec.log</logFile>
+ <string>exec</string>
+ </configuration>
+ <executions>
+ <execution>
+ <id>exec-1</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>log-string</goal>
+ </goals>
+ </execution>
+ <execution>
+ <!-- NOTE: <id> deliberately omitted here! -->
+ <phase>validate</phase>
+ <goals>
+ <goal>log-string</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml
deleted file mode 100644
index 7910084..0000000
--- a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.mng4000</groupId>
- <artifactId>test1</artifactId>
- <version>0.1</version>
-
- <name>Maven Integration Test :: MNG-4000</name>
- <description>
- Test that plugin executions without id are not lost among other plugin executions.
- </description>
-
- <build>
- <!-- NOTE: This test does not use plugin management for the IT plugin. -->
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-log-file</artifactId>
- <version>2.1-SNAPSHOT</version>
- <configuration>
- <logFile>target/exec.log</logFile>
- <string>exec</string>
- </configuration>
- <executions>
- <execution>
- <id>exec-1</id>
- <phase>validate</phase>
- <goals>
- <goal>log-string</goal>
- </goals>
- </execution>
- <execution>
- <!-- NOTE: <id> deliberately omitted here! -->
- <phase>validate</phase>
- <goals>
- <goal>log-string</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml b/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml
index f66ae25..477a759 100644
--- a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml
@@ -29,7 +29,7 @@ under the License.
<name>Maven Integration Test :: MNG-3808</name>
<description>
- Test the reports are executeed in the order given in the POM.
+ Test the reports are executed in the order given in the POM.
</description>
<build>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/pom-inheritance/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/pom-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/pom-inheritance/sub/pom.xml
index ae74902..2dbddd6 100644
--- a/maven-core/src/test/resources-project-builder/pom-inheritance/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/pom-inheritance/sub/pom.xml
@@ -23,7 +23,7 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<!--
- This minimalistic POM tests mere inheritance from its parent.
+ This minimalist POM tests mere inheritance from its parent.
-->
<parent>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml b/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml
index 349a0c3..910018a 100644
--- a/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml
+++ b/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml
@@ -23,7 +23,7 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<!--
- This minimalistic POM tests mere inheritance from its parent. The <prerequisites> should not be inherited.
+ This minimalist POM tests mere inheritance from its parent. The <prerequisites> should not be inherited.
-->
<parent>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml
index 5c1daca..5905657 100644
--- a/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml
+++ b/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<name>Maven Integration Test :: it0043</name>
- <description>Test for repository inheritence - ensure using the same id overrides the defaults</description>
+ <description>Test for repository inheritance - ensure using the same id overrides the defaults</description>
<repositories>
<repository>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/system-property-interpolation/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/system-property-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/system-property-interpolation/pom.xml
new file mode 100644
index 0000000..7d48d90
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/system-property-interpolation/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>gid</groupId>
+ <artifactId>aid</artifactId>
+ <version>1.0</version>
+
+ <name>${system.property}</name>
+</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/sytem-property-interpolation/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/sytem-property-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/sytem-property-interpolation/pom.xml
deleted file mode 100644
index 7d48d90..0000000
--- a/maven-core/src/test/resources-project-builder/sytem-property-interpolation/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>gid</groupId>
- <artifactId>aid</artifactId>
- <version>1.0</version>
-
- <name>${system.property}</name>
-</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt-in-profile/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt-in-profile/pom.xml b/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt-in-profile/pom.xml
new file mode 100644
index 0000000..38ad7f7
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt-in-profile/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <profiles>
+ <profile>
+ <id>test</id>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt/pom.xml b/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt/pom.xml
new file mode 100644
index 0000000..de69bb4
--- /dev/null
+++ b/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4005</groupId>
+ <artifactId>a</artifactId>
+ <version>0.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mngt-in-profile/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mngt-in-profile/pom.xml b/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mngt-in-profile/pom.xml
deleted file mode 100644
index 38ad7f7..0000000
--- a/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mngt-in-profile/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.mng4005</groupId>
- <artifactId>b</artifactId>
- <version>0.1</version>
- <packaging>jar</packaging>
-
- <profiles>
- <profile>
- <id>test</id>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.mng4005</groupId>
- <artifactId>a</artifactId>
- <version>0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.mng4005</groupId>
- <artifactId>a</artifactId>
- <version>0.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mngt/pom.xml b/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mngt/pom.xml
deleted file mode 100644
index de69bb4..0000000
--- a/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mngt/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.mng4005</groupId>
- <artifactId>b</artifactId>
- <version>0.1</version>
- <packaging>jar</packaging>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.mng4005</groupId>
- <artifactId>a</artifactId>
- <version>0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.mng4005</groupId>
- <artifactId>a</artifactId>
- <version>0.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml b/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml
index 5822d8d..c5df7aa 100644
--- a/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml
+++ b/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml
@@ -47,7 +47,7 @@ under the License.
<!--
This checks the coalescing of CHARACTERS events which would otherwise be reported in chunks of the internal parser
buffer size (usually 4 or 8 KB). The text block is designed such that its length is exactly 32 KB after leading
- and traling whitespace has been removed and all line terminators have been removed.
+ and trailing whitespace has been removed and all line terminators have been removed.
-->
<prop2>
00 KB 1 2 3 4 5 6 X
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom
index b335040..e6100b4 100644
--- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom
+++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom
@@ -295,7 +295,7 @@ under the License.
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-4</version>
<configuration>
- <!-- This element will be overriden by children -->
+ <!-- This element will be overridden by children -->
<tagBase>https://svn.apache.org/repos/asf/maven/pom/tags</tagBase>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy</goals>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java b/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
index ee90c20..ab1b1a0 100644
--- a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
+++ b/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
@@ -44,7 +44,7 @@ public class AppTest
}
/**
- * Rigourous Test :-)
+ * Rigorous Test :-)
*/
public void testApp()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
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 a27517b..d239884 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1530,7 +1530,7 @@ public class MavenCli
}
//
- // Allow the builder to be overriden by the user if requested. The builders are now pluggable.
+ // Allow the builder to be overridden by the user if requested. The builders are now pluggable.
//
if ( commandLine.hasOption( CLIManager.BUILDER ) )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java b/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java
index 7a879ce..0c9e7ad 100644
--- a/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java
+++ b/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java
@@ -29,7 +29,7 @@ public class AppTest
}
/**
- * Rigourous Test :-)
+ * Rigorous Test :-)
*/
public void testApp()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
index 7e0144a..94e6877 100644
--- a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
+++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
@@ -29,7 +29,7 @@ public class AppTest
}
/**
- * Rigourous Test :-)
+ * Rigorous Test :-)
*/
public void testApp()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java
index e4e81e2..027000b 100644
--- a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java
+++ b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java
@@ -29,7 +29,7 @@ public class AppTest
}
/**
- * Rigourous Test :-)
+ * Rigorous Test :-)
*/
public void testApp()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java
index bc2e712..71301e6 100644
--- a/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java
+++ b/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java
@@ -19,7 +19,7 @@ public class TestPlugin
private Log log;
/**
- * @component role-hint="nonexistant"
+ * @component role-hint="nonexistent"
*/
private MavenProject project;
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
index 7e0144a..94e6877 100644
--- a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
+++ b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
@@ -29,7 +29,7 @@ public class AppTest
}
/**
- * Rigourous Test :-)
+ * Rigorous Test :-)
*/
public void testApp()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
index 7e0144a..94e6877 100644
--- a/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
+++ b/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
@@ -29,7 +29,7 @@ public class AppTest
}
/**
- * Rigourous Test :-)
+ * Rigorous Test :-)
*/
public void testApp()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java
index 69af061..7275a8d 100644
--- a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java
+++ b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java
@@ -29,7 +29,7 @@ public class AppTest
}
/**
- * Rigourous Test :-)
+ * Rigorous Test :-)
*/
public void testApp()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index a6a8725..6b38926 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -195,15 +195,15 @@ public class DefaultModelBuilder
return this;
}
- public DefaultModelBuilder setDependencyManagementImporter( DependencyManagementImporter depMngmntImporter )
+ public DefaultModelBuilder setDependencyManagementImporter( DependencyManagementImporter depMgmtImporter )
{
- this.dependencyManagementImporter = depMngmntImporter;
+ this.dependencyManagementImporter = depMgmtImporter;
return this;
}
- public DefaultModelBuilder setDependencyManagementInjector( DependencyManagementInjector depMngmntInjector )
+ public DefaultModelBuilder setDependencyManagementInjector( DependencyManagementInjector depMgmtInjector )
{
- this.dependencyManagementInjector = depMngmntInjector;
+ this.dependencyManagementInjector = depMgmtInjector;
return this;
}
@@ -683,10 +683,10 @@ public class DefaultModelBuilder
plugins.put( key, plugin );
}
}
- PluginManagement mngt = build.getPluginManagement();
- if ( mngt != null )
+ PluginManagement mgmt = build.getPluginManagement();
+ if ( mgmt != null )
{
- for ( Plugin plugin : mngt.getPlugins() )
+ for ( Plugin plugin : mgmt.getPlugins() )
{
String key = plugin.getKey();
if ( managedVersions.get( key ) == null )
@@ -1081,9 +1081,9 @@ public class DefaultModelBuilder
private void importDependencyManagement( Model model, ModelBuildingRequest request,
DefaultModelProblemCollector problems, Collection<String> importIds )
{
- DependencyManagement depMngt = model.getDependencyManagement();
+ DependencyManagement depMgmt = model.getDependencyManagement();
- if ( depMngt == null )
+ if ( depMgmt == null )
{
return;
}
@@ -1097,9 +1097,9 @@ public class DefaultModelBuilder
ModelBuildingRequest importRequest = null;
- List<DependencyManagement> importMngts = null;
+ List<DependencyManagement> importMgmts = null;
- for ( Iterator<Dependency> it = depMngt.getDependencies().iterator(); it.hasNext(); )
+ for ( Iterator<Dependency> it = depMgmt.getDependencies().iterator(); it.hasNext(); )
{
Dependency dependency = it.next();
@@ -1154,10 +1154,10 @@ public class DefaultModelBuilder
continue;
}
- DependencyManagement importMngt = getCache( request.getModelCache(), groupId, artifactId, version,
+ DependencyManagement importMgmt = getCache( request.getModelCache(), groupId, artifactId, version,
ModelCacheTag.IMPORT );
- if ( importMngt == null )
+ if ( importMgmt == null )
{
if ( workspaceResolver == null && modelResolver == null )
{
@@ -1236,27 +1236,27 @@ public class DefaultModelBuilder
importModel = importResult.getEffectiveModel();
}
- importMngt = importModel.getDependencyManagement();
+ importMgmt = importModel.getDependencyManagement();
- if ( importMngt == null )
+ if ( importMgmt == null )
{
- importMngt = new DependencyManagement();
+ importMgmt = new DependencyManagement();
}
- putCache( request.getModelCache(), groupId, artifactId, version, ModelCacheTag.IMPORT, importMngt );
+ putCache( request.getModelCache(), groupId, artifactId, version, ModelCacheTag.IMPORT, importMgmt );
}
- if ( importMngts == null )
+ if ( importMgmts == null )
{
- importMngts = new ArrayList<>();
+ importMgmts = new ArrayList<>();
}
- importMngts.add( importMngt );
+ importMgmts.add( importMgmt );
}
importIds.remove( importing );
- dependencyManagementImporter.importManagement( model, importMngts, request, problems );
+ dependencyManagementImporter.importManagement( model, importMgmts, request, problems );
}
private <T> void putCache( ModelCache modelCache, String groupId, String artifactId, String version,
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java
index 21029cc..186507c 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java
@@ -20,7 +20,7 @@ package org.apache.maven.model.building;
*/
/**
- * Defines events that the model builder fires during construction of the effective model. When a listener encounteres
+ * Defines events that the model builder fires during construction of the effective model. When a listener encounters
* errors while processing the event, it can report these problems via {@link ModelBuildingEvent#getProblems()}.
* <em>Note:</em> To cope with future extensions to this interface, it is strongly recommended to extend
* {@link AbstractModelBuildingListener} rather than to directly implement this interface.
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
index c10274d..d20f244 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
@@ -124,7 +124,7 @@ public interface ModelBuildingRequest
/**
* Sets the level of validation to perform on processed models. For building of projects,
- * {@link #VALIDATION_LEVEL_STRICT} should be used to ensure proper building. For the mere retrievel of dependencies
+ * {@link #VALIDATION_LEVEL_STRICT} should be used to ensure proper building. For the mere retrieval of dependencies
* during artifact resolution, {@link #VALIDATION_LEVEL_MINIMAL} should be used to account for models of poor
* quality. By default, models are validated in strict mode.
*
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
index d895913..cce7d7f 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
@@ -49,19 +49,19 @@ public class DefaultDependencyManagementImporter
{
Map<String, Dependency> dependencies = new LinkedHashMap<>();
- DependencyManagement depMngt = target.getDependencyManagement();
+ DependencyManagement depMgmt = target.getDependencyManagement();
- if ( depMngt != null )
+ if ( depMgmt != null )
{
- for ( Dependency dependency : depMngt.getDependencies() )
+ for ( Dependency dependency : depMgmt.getDependencies() )
{
dependencies.put( dependency.getManagementKey(), dependency );
}
}
else
{
- depMngt = new DependencyManagement();
- target.setDependencyManagement( depMngt );
+ depMgmt = new DependencyManagement();
+ target.setDependencyManagement( depMgmt );
}
for ( DependencyManagement source : sources )
@@ -76,7 +76,7 @@ public class DefaultDependencyManagementImporter
}
}
- depMngt.setDependencies( new ArrayList<>( dependencies.values() ) );
+ depMgmt.setDependencies( new ArrayList<>( dependencies.values() ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
index 8206da9..51150db 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
@@ -94,7 +94,7 @@ public class DefaultInheritanceAssembler
String childName = child.getArtifactId();
/*
- * This logic (using filesystem, against wanted independance from the user environment) exists only for the
+ * This logic (using filesystem, against wanted independence from the user environment) exists only for the
* sake of backward-compat with 2.x (MNG-5000). In general, it is wrong to
* base URL inheritance on the module directory names as this information is unavailable for POMs in the
* repository. In other words, modules where artifactId != moduleDirName will see different effective URLs
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index cea2a74..9af30c1 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -146,10 +146,10 @@ public class DefaultModelValidator
{
validate20RawPlugins( problems, build.getPlugins(), "build.plugins.plugin", request );
- PluginManagement mngt = build.getPluginManagement();
- if ( mngt != null )
+ PluginManagement mgmt = build.getPluginManagement();
+ if ( mgmt != null )
{
- validate20RawPlugins( problems, mngt.getPlugins(), "build.pluginManagement.plugins.plugin",
+ validate20RawPlugins( problems, mgmt.getPlugins(), "build.pluginManagement.plugins.plugin",
request );
}
}
@@ -189,10 +189,10 @@ public class DefaultModelValidator
{
validate20RawPlugins( problems, buildBase.getPlugins(), prefix + ".plugins.plugin", request );
- PluginManagement mngt = buildBase.getPluginManagement();
- if ( mngt != null )
+ PluginManagement mgmt = buildBase.getPluginManagement();
+ if ( mgmt != null )
{
- validate20RawPlugins( problems, mngt.getPlugins(), prefix + ".pluginManagement.plugins.plugin",
+ validate20RawPlugins( problems, mgmt.getPlugins(), prefix + ".pluginManagement.plugins.plugin",
request );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-model-builder/src/main/mdo/profiles.mdo
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/mdo/profiles.mdo b/maven-model-builder/src/main/mdo/profiles.mdo
index 892544d..a55677c 100644
--- a/maven-model-builder/src/main/mdo/profiles.mdo
+++ b/maven-model-builder/src/main/mdo/profiles.mdo
@@ -188,7 +188,7 @@ under the License.
<version>1.0.0</version>
<description><![CDATA[
Repository contains the information needed
- for establishing connections with remote repoistory
+ for establishing connections with remote repository
]]></description>
<fields>
<field>
@@ -250,7 +250,7 @@ under the License.
<superClass>RepositoryBase</superClass>
<version>1.0.0</version>
<description>
- Repository contains the information needed for establishing connections with remote repoistory
+ Repository contains the information needed for establishing connections with remote repository
</description>
<fields>
<field>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
index 96eed6f..1b47ec1 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
@@ -79,7 +79,7 @@ public class DefaultInheritanceAssemblerTest
/**
* Check most classical urls inheritance: directory structure where parent POM in parent directory
- * and child directory == artifatId
+ * and child directory == artifactId
* @throws Exception
*/
public void testUrls()
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-model/src/main/mdo/maven.mdo
----------------------------------------------------------------------
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index 5322c35..1187b11 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -1359,7 +1359,7 @@
The classifier of the dependency. It is appended to
the filename after the version. This allows:
<ul>
- <li>refering to attached artifact, for example <code>sources</code> and <code>javadoc</code>:
+ <li>referring to attached artifact, for example <code>sources</code> and <code>javadoc</code>:
see <a href="../maven-core/artifact-handlers.html">default artifact handlers</a> for a list,</li>
<li>distinguishing two artifacts
that belong to the same POM but were built differently.
@@ -1532,8 +1532,8 @@
*/
public String getArtifact()
{
- // If the jar name has been explicty set then use that. This
- // is when the <jar/> element is explicity used in the POM.
+ // If the jar name has been explicitly set then use that. This
+ // is when the <jar/> element is explicitly used in the POM.
if ( getJar() != null)
{
return getJar();
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
----------------------------------------------------------------------
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 515b110..3f7eccc 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
@@ -513,7 +513,7 @@ public class MojoDescriptor
}
/**
- * @return <code>true</code> if the Mojo is herited, <code>false</code> otherwise.
+ * @return <code>true</code> if the Mojo is inherited, <code>false</code> otherwise.
*/
public boolean isInheritedByDefault()
{
@@ -521,7 +521,7 @@ public class MojoDescriptor
}
/**
- * @param inheritedByDefault <code>true</code> if the Mojo is herited, <code>false</code> otherwise.
+ * @param inheritedByDefault <code>true</code> if the Mojo is inherited, <code>false</code> otherwise.
*/
public void setInheritedByDefault( boolean inheritedByDefault )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-plugin-api/src/main/mdo/lifecycle.mdo
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/mdo/lifecycle.mdo b/maven-plugin-api/src/main/mdo/lifecycle.mdo
index 2a46647..7dfce74 100644
--- a/maven-plugin-api/src/main/mdo/lifecycle.mdo
+++ b/maven-plugin-api/src/main/mdo/lifecycle.mdo
@@ -84,7 +84,7 @@ under the License.
<required>true</required>
<version>1.0.0</version>
<type>String</type>
- <description>The ID of this phase, eg <code>generate-sources</code>.</description>
+ <description>The ID of this phase, e.g., <code>generate-sources</code>.</description>
</field>
<field>
<name>executions</name>
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-repository-metadata/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-repository-metadata/src/site/apt/index.apt b/maven-repository-metadata/src/site/apt/index.apt
index 194fc0d..ed2bff9 100644
--- a/maven-repository-metadata/src/site/apt/index.apt
+++ b/maven-repository-metadata/src/site/apt/index.apt
@@ -41,7 +41,7 @@ Maven Repository Metadata Model
* <<<maven-metadata.xml>>> in a remote repository,
- * <<<maven-metadata-\<repo-id>.xml>>> in a local repository, for metatada from a repository with <<<repo-id>>> identifier.
+ * <<<maven-metadata-\<repo-id>.xml>>> in a local repository, for metadata from a repository with <<<repo-id>>> identifier.
[]
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
index 2395b36..53c0475 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
@@ -65,10 +65,10 @@ public class ArtifactDescriptorReaderDelegate
result.addDependency( convert( dependency, stereotypes ) );
}
- DependencyManagement mngt = model.getDependencyManagement();
- if ( mngt != null )
+ DependencyManagement mgmt = model.getDependencyManagement();
+ if ( mgmt != null )
{
- for ( org.apache.maven.model.Dependency dependency : mngt.getDependencies() )
+ for ( org.apache.maven.model.Dependency dependency : mgmt.getDependencies() )
{
result.addManagedDependency( convert( dependency, stereotypes ) );
}
@@ -137,10 +137,10 @@ public class ArtifactDescriptorReaderDelegate
private void setArtifactProperties( ArtifactDescriptorResult result, Model model )
{
String downloadUrl = null;
- DistributionManagement distMngt = model.getDistributionManagement();
- if ( distMngt != null )
+ DistributionManagement distMgmt = model.getDistributionManagement();
+ if ( distMgmt != null )
{
- downloadUrl = distMngt.getDownloadUrl();
+ downloadUrl = distMgmt.getDownloadUrl();
}
if ( downloadUrl != null && downloadUrl.length() > 0 )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 0f31330..1df1c12 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -372,10 +372,10 @@ public class DefaultArtifactDescriptorReader
private Relocation getRelocation( Model model )
{
Relocation relocation = null;
- DistributionManagement distMngt = model.getDistributionManagement();
- if ( distMngt != null )
+ DistributionManagement distMgmt = model.getDistributionManagement();
+ if ( distMgmt != null )
{
- relocation = distMngt.getRelocation();
+ relocation = distMgmt.getRelocation();
}
return relocation;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
index db77a44..7943dc8 100644
--- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
+++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
@@ -195,7 +195,7 @@ public class RepositorySystemTest
{
//InstallResult install( RepositorySystemSession session, InstallRequest request )
// throws InstallationException;
- // release, snapshot unique ou non unique, attachement
+ // release, snapshot unique ou non unique, attachment
}
public void testDeploy()
http://git-wip-us.apache.org/repos/asf/maven/blob/17402659/maven-settings/src/main/mdo/settings.mdo
----------------------------------------------------------------------
diff --git a/maven-settings/src/main/mdo/settings.mdo b/maven-settings/src/main/mdo/settings.mdo
index 7fa00de..0d32e40 100644
--- a/maven-settings/src/main/mdo/settings.mdo
+++ b/maven-settings/src/main/mdo/settings.mdo
@@ -600,7 +600,7 @@
<version>1.0.0+</version>
<type>String</type>
<description>
- The server ID of the repository being mirrored, eg
+ The server ID of the repository being mirrored, e.g.,
"central". This MUST NOT match the mirror id.
</description>
</field>
@@ -809,7 +809,7 @@
<description>
<![CDATA[
Repository contains the information needed
- for establishing connections with remote repoistory
+ for establishing connections with remote repository
]]>
</description>
<fields>