Fix more licenses

core/src/main/java/org/elasticsearch/bootstrap/BootstrapCliParser.java

@@ -51,7 +51,7 @@ final class BootstrapCliParser extends Command {
         pidfileOption = parser.acceptsAll(Arrays.asList("p", "pidfile"),
             "Creates a pid file in the specified path on start")
             .withRequiredArg();
-        propertyOption = parser.accepts("E", "Configures an Elasticsearch setting")
+        propertyOption = parser.accepts("D", "Configures an Elasticsearch setting")
             .withRequiredArg();
     }
 
@@ -80,7 +80,11 @@ final class BootstrapCliParser extends Command {
             if (keyValue.length != 2) {
                 throw new UserError(ExitCodes.USAGE, "Malformed elasticsearch setting, must be of the form key=value");
             }
-            System.setProperty("es." + keyValue[0], keyValue[1]);
+            String key = keyValue[0];
+            if (key.startsWith("es.") == false) {
+                key = "es." + key;
+            }
+            System.setProperty(key, keyValue[1]);
         }
         shouldRun = true;
     }

distribution/licenses/jopt-simple-LICENSE.txt

@@ -0,0 +1,24 @@
+/*
+ The MIT License
+
+ Copyright (c) 2004-2015 Paul R. Holser, Jr.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/

plugins/repository-hdfs/build.gradle

@@ -45,6 +45,7 @@ dependencies {
   compile 'com.google.guava:guava:16.0.1'
   compile 'com.google.protobuf:protobuf-java:2.5.0'
   compile 'commons-logging:commons-logging:1.1.3'
+  compile 'commons-cli:commons-cli:1.2'
   compile 'commons-collections:commons-collections:3.2.2'
   compile 'commons-configuration:commons-configuration:1.6'
   compile 'commons-io:commons-io:2.4'
@@ -191,16 +192,6 @@ thirdPartyAudit.excludes = [
   'org.apache.commons.beanutils.DynaClass', 
   'org.apache.commons.beanutils.DynaProperty', 
   'org.apache.commons.beanutils.PropertyUtils', 
-  'org.apache.commons.cli.CommandLine',
-  'org.apache.commons.cli.CommandLineParser',
-  'org.apache.commons.cli.GnuParser',
-  'org.apache.commons.cli.HelpFormatter',
-  'org.apache.commons.cli.Option',
-  'org.apache.commons.cli.OptionBuilder',
-  'org.apache.commons.cli.OptionGroup',
-  'org.apache.commons.cli.Options',
-  'org.apache.commons.cli.ParseException',
-  'org.apache.commons.cli.PosixParser',
   'org.apache.commons.compress.archivers.tar.TarArchiveEntry', 
   'org.apache.commons.compress.archivers.tar.TarArchiveInputStream', 
   'org.apache.commons.codec.DecoderException', 

plugins/repository-hdfs/licenses/commons-cli-1.2.jar.sha1

@@ -0,0 +1 @@
+2bf96b7aa8b611c177d329452af1dc933e14501c