This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-cli.git
The following commit(s) were added to refs/heads/master by this push:
new cc37692 Next version is 1.5.0.
cc37692 is described below
commit cc37692b8edbb78cdee140d5c487e0bb42ec3e05
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Oct 23 08:40:10 2021 -0400
Next version is 1.5.0.
---
pom.xml | 4 ++--
src/changes/changes.xml | 2 +-
src/main/java/org/apache/commons/cli/CommandLine.java | 14 +++++++-------
src/main/java/org/apache/commons/cli/DefaultParser.java | 10 +++++-----
src/main/java/org/apache/commons/cli/Option.java | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index a59c6e4..615b1ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<name>Apache Commons CLI</name>
<inceptionYear>2002</inceptionYear>
@@ -195,7 +195,7 @@
<maven.compiler.target>1.7</maven.compiler.target>
<commons.componentid>cli</commons.componentid>
<commons.module.name>org.apache.commons.cli</commons.module.name>
- <commons.release.version>1.5</commons.release.version>
+ <commons.release.version>1.5.0</commons.release.version>
<commons.release.name>commons-cli-${commons.release.version}</commons.release.name>
<commons.release.isDistModule>true</commons.release.isDistModule>
<commons.rc.version>RC1</commons.rc.version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b2bb55d..35e1518 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -20,7 +20,7 @@
<title>Apache Commons CLI Release Notes</title>
</properties>
<body>
- <release version="1.5" date="tba" description="New features and bug fixes
(Java 7)">
+ <release version="1.5.0" date="tba" description="New features and bug
fixes (Java 7)">
<!-- FIX -->
<action type="fix" dev="ggregory" due-to="Gary Gregory">
Fix NPE in DefaultParser.isLongOption(String).
diff --git a/src/main/java/org/apache/commons/cli/CommandLine.java
b/src/main/java/org/apache/commons/cli/CommandLine.java
index a8e8d19..333ef9d 100644
--- a/src/main/java/org/apache/commons/cli/CommandLine.java
+++ b/src/main/java/org/apache/commons/cli/CommandLine.java
@@ -167,7 +167,7 @@ public class CommandLine implements Serializable {
*
* @param option name of the option.
* @return The Properties mapped by the option, never {@code null} even if
the option doesn't exists.
- * @since 1.5
+ * @since 1.5.0
*/
public Properties getOptionProperties(final Option option) {
final Properties props = new Properties();
@@ -258,7 +258,7 @@ public class CommandLine implements Serializable {
*
* @param option the name of the option.
* @return Value of the argument if option is set, and has an argument,
otherwise null.
- * @since 1.5
+ * @since 1.5.0
*/
public String getOptionValue(final Option option) {
if (option == null) {
@@ -274,7 +274,7 @@ public class CommandLine implements Serializable {
* @param option name of the option.
* @param defaultValue is the default value to be returned if the option
is not specified.
* @return Value of the argument if option is set, and has an argument,
otherwise {@code defaultValue}.
- * @since 1.5
+ * @since 1.5.0
*/
public String getOptionValue(final Option option, final String
defaultValue) {
final String answer = getOptionValue(option);
@@ -317,7 +317,7 @@ public class CommandLine implements Serializable {
*
* @param option string name of the option.
* @return Values of the argument if option is set, and has an argument,
otherwise null.
- * @since 1.5
+ * @since 1.5.0
*/
public String[] getOptionValues(final Option option) {
final List<String> values = new ArrayList<>();
@@ -348,7 +348,7 @@ public class CommandLine implements Serializable {
* @return the value parsed into a particular object.
* @throws ParseException if there are problems turning the option value
into the desired type
* @see PatternOptionBuilder
- * @since 1.5
+ * @since 1.5.0
*/
public Object getParsedOptionValue(final char opt) throws ParseException {
return getParsedOptionValue(String.valueOf(opt));
@@ -361,7 +361,7 @@ public class CommandLine implements Serializable {
* @return the value parsed into a particular object.
* @throws ParseException if there are problems turning the option value
into the desired type
* @see PatternOptionBuilder
- * @since 1.5
+ * @since 1.5.0
*/
public Object getParsedOptionValue(final Option option) throws
ParseException {
if (option == null) {
@@ -420,7 +420,7 @@ public class CommandLine implements Serializable {
*
* @param opt the option to check.
* @return true if set, false if not.
- * @since 1.5
+ * @since 1.5.0
*/
public boolean hasOption(final Option opt) {
return options.contains(opt);
diff --git a/src/main/java/org/apache/commons/cli/DefaultParser.java
b/src/main/java/org/apache/commons/cli/DefaultParser.java
index 81dbc20..3bbd042 100644
--- a/src/main/java/org/apache/commons/cli/DefaultParser.java
+++ b/src/main/java/org/apache/commons/cli/DefaultParser.java
@@ -41,7 +41,7 @@ public class DefaultParser implements CommandLineParser {
* .build();
* </pre>
*
- * @since 1.5
+ * @since 1.5.0
*/
public static final class Builder {
@@ -64,7 +64,7 @@ public class DefaultParser implements CommandLineParser {
* Builds an DefaultParser with the values declared by this {@link
Builder}.
*
* @return the new {@link DefaultParser}
- * @since 1.5
+ * @since 1.5.0
*/
public DefaultParser build() {
return new DefaultParser(allowPartialMatching,
stripLeadingAndTrailingQuotes);
@@ -90,7 +90,7 @@ public class DefaultParser implements CommandLineParser {
*
* @param allowPartialMatching whether to allow partial matching of
long options
* @return this builder, to allow method chaining
- * @since 1.5
+ * @since 1.5.0
*/
public Builder setAllowPartialMatching(final boolean
allowPartialMatching) {
this.allowPartialMatching = allowPartialMatching;
@@ -110,7 +110,7 @@ public class DefaultParser implements CommandLineParser {
*
* @param stripLeadingAndTrailingQuotes whether balanced leading and
trailing double quotes should be stripped from option arguments.
* @return this builder, to allow method chaining
- * @since 1.5
+ * @since 1.5.0
*/
public Builder setStripLeadingAndTrailingQuotes(final Boolean
stripLeadingAndTrailingQuotes) {
this.stripLeadingAndTrailingQuotes = stripLeadingAndTrailingQuotes;
@@ -123,7 +123,7 @@ public class DefaultParser implements CommandLineParser {
* methods.
*
* @return a new {@link Builder} instance
- * @since 1.5
+ * @since 1.5.0
*/
public static Builder builder() {
return new Builder();
diff --git a/src/main/java/org/apache/commons/cli/Option.java
b/src/main/java/org/apache/commons/cli/Option.java
index 8ae5a02..7ca9518 100644
--- a/src/main/java/org/apache/commons/cli/Option.java
+++ b/src/main/java/org/apache/commons/cli/Option.java
@@ -185,7 +185,7 @@ public class Option implements Cloneable, Serializable {
* @param option the name of the Option
* @return this builder, to allow method chaining
* @throws IllegalArgumentException if there are any non valid Option
characters in {@code opt}
- * @since 1.5
+ * @since 1.5.0
*/
public Builder option(String option) throws IllegalArgumentException {
this.option = OptionValidator.validate(option);