[joptsimple] 02/02: Merge branch 'master' of ssh://git.debian.org/git/pkg-java/joptsimple
Samuel Thibault
sthibault at moszumanska.debian.org
Tue Oct 31 00:02:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository joptsimple.
commit cd66b065f967147d432f606408a29dcea92e8899
Merge: df1a285 ce253a8
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date: Tue Oct 31 01:02:50 2017 +0100
Merge branch 'master' of ssh://git.debian.org/git/pkg-java/joptsimple
.travis.yml | 19 ++
README.md | 2 +
debian/README.source | 9 +
debian/changelog | 25 ++-
debian/compat | 2 +-
debian/control | 43 ++--
debian/libjoptsimple-java-doc.install | 1 -
debian/maven.ignoreRules | 8 +-
debian/maven.properties | 2 +-
debian/maven.publishedRules | 2 -
debian/rules | 8 +-
debian/watch | 2 +-
paste-examples.xml | 8 +-
pom.xml | 92 +++++----
src/main/java/joptsimple/AbstractOptionSpec.java | 18 +-
.../java/joptsimple/AlternativeLongOptionSpec.java | 2 +-
.../joptsimple/ArgumentAcceptingOptionSpec.java | 22 +-
src/main/java/joptsimple/BuiltinHelpFormatter.java | 29 +--
src/main/java/joptsimple/OptionDeclarer.java | 2 +-
src/main/java/joptsimple/OptionException.java | 6 +-
src/main/java/joptsimple/OptionParser.java | 203 +++++++++++++------
src/main/java/joptsimple/OptionSet.java | 45 +++--
src/main/java/joptsimple/OptionSpecBuilder.java | 93 ++++++++-
...bjects.java => UnavailableOptionException.java} | 27 ++-
.../joptsimple/UnrecognizedOptionException.java | 2 -
.../java/joptsimple/internal/AbbreviationMap.java | 43 ++--
src/main/java/joptsimple/internal/Classes.java | 2 +-
src/main/java/joptsimple/internal/Columns.java | 9 +-
.../java/joptsimple/internal/OptionNameMap.java} | 22 +-
src/main/java/joptsimple/internal/Reflection.java | 18 +-
src/main/java/joptsimple/internal/Rows.java | 9 +-
.../joptsimple/internal/SimpleOptionNameMap.java} | 37 ++--
src/main/java/joptsimple/internal/Strings.java | 5 +-
src/main/java/joptsimple/util/EnumConverter.java | 104 ++++++++++
src/main/java/joptsimple/util/KeyValuePair.java | 6 +-
src/main/java/joptsimple/util/PathConverter.java | 51 +++++
src/main/java/joptsimple/util/PathProperties.java | 60 ++++++
.../joptsimple/ExceptionMessages.properties | 8 +
src/site/apt/acknowledgments.apt | 6 +-
src/site/apt/changes.apt | 48 ++++-
src/site/apt/developer.apt | 4 +-
src/site/apt/examples.apt | 11 +-
src/site/apt/index.apt | 2 +
.../ArgumentAcceptingOptionSpecTest.java | 3 +-
src/test/java/joptsimple/AvailableIfAnyTest.java | 82 ++++++++
.../java/joptsimple/AvailableIfUnlessTest.java | 143 +++++++++++++
.../java/joptsimple/AvailableUnlessAnyTest.java | 82 ++++++++
.../ConfigurableOptionParserHelpTest.java | 119 ++++++-----
.../DefaultSettingsOptionParserHelpTest.java | 221 +++++++++++++--------
src/test/java/joptsimple/EmptyOptionSetTest.java | 2 +-
.../java/joptsimple/InterleavedArgumentsTest.java | 9 +
.../java/joptsimple/LongOptionNoArgumentTest.java | 2 +-
.../OptionExceptionLocalizedMessageTest.java | 10 +-
.../joptsimple/OptionExceptionMessageTest.java | 18 +-
.../OptionParserAlternateHelpFormatterTest.java | 6 +-
src/test/java/joptsimple/OptionParserTest.java | 32 +++
src/test/java/joptsimple/OptionSetAsMapTest.java | 4 +-
.../joptsimple/OptionSetDetectedOptionsTest.java | 4 +-
...ptionSetNonOptionArgumentsImmutabilityTest.java | 2 +-
...ionSetValuesOfOptionStringImmutabilityTest.java | 2 +-
.../OptionSetValuesOfSpecImmutabilityTest.java | 2 +-
...SpecsReportTheirOptionsSortedSpeciallyTest.java | 2 +-
...edArgumentOptionSpecValuesImmutabilityTest.java | 2 +-
src/test/java/joptsimple/RequiredIfTest.java | 2 +-
.../ShortOptionsOptionalArgumentTest.java | 12 +-
src/test/java/joptsimple/ToStringTest.java | 4 +
.../TypesafeOptionArgumentRetrievalTest.java | 2 +-
...ueConverterAdmitsSubclassesOfValueTypeTest.java | 1 -
.../joptsimple/examples/HelpFormatterExample.java | 2 +-
.../examples/LongOptionsWithArgumentsTest.java | 28 +++
.../examples/OptionArgumentConverterTest.java | 29 ++-
.../examples/OptionArgumentValueTypeTest.java | 2 +-
.../examples/ant/filters/HTMLEntitifier.java | 2 +-
.../joptsimple/internal/AbbreviationMapTest.java | 2 +-
.../internal/AbbreviationMapToJavaUtilMapTest.java | 2 +-
.../joptsimple/internal/RowEqualsHashCodeTest.java | 2 +-
src/test/java/joptsimple/internal/RowsTest.java | 11 +-
.../internal/SimpleOptionNameMapTest.java | 93 +++++++++
.../java/joptsimple/util/DateConverterTest.java | 6 +-
.../java/joptsimple/util/EnumConverterTest.java | 95 +++++++++
.../joptsimple/util/InetAddressConverterTest.java | 49 +----
.../java/joptsimple/util/KeyValuePairTest.java | 4 +-
.../java/joptsimple/util/PathConverterTest.java | 104 ++++++++++
.../java/joptsimple/util/PathPropertiesTest.java | 54 +++++
84 files changed, 1824 insertions(+), 546 deletions(-)
diff --cc debian/changelog
index 50d481e,5f5faa3..d9c7f84
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,29 +1,29 @@@
- joptsimple (4.9-1) UNRELEASED; urgency=medium
+ joptsimple (5.0.4-2) unstable; urgency=medium
+ * Team upload.
+ * Added the missing dependency on libmaven-javadoc-plugin-java
+ * Removed no-oss-parent.patch
+ * Removed no_gitexe.patch
+ * Removed maven-bundle-plugin_is_2.5.4.patch
+ * Removed the override_dh_auto_clean target in debian/rules
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 12 Sep 2017 09:47:57 +0200
+
+ joptsimple (5.0.4-1) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Steffen Moeller ]
+ * New upstream release.
+
+ [ Samuel Thibault ]
* New upstream snapshot.
- - control: Add libmaven-bundle-plugin-java libanimal-sniffer-java
- libmaven-cobertura-plugin-java, libmaven-antrun-plugin-java build
- dependencies.
+ - control: Add libmaven-bundle-plugin-java build dependencies.
* Use canonical anonscm vcs URL.
* control: Migrate priority to optional.
- * control: Bump Standards-Version to 4.1.0.
+ * control: Bump Standards-Version to 4.1.1.
- -- Samuel Thibault <sthibault at debian.org> Fri, 01 May 2015 21:43:37 +0200
+ -- Steffen Moeller <moeller at debian.org> Wed, 30 Aug 2017 21:40:11 +0200
joptsimple (4.5-3) unstable; urgency=medium
diff --cc debian/control
index 0c2686b,d9d321e..cedce08
--- a/debian/control
+++ b/debian/control
@@@ -2,25 -2,24 +2,24 @@@ Source: joptsimpl
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
- Uploaders: Samuel Thibault <sthibault at debian.org>,
- Stephen Nelson <stephen at eccostudio.com>
- Build-Depends: cdbs,
- ant,
- debhelper (>= 9),
- default-jdk,
- maven-debian-helper
- Build-Depends-Indep: default-jdk-doc,
- libjoda-time-java,
- libmaven-javadoc-plugin-java,
- libmaven-bundle-plugin-java,
- libanimal-sniffer-java,
- libmaven-cobertura-plugin-java,
- libmaven-antrun-plugin-java,
- junit4
+ Uploaders:
+ Samuel Thibault <sthibault at debian.org>,
+ Stephen Nelson <stephen at eccostudio.com>,
+ Steffen Moeller <moeller at debian.org>
+ Build-Depends:
+ ant,
+ debhelper (>= 10),
+ default-jdk,
+ junit4 (>= 4.12),
+ libhamcrest-java,
+ libjoda-time-java (>= 2.9.9),
+ libmaven-bundle-plugin-java (>= 2.5.4),
+ libmaven-javadoc-plugin-java,
+ maven-debian-helper (>= 2.1)
-Standards-Version: 4.1.0
+Standards-Version: 4.1.1
- Vcs-Browser: https://anonscm.debian.org/git/pkg-java/joptsimple.git
Vcs-Git: https://anonscm.debian.org/git/pkg-java/joptsimple.git
- Homepage: http://pholser.github.com/jopt-simple
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/joptsimple.git
+ Homepage: https://pholser.github.com/jopt-simple
Package: libjoptsimple-java
Architecture: all
--
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