Merge branch 'master' into patch-1

Author: schaumb

.gitignore

@@ -0,0 +1,17 @@
+### https://raw.github.com/github/gitignore/f2ce448f2ba7a092da05482ceca99209127c0884/maven.gitignore
+
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# Exclude maven wrapper
+!/.mvn/wrapper/maven-wrapper.jar
+
+site-content
+

.travis.yml

@@ -22,4 +22,4 @@ jdk:
   - oraclejdk8
 
 after_success:
-  - mvn clean cobertura:cobertura coveralls:report
+  - mvn clean test jacoco:report coveralls:report -Ptravis-jacoco

README.md

@@ -43,6 +43,9 @@
 Apache Commons CLI
 ===================
 
+[![Build Status](https://travis-ci.org/apache/commons-cli.svg?branch=master)](https://travis-ci.org/apache/commons-cli)
+[![Coverage Status](https://coveralls.io/repos/github/apache/commons-cli/badge.svg?branch=master)](https://coveralls.io/github/apache/commons-cli?branch=master)
+
 Apache Commons CLI provides a simple API for presenting, processing and validating a command line interface.
 
 Documentation

pom.xml

@@ -40,9 +40,10 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/cli/trunk/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/cli/trunk/</developerConnection>
-    <url>http://svn.apache.org/viewvc/commons/proper/cli/trunk/</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/commons-cli.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/commons-cli.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=commons-cli.git</url>
+    <tag>HEAD</tag>
   </scm>
 
   <developers>
@@ -166,6 +167,7 @@
     <maven.compiler.source>1.5</maven.compiler.source>
     <maven.compiler.target>1.5</maven.compiler.target>
     <commons.componentid>cli</commons.componentid>
+    <commons.module.name>org.apache.commons.cli</commons.module.name>
     <commons.release.version>1.4</commons.release.version>
     <commons.release.name>commons-cli-${commons.release.version}</commons.release.name>
     <commons.osgi.symbolicName>org.apache.commons.cli</commons.osgi.symbolicName>

src/changes/changes.xml

@@ -26,6 +26,9 @@
       <action type="add" dev="britter" due-to="Christoph Läubrich" issue="CLI-271">
         CommandLine.getXXX and CommandLine.hasXXX should accept an Option as a parameter
       </action>
+      <action type="add" dev="ggregory" due-to="Jason Dillon" issue="CLI-276">
+        Adjust access-modifier of checkRequiredOptions() to protected.
+      </action>
     </release>
 
     <release version="1.4" date="2017-03-09" description="New features and bug fixes">

src/main/java/org/apache/commons/cli/AlreadySelectedException.java

@@ -42,7 +42,7 @@ public class AlreadySelectedException extends ParseException
      *
      * @param message the detail message
      */
-    public AlreadySelectedException(String message)
+    public AlreadySelectedException(final String message)
     {
         super(message);
     }
@@ -55,7 +55,7 @@ public AlreadySelectedException(String message)
      * @param option the option that triggered the exception
      * @since 1.2
      */
-    public AlreadySelectedException(OptionGroup group, Option option)
+    public AlreadySelectedException(final OptionGroup group, final Option option)
     {
         this("The option '" + option.getKey() + "' was specified but an option from this group "
                 + "has already been selected: '" + group.getSelected() + "'");

src/main/java/org/apache/commons/cli/AmbiguousOptionException.java

@@ -42,7 +42,7 @@ public class AmbiguousOptionException extends UnrecognizedOptionException
      * @param option          the partial option name
      * @param matchingOptions the options matching the name
      */
-    public AmbiguousOptionException(String option, Collection<String> matchingOptions)
+    public AmbiguousOptionException(final String option, final Collection<String> matchingOptions)
     {
         super(createMessage(option, matchingOptions), option);
         this.matchingOptions = matchingOptions;
@@ -64,13 +64,13 @@ public Collection<String> getMatchingOptions()
      * @param matchingOptions
      * @return
      */
-    private static String createMessage(String option, Collection<String> matchingOptions)
+    private static String createMessage(final String option, final Collection<String> matchingOptions)
     {
-        StringBuilder buf = new StringBuilder("Ambiguous option: '");
+        final StringBuilder buf = new StringBuilder("Ambiguous option: '");
         buf.append(option);
         buf.append("'  (could be: ");
 
-        Iterator<String> it = matchingOptions.iterator();
+        final Iterator<String> it = matchingOptions.iterator();
         while (it.hasNext())
         {
             buf.append("'");

src/main/java/org/apache/commons/cli/BasicParser.java

@@ -41,9 +41,9 @@ public class BasicParser extends Parser
      * @return The <code>arguments</code> String array.
      */
     @Override
-    protected String[] flatten(@SuppressWarnings("unused") Options options,
-            String[] arguments,
-            @SuppressWarnings("unused") boolean stopAtNonOption)
+    protected String[] flatten(@SuppressWarnings("unused") final Options options,
+            final String[] arguments,
+            @SuppressWarnings("unused") final boolean stopAtNonOption)
     {
         // just echo the arguments
         return arguments;