[joptsimple] 01/04: Merge tag 'upstream/4.8'
Samuel Thibault
sthibault at moszumanska.debian.org
Sat Oct 24 15:55:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository joptsimple.
commit 06ee6cefa11d83f167960231e42efcaf7b399113
Merge: c19681b c32490e
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date: Fri May 1 21:43:30 2015 +0200
Merge tag 'upstream/4.8'
Upstream version 4.8
LICENSE.txt | 2 +-
debian/changelog | 5 +-
paste-examples.xml | 20 ++-
pom.xml | 114 +++++++++---
src/main/java/joptsimple/AbstractOptionSpec.java | 12 +-
.../java/joptsimple/AlternativeLongOptionSpec.java | 4 +-
.../joptsimple/ArgumentAcceptingOptionSpec.java | 6 +-
src/main/java/joptsimple/ArgumentList.java | 2 +-
src/main/java/joptsimple/BuiltinHelpFormatter.java | 2 +-
src/main/java/joptsimple/HelpFormatter.java | 2 +-
.../IllegalOptionSpecificationException.java | 6 +-
...n.java => MissingRequiredOptionsException.java} | 16 +-
.../MultipleArgumentsForOptionException.java | 12 +-
src/main/java/joptsimple/NoArgumentOptionSpec.java | 4 +-
.../java/joptsimple/NonOptionArgumentSpec.java | 2 +-
.../OptionArgumentConversionException.java | 16 +-
src/main/java/joptsimple/OptionDeclarer.java | 116 ++++++++++++
src/main/java/joptsimple/OptionDescriptor.java | 5 +-
src/main/java/joptsimple/OptionException.java | 64 +++++--
.../OptionMissingRequiredArgumentException.java | 14 +-
src/main/java/joptsimple/OptionParser.java | 196 ++++++++-------------
src/main/java/joptsimple/OptionParserState.java | 2 +-
src/main/java/joptsimple/OptionSet.java | 34 +++-
src/main/java/joptsimple/OptionSpec.java | 5 +-
src/main/java/joptsimple/OptionSpecBuilder.java | 79 +++++++--
src/main/java/joptsimple/OptionSpecTokenizer.java | 2 +-
.../joptsimple/OptionalArgumentOptionSpec.java | 6 +-
src/main/java/joptsimple/ParserRules.java | 8 +-
.../joptsimple/RequiredArgumentOptionSpec.java | 8 +-
.../UnacceptableNumberOfNonOptionsException.java | 54 ------
.../joptsimple/UnconfiguredOptionException.java | 10 +-
.../joptsimple/UnrecognizedOptionException.java | 8 +-
.../java/joptsimple/ValueConversionException.java | 2 +-
src/main/java/joptsimple/ValueConverter.java | 4 +-
.../java/joptsimple/internal/AbbreviationMap.java | 5 +-
src/main/java/joptsimple/internal/Classes.java | 3 +-
src/main/java/joptsimple/internal/Columns.java | 2 +-
.../ConstructorInvokingValueConverter.java | 2 +-
.../internal/MethodInvokingValueConverter.java | 2 +-
src/main/java/joptsimple/internal/Objects.java | 2 +-
src/main/java/joptsimple/internal/Reflection.java | 2 +-
.../joptsimple/internal/ReflectionException.java | 4 +-
src/main/java/joptsimple/internal/Row.java | 2 +-
src/main/java/joptsimple/internal/Rows.java | 10 +-
src/main/java/joptsimple/internal/Strings.java | 3 +-
src/main/java/joptsimple/util/DateConverter.java | 23 ++-
.../java/joptsimple/util/InetAddressConverter.java | 2 +-
src/main/java/joptsimple/util/KeyValuePair.java | 2 +-
src/main/java/joptsimple/util/RegexMatcher.java | 14 +-
.../joptsimple/ExceptionMessages.properties | 10 ++
src/site/apt/acknowledgments.apt | 6 +-
src/site/apt/changes.apt | 41 +++++
src/site/apt/developer.apt | 48 +++++
src/site/apt/examples.apt | 22 +++
src/site/site.xml | 1 +
.../joptsimple/AbstractOptionParserFixture.java | 2 +-
.../java/joptsimple/AbstractOptionSpecFixture.java | 2 +-
...tractOptionSpecOptionsImmutabilityTestCase.java | 10 +-
...stractOptionSpecValuesImmutabilityTestCase.java | 4 +-
...ativeLongOptionSpecOptionsImmutabilityTest.java | 2 +-
...nativeLongOptionSpecValuesImmutabilityTest.java | 2 +-
...ingOptionSpecDefaultValuesImmutabilityTest.java | 2 +-
.../ArgumentAcceptingOptionSpecTest.java | 2 +-
.../joptsimple/ArgumentListHasNoMoreArgsTest.java | 2 +-
src/test/java/joptsimple/ArgumentListTest.java | 2 +-
.../joptsimple/ClusterVersusLongOptionTest.java | 2 +-
...erVersusLongOptionWithOptionalArgumentTest.java | 2 +-
...erVersusLongOptionWithRequiredArgumentTest.java | 2 +-
...ClusterWhereManyOptionsAcceptArgumentsTest.java | 2 +-
.../ConfigurableOptionParserHelpTest.java | 2 +-
.../CreateWithOptionSpecificationStringTest.java | 2 +-
src/test/java/joptsimple/Ctor.java | 2 +-
.../DefaultSettingsOptionParserHelpTest.java | 22 ++-
src/test/java/joptsimple/EmptyOptionSetTest.java | 7 +-
src/test/java/joptsimple/ExceptionMatchers.java | 2 +-
...andlingDefaultValuesForOptionArgumentsTest.java | 2 +-
.../java/joptsimple/InterleavedArgumentsTest.java | 2 +-
.../JVMSystemPropertiesArgumentParsingTest.java | 2 +-
.../java/joptsimple/LongOptionNoArgumentTest.java | 2 +-
.../joptsimple/LongOptionOptionalArgumentTest.java | 2 +-
.../joptsimple/LongOptionRequiredArgumentTest.java | 2 +-
...oArgumentOptionSpecOptionsImmutabilityTest.java | 2 +-
.../java/joptsimple/NoArgumentOptionSpecTest.java | 2 +-
...NoArgumentOptionSpecValuesImmutabilityTest.java | 2 +-
.../java/joptsimple/NonOptionArgumentSpecTest.java | 2 +-
.../joptsimple/OptionExceptionMessageTest.java | 37 ++--
.../OptionExceptionOptionsImmutabilityTest.java | 17 +-
.../OptionParserArgumentExceptionTest.java | 2 +-
.../joptsimple/OptionParserNewDeclarationTest.java | 2 +-
.../OptionParserOptionExceptionTest.java | 2 +-
.../OptionParserRecognizedOptionsTest.java | 67 +++++++
src/test/java/joptsimple/OptionParserTest.java | 4 +-
...OptionParserUnrecognizedOptionsAllowedTest.java | 2 +-
src/test/java/joptsimple/OptionSetAsMapTest.java | 51 ++++++
.../joptsimple/OptionSetDetectedOptionsTest.java | 6 +-
.../joptsimple/OptionSetEqualsHashCodeTest.java | 14 +-
...ptionSetNonOptionArgumentsImmutabilityTest.java | 4 +-
.../joptsimple/OptionSetSpecsImmutabilityTest.java | 4 +-
...ionSetValuesOfOptionStringImmutabilityTest.java | 7 +-
.../OptionSetValuesOfSpecImmutabilityTest.java | 4 +-
.../OptionSpecBuilderOptionsImmutabilityTest.java | 2 +-
.../OptionSpecBuilderValuesImmutabilityTest.java | 2 +-
.../java/joptsimple/OptionSpecTokenizerTest.java | 2 +-
...SpecsReportTheirOptionsSortedSpeciallyTest.java | 2 +-
.../OptionSynonymCommonPrefixesTest.java | 2 +-
.../joptsimple/OptionSynonymNoArgumentTest.java | 2 +-
.../OptionSynonymOptionalArgumentTest.java | 2 +-
.../joptsimple/OptionSynonymOverwritingTest.java | 2 +-
.../OptionSynonymRequiredArgumentTest.java | 2 +-
...lArgumentOptionSpecOptionsImmutabilityTest.java | 2 +-
.../joptsimple/OptionalArgumentOptionSpecTest.java | 2 +-
...alArgumentOptionSpecValuesImmutabilityTest.java | 2 +-
.../joptsimple/ParserRulesUtilityClassTest.java | 2 +-
.../ParsingSeparatedConvertedOptionValuesTest.java | 2 +-
.../ParsingSeparatedStringOptionValuesTest.java | 2 +-
.../ParsingSeparatedTypedOptionValuesTest.java | 2 +-
.../java/joptsimple/PlainOldOptionParserTest.java | 2 +-
.../java/joptsimple/PopulatedOptionSetTest.java | 7 +-
.../joptsimple/PosixlyCorrectOptionParserTest.java | 2 +-
.../joptsimple/PunctuationInLongOptionTest.java | 7 +-
.../joptsimple/PunctuationInShortOptionTest.java | 7 +-
...quiredArgumentOptionSpecEqualsHashCodeTest.java | 2 +-
...dArgumentOptionSpecOptionsImmutabilityTest.java | 2 +-
...edArgumentOptionSpecValuesImmutabilityTest.java | 2 +-
src/test/java/joptsimple/RequiredIfAnyTest.java | 13 +-
src/test/java/joptsimple/RequiredIfTest.java | 8 +-
...edIfAnyTest.java => RequiredUnlessAnyTest.java} | 41 +++--
...RequiredIfTest.java => RequiredUnlessTest.java} | 60 +++----
.../joptsimple/ShortOptionsNoArgumentTest.java | 2 +-
.../ShortOptionsOptionalArgumentTest.java | 2 +-
.../ShortOptionsRequiredArgumentTest.java | 2 +-
src/test/java/joptsimple/SingleHyphenTest.java | 2 +-
src/test/java/joptsimple/ToStringTest.java | 8 +-
.../TypesafeOptionArgumentRetrievalTest.java | 10 +-
.../UtilityClassesUninstantiabilityHarness.java | 2 +-
...eConverterAdmitsSubclassesOfValueTypeTest.java} | 35 ++--
src/test/java/joptsimple/ValueOfHaver.java | 2 +-
.../WAsAbbreviationForLongOptionTest.java | 2 +-
src/test/java/joptsimple/WAsShortOptionTest.java | 2 +-
.../java/joptsimple/WExtensionNoArgumentTest.java | 2 +-
.../joptsimple/WExtensionWithArgumentTest.java | 2 +-
.../joptsimple/examples/ExportOptionsTest.java | 61 +++++++
.../joptsimple/examples/RequiredUnlessExample.java | 14 ++
.../joptsimple/internal/AbbreviationMapTest.java | 2 +-
.../internal/AbbreviationMapToJavaUtilMapTest.java | 2 +-
.../internal/ClassesUtilityClassTest.java | 2 +-
.../internal/ObjectsUtilityClassTest.java | 2 +-
src/test/java/joptsimple/internal/Problematic.java | 2 +-
.../java/joptsimple/internal/ReflectionTest.java | 2 +-
.../internal/ReflectionUtilityClassTest.java | 2 +-
.../joptsimple/internal/RowEqualsHashCodeTest.java | 2 +-
src/test/java/joptsimple/internal/RowsTest.java | 2 +-
.../internal/StringsUtilityClassTest.java | 2 +-
.../java/joptsimple/util/DateConverterTest.java | 2 +-
.../joptsimple/util/InetAddressConverterTest.java | 43 ++++-
.../java/joptsimple/util/KeyValuePairTest.java | 2 +-
.../util/KeyValuePairUnequalKeysTest.java | 2 +-
.../util/KeyValuePairUnequalValuesTest.java | 2 +-
.../java/joptsimple/util/RegexMatcherTest.java | 2 +-
159 files changed, 1209 insertions(+), 563 deletions(-)
diff --cc debian/changelog
index 80b7ba7,0000000..59a5ba1
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,58 -1,0 +1,59 @@@
- joptsimple (4.5-2) UNRELEASED; urgency=medium
++joptsimple (4.8-1) unstable; urgency=medium
+
++ * New upstream snapshot.
+ * Bump Standards-Version to 3.9.6 (no changes).
+
- -- Samuel Thibault <sthibault at debian.org> Fri, 19 Sep 2014 17:42:11 +0200
++ -- Samuel Thibault <sthibault at debian.org> Fri, 01 May 2015 21:43:37 +0200
+
+joptsimple (4.5-1) unstable; urgency=low
+
+ [ Samuel Thibault ]
+ * Bump Standards-Version to 3.9.5 (no changes).
+
+ [ Emmanuel Bourg ]
+ * Switch to debhelper level 9.
+ * Use canonical URLs for the Vcs-* fields.
+
+ [ Stephen Nelson ]
+ * New upstream version.
+ * Depend on cdbs.
+ * Updated copyright to machine readable format.
+ * Build with Maven.
+ * Add myself to uploaders.
+ * Add Samuel Thibault to uploaders.
+ * Change maintainer from Samuel Thibault to
+ Debian Java maintainers (See: #729687).
+ * Provide Maven artifact (Closes: #729687).
+ * Updated package homepage.
+
+ -- Stephen Nelson <stephen at eccostudio.com> Wed, 04 Dec 2013 22:18:20 +0000
+
+joptsimple (3.1-4) unstable; urgency=low
+
+ * Bump Standards-Version to 3.9.2 (no change needed)
+ * Add build-{indep,arch} rules.
+ * Drop jre dependency.
+
+ -- Samuel Thibault <sthibault at debian.org> Fri, 08 Jun 2012 23:50:59 +0200
+
+joptsimple (3.1-3) unstable; urgency=low
+
+ * debian/control:
+ - Bump Standards-Version to 3.9.1 (no change needed).
+ - Make libjoptsimple-java depend on headless java.
+
+ -- Samuel Thibault <sthibault at debian.org> Tue, 24 Aug 2010 21:27:08 +0200
+
+joptsimple (3.1-2) unstable; urgency=low
+
+ * debian/control: Drop duplicate Section: java field.
+ * debian/watch: Add.
+ * debian/libjoptsimple-java-doc.doc-base: Add.
+
+ -- Samuel Thibault <sthibault at debian.org> Wed, 13 Jan 2010 00:36:23 +0100
+
+joptsimple (3.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #544637)
+
+ -- Samuel Thibault <sthibault at debian.org> Tue, 01 Sep 2009 15:53:03 +0200
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/joptsimple.git
More information about the pkg-java-commits
mailing list