This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository joptsimple.
commit 30ad01dca299caae3c0091024cb0bc72fcdbdc9f Merge: 6dd9948 85b012c Author: Samuel Thibault <[email protected]> Date: Sat Oct 24 17:53:34 2015 +0200 Merge tag 'upstream/4.9' Upstream version 4.9 LICENSE.txt | 2 +- README.md | 4 + debian/changelog | 2 +- debian/copyright | 2 +- pom.xml | 25 +- src/main/java/joptsimple/AbstractOptionSpec.java | 3 +- .../java/joptsimple/AlternativeLongOptionSpec.java | 20 +- .../joptsimple/ArgumentAcceptingOptionSpec.java | 2 +- src/main/java/joptsimple/ArgumentList.java | 2 +- src/main/java/joptsimple/BuiltinHelpFormatter.java | 404 ++++++++++++++++++--- src/main/java/joptsimple/HelpFormatter.java | 2 +- .../IllegalOptionSpecificationException.java | 2 +- .../MissingRequiredOptionsException.java | 2 +- .../MultipleArgumentsForOptionException.java | 2 +- src/main/java/joptsimple/NoArgumentOptionSpec.java | 3 +- .../java/joptsimple/NonOptionArgumentSpec.java | 4 +- .../OptionArgumentConversionException.java | 2 +- src/main/java/joptsimple/OptionDescriptor.java | 2 +- src/main/java/joptsimple/OptionException.java | 16 +- .../OptionMissingRequiredArgumentException.java | 2 +- src/main/java/joptsimple/OptionParser.java | 19 +- src/main/java/joptsimple/OptionParserState.java | 2 +- src/main/java/joptsimple/OptionSet.java | 4 +- src/main/java/joptsimple/OptionSpec.java | 2 +- src/main/java/joptsimple/OptionSpecBuilder.java | 2 +- src/main/java/joptsimple/OptionSpecTokenizer.java | 2 +- .../joptsimple/OptionalArgumentOptionSpec.java | 4 +- src/main/java/joptsimple/ParserRules.java | 2 +- .../joptsimple/RequiredArgumentOptionSpec.java | 2 +- .../joptsimple/UnconfiguredOptionException.java | 2 +- .../joptsimple/UnrecognizedOptionException.java | 2 +- .../java/joptsimple/ValueConversionException.java | 2 +- src/main/java/joptsimple/ValueConverter.java | 2 +- .../java/joptsimple/internal/AbbreviationMap.java | 2 +- src/main/java/joptsimple/internal/Classes.java | 2 +- src/main/java/joptsimple/internal/Columns.java | 2 +- .../ConstructorInvokingValueConverter.java | 2 +- .../internal/{Objects.java => Messages.java} | 25 +- .../internal/MethodInvokingValueConverter.java | 2 +- src/main/java/joptsimple/internal/Objects.java | 2 +- src/main/java/joptsimple/internal/Reflection.java | 2 +- .../joptsimple/internal/ReflectionException.java | 2 +- src/main/java/joptsimple/internal/Row.java | 2 +- src/main/java/joptsimple/internal/Rows.java | 2 +- src/main/java/joptsimple/internal/Strings.java | 2 +- src/main/java/joptsimple/util/DateConverter.java | 21 +- .../java/joptsimple/util/InetAddressConverter.java | 18 +- src/main/java/joptsimple/util/KeyValuePair.java | 2 +- src/main/java/joptsimple/util/RegexMatcher.java | 16 +- .../joptsimple/ExceptionMessages.properties | 3 +- .../joptsimple/HelpFormatterMessages.properties | 11 + src/site/apt/acknowledgments.apt | 2 + src/site/apt/changes.apt | 26 +- .../joptsimple/AbstractOptionParserFixture.java | 2 +- .../java/joptsimple/AbstractOptionSpecFixture.java | 2 +- ...tractOptionSpecOptionsImmutabilityTestCase.java | 2 +- ...stractOptionSpecValuesImmutabilityTestCase.java | 2 +- ...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 | 2 +- src/test/java/joptsimple/EmptyOptionSetTest.java | 2 +- src/test/java/joptsimple/ExceptionMatchers.java | 2 +- ...andlingDefaultValuesForOptionArgumentsTest.java | 2 +- .../java/joptsimple/InterleavedArgumentsTest.java | 2 +- ...lassesOfValueTypeTest.java => Issue76Test.java} | 45 ++- .../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 | 16 +- ...va => OptionExceptionLocalizedMessageTest.java} | 33 +- .../joptsimple/OptionExceptionMessageTest.java | 2 +- .../OptionExceptionOptionsImmutabilityTest.java | 2 +- .../OptionParserAlternateHelpFormatterTest.java | 2 +- .../OptionParserArgumentExceptionTest.java | 2 +- .../joptsimple/OptionParserNewDeclarationTest.java | 2 +- .../OptionParserOptionExceptionTest.java | 2 +- .../OptionParserRecognizedOptionsTest.java | 2 +- src/test/java/joptsimple/OptionParserTest.java | 24 +- ...OptionParserUnrecognizedOptionsAllowedTest.java | 2 +- .../joptsimple/OptionSetDetectedOptionsTest.java | 2 +- .../joptsimple/OptionSetEqualsHashCodeTest.java | 2 +- ...ptionSetNonOptionArgumentsImmutabilityTest.java | 2 +- .../joptsimple/OptionSetSpecsImmutabilityTest.java | 2 +- ...ionSetValuesOfOptionStringImmutabilityTest.java | 2 +- .../OptionSetValuesOfSpecImmutabilityTest.java | 2 +- .../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 | 2 +- .../joptsimple/PosixlyCorrectOptionParserTest.java | 2 +- .../joptsimple/PunctuationInLongOptionTest.java | 2 +- .../joptsimple/PunctuationInShortOptionTest.java | 2 +- ...quiredArgumentOptionSpecEqualsHashCodeTest.java | 2 +- ...dArgumentOptionSpecOptionsImmutabilityTest.java | 2 +- ...edArgumentOptionSpecValuesImmutabilityTest.java | 2 +- src/test/java/joptsimple/RequiredIfAnyTest.java | 2 +- src/test/java/joptsimple/RequiredIfTest.java | 2 +- .../java/joptsimple/RequiredUnlessAnyTest.java | 2 +- src/test/java/joptsimple/RequiredUnlessTest.java | 2 +- .../joptsimple/ShortOptionsNoArgumentTest.java | 2 +- .../ShortOptionsOptionalArgumentTest.java | 2 +- .../ShortOptionsRequiredArgumentTest.java | 2 +- src/test/java/joptsimple/SingleHyphenTest.java | 2 +- src/test/java/joptsimple/ToStringTest.java | 2 +- .../TypesafeOptionArgumentRetrievalTest.java | 2 +- .../UtilityClassesUninstantiabilityHarness.java | 2 +- ...ueConverterAdmitsSubclassesOfValueTypeTest.java | 2 +- 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/internal/AbbreviationMapTest.java | 2 +- .../internal/AbbreviationMapToJavaUtilMapTest.java | 2 +- .../internal/ClassesUtilityClassTest.java | 2 +- ...lassTest.java => MessagesUtilityClassTest.java} | 8 +- .../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 | 2 +- .../java/joptsimple/util/KeyValuePairTest.java | 2 +- .../util/KeyValuePairUnequalKeysTest.java | 2 +- .../util/KeyValuePairUnequalValuesTest.java | 2 +- .../java/joptsimple/util/RegexMatcherTest.java | 2 +- .../joptsimple/ExceptionMessages_xx_YY.properties | 10 + 159 files changed, 731 insertions(+), 301 deletions(-) diff --cc debian/changelog index caebcb1,0000000..4b32aaa mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,59 -1,0 +1,59 @@@ - joptsimple (4.8-1) UNRELEASED; urgency=medium ++joptsimple (4.9-1) UNRELEASED; urgency=medium + + * New upstream snapshot. + * Bump Standards-Version to 3.9.6 (no changes). + + -- Samuel Thibault <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Wed, 13 Jan 2010 00:36:23 +0100 + +joptsimple (3.1-1) unstable; urgency=low + + * Initial release (Closes: #544637) + + -- Samuel Thibault <[email protected]> Tue, 01 Sep 2009 15:53:03 +0200 diff --cc debian/copyright index 9f862df,0000000..7131a4a mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,56 -1,0 +1,56 @@@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: JOpt Simple +Upstream-Contact: Paul R. Holser, Jr. <[email protected]> +Source: http://pholser.github.com/jopt-simple + +Files: * - Copyright: © 2004-2013, Paul R. Holser, Jr. <[email protected]> ++Copyright: © 2004-2015, Paul R. Holser, Jr. <[email protected]> +License: MIT + +Files: src/site/resources/scripts/prettify.js +Copyright: © 2006, Google Inc. +License: Apache-2.0 + +Files: debian/* +Copyright: © 2009-2013, Samuel Thibault <[email protected]>, + © 2013, Stephen Nelson <[email protected]> +License: GPL-3 + +License: GPL-3 + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-3'. + +License: MIT + 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. + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + /usr/share/common-licenses/Apache-2.0 (on Debian systems) + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/joptsimple.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
