Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Update dependency commons-cli:commons-cli to v1.7.0 (#2408)

Solr Botabf6e8f43cab
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 66385572605..f609169a0bb 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -196,6 +196,8 @@ Dependency Upgrades
* SOLR-17214: Update forbiddenapis to 3.7 (hossman)
+* GITHUB#2408: Update commons-cli to 1.7 (Eric Pugh)
+
Other Changes
---------------------
* SOLR-17126: Cut over System.getProperty to EnvUtils.getProperty (janhoy)
diff --git a/solr/core/src/java/org/apache/solr/cli/PostLogsTool.java b/solr/core/src/java/org/apache/solr/cli/PostLogsTool.java
index 1e2d8c2b133..d46887fe063 100644
--- a/solr/core/src/java/org/apache/solr/cli/PostLogsTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/PostLogsTool.java
@@ -85,7 +85,7 @@ public class PostLogsTool extends ToolBase {
public void runImpl(CommandLine cli) throws Exception {
String url = cli.getOptionValue("url");
String rootDir = cli.getOptionValue("rootdir");
- String credentials = cli.getOptionValue("credentials", null);
+ String credentials = cli.getOptionValue("credentials");
runCommand(url, rootDir, credentials);
}
diff --git a/solr/licenses/commons-cli-1.6.0.jar.sha1 b/solr/licenses/commons-cli-1.6.0.jar.sha1
deleted file mode 100644
index 5395b4833bb..00000000000
--- a/solr/licenses/commons-cli-1.6.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-38166a23afb5bd5520f739b87b3be87f7f0fb96d
diff --git a/solr/licenses/commons-cli-1.7.0.jar.sha1 b/solr/licenses/commons-cli-1.7.0.jar.sha1
new file mode 100644
index 00000000000..729ea447fef
--- /dev/null
+++ b/solr/licenses/commons-cli-1.7.0.jar.sha1
@@ -0,0 +1 @@
+6504b3f17e8bc5adc6b6c8deecc90144d0154075
diff --git a/versions.lock b/versions.lock
index 3a57ebe286d..6c59c1c8021 100644
--- a/versions.lock
+++ b/versions.lock
@@ -77,7 +77,7 @@ com.sun.activation:jakarta.activation:1.2.2 (1 constraints: ba0dac35)
com.sun.istack:istack-commons-runtime:3.0.12 (1 constraints: eb0d9a43)
com.tdunning:t-digest:3.3 (1 constraints: aa04232c)
com.zaxxer:SparseBitSet:1.2 (1 constraints: 0d081e75)
-commons-cli:commons-cli:1.6.0 (1 constraints: 09050236)
+commons-cli:commons-cli:1.7.0 (1 constraints: 0a050536)
commons-codec:commons-codec:1.16.1 (11 constraints: a39748dd)
commons-collections:commons-collections:3.2.2 (1 constraints: 09050236)
commons-io:commons-io:2.15.1 (9 constraints: a265d622)
diff --git a/versions.props b/versions.props
index 95965191add..4fba83ddef3 100644
--- a/versions.props
+++ b/versions.props
@@ -17,7 +17,7 @@ com.j256.simplemagic:simplemagic=1.17
com.jayway.jsonpath:json-path=2.9.0
com.lmax:disruptor=3.4.4
com.tdunning:t-digest=3.3
-commons-cli:commons-cli=1.6.0
+commons-cli:commons-cli=1.7.0
commons-codec:commons-codec=1.16.1
commons-collections:commons-collections=3.2.2
commons-io:commons-io=2.15.1