forked from pool/apache-commons-cli
		
	Compare commits
	
		
			4 Commits
		
	
	
		
	
	| Author | SHA256 | Date | |
|---|---|---|---|
| 21061722a2 | |||
| 8215e7a6df | |||
| 98b938722b | |||
| c6dce27002 | 
| @@ -6,10 +6,8 @@ CommitDate: Mon Jun 22 15:04:05 2015 +0200 | ||||
|  | ||||
|     [CLI-253] Prevent "Unrecognized option: --null" when handling long opts in PosixParser | ||||
|  | ||||
| Index: commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/Options.java | ||||
| =================================================================== | ||||
| --- commons-cli-1.7.0-src.orig/src/main/java/org/apache/commons/cli/Options.java | ||||
| +++ commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/Options.java | ||||
| --- a/src/main/java/org/apache/commons/cli/Options.java | ||||
| +++ b/src/main/java/org/apache/commons/cli/Options.java | ||||
| @@ -195,6 +195,20 @@ public class Options implements Serializ | ||||
|          return this; | ||||
|      } | ||||
| @@ -31,23 +29,19 @@ Index: commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/Options.java | ||||
|      /** | ||||
|       * Gets the options with a long name starting with the name specified. | ||||
|       * | ||||
| Index: commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/PosixParser.java | ||||
| =================================================================== | ||||
| --- commons-cli-1.7.0-src.orig/src/main/java/org/apache/commons/cli/PosixParser.java | ||||
| +++ commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/PosixParser.java | ||||
| @@ -145,7 +145,7 @@ public class PosixParser extends Parser | ||||
|                  } else if (matchingOpts.size() > 1) { | ||||
|                      throw new AmbiguousOptionException(opt, matchingOpts); | ||||
|                  } else { | ||||
| -                    currentOption = options.getOption(matchingOpts.get(0)); | ||||
| +                    currentOption = options.getLongOption(matchingOpts.get(0)); | ||||
| --- a/src/main/java/org/apache/commons/cli/PosixParser.java | ||||
| +++ b/src/main/java/org/apache/commons/cli/PosixParser.java | ||||
| @@ -141,7 +141,7 @@ public class PosixParser extends Parser | ||||
|                      } else if (matchingOpts.size() > 1) { | ||||
|                          throw new AmbiguousOptionException(opt, matchingOpts); | ||||
|                      } else { | ||||
| -                        currentOption = options.getOption(matchingOpts.get(0)); | ||||
| +                        currentOption = options.getLongOption(matchingOpts.get(0)); | ||||
|   | ||||
|                      tokens.add("--" + currentOption.getLongOpt()); | ||||
|                      if (pos != -1) { | ||||
| Index: commons-cli-1.7.0-src/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java | ||||
| =================================================================== | ||||
|                          tokens.add("--" + currentOption.getLongOpt()); | ||||
|                          if (pos != -1) { | ||||
| --- /dev/null | ||||
| +++ commons-cli-1.7.0-src/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java | ||||
| +++ b/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java | ||||
| @@ -0,0 +1,44 @@ | ||||
| +/* | ||||
| + * Licensed to the Apache Software Foundation (ASF) under one or more | ||||
|   | ||||
| @@ -8,7 +8,7 @@ | ||||
|  | ||||
|   <property name="project.artifactId" value="commons-cli"/> | ||||
|   <property name="project.groupId" value="commons-cli"/> | ||||
|   <property name="project.version" value="1.7.0"/> | ||||
|   <property name="project.version" value="1.9.0"/> | ||||
|  | ||||
|   <property name="compiler.release" value="8"/> | ||||
|   <property name="compiler.source" value="1.${compiler.release}"/> | ||||
|   | ||||
| @@ -1,3 +1,27 @@ | ||||
| ------------------------------------------------------------------- | ||||
| Thu Nov  7 09:47:59 UTC 2024 - Gus Kenion <gus.kenion@suse.com> | ||||
|  | ||||
| - Update to 1.9.0 | ||||
|   * New features | ||||
|     + Add OptionGroup.isSelected(). | ||||
|     + You can now extend HelpFormatter.Builder. | ||||
|     + Add 'since' attribute to Option to track when an Option was | ||||
|       introduced #292 | ||||
|   * Fixed bugs | ||||
|     + CLI-334:  Fix Javadoc pathing #280. | ||||
|     + CLI-335:  Updated properties documentation #285. | ||||
|     + CLI-336:  Deprecation not always reported #284. | ||||
|     + Replace internal StringBuffer with StringBuilder. | ||||
|   * Updates | ||||
|     + Bump org.apache.commons:commons-parent from 70 to 72 #283. | ||||
|  | ||||
| ------------------------------------------------------------------- | ||||
| Mon Aug 12 12:14:19 UTC 2024 - Gus Kenion <gus.kenion@suse.com> | ||||
|  | ||||
| - Update to 1.8.0 | ||||
|   * Fix Javadoc pathing #280. Fixes CLI-334. | ||||
| - Revised CLI-253-workaround.patch for compatibility with 1.8.0 | ||||
|  | ||||
| ------------------------------------------------------------------- | ||||
| Mon Apr 29 11:36:14 UTC 2024 - Gus Kenion <gus.kenion@suse.com> | ||||
|  | ||||
|   | ||||
| @@ -19,7 +19,7 @@ | ||||
| %global base_name       cli | ||||
| %global short_name      commons-%{base_name} | ||||
| Name:           apache-commons-cli | ||||
| Version:        1.7.0 | ||||
| Version:        1.9.0 | ||||
| Release:        0 | ||||
| Summary:        Command Line Interface Library for Java | ||||
| License:        Apache-2.0 | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								commons-cli-1.7.0-src.tar.gz
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								commons-cli-1.7.0-src.tar.gz
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								commons-cli-1.9.0-src.tar.gz
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								commons-cli-1.9.0-src.tar.gz
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
		Reference in New Issue
	
	Block a user