This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven2.
commit 232b70f7fbfc497e8ec855edb0f551d2bed5e576 Author: Paul Cager <[email protected]> Date: Sat Mar 22 15:53:19 2008 +0000 * Fixed processing of command line options (Closes: #466860) - Removed patch to call of commons-cli, and fixed problem in commons-cli instead (see bug 469082). --- debian/changelog | 8 ++++++++ debian/patches/command-line.patch | 35 ----------------------------------- 2 files changed, 8 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2bb5e08..8963578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +maven2 (2.0.8-5) unstable; urgency=low + + * Fixed processing of command line options (Closes: #466860) + - Removed patch to call of commons-cli, and fixed problem in + commons-cli instead (see bug 469082). + + -- Paul Cager <[email protected]> Sun, 16 Mar 2008 11:44:55 +0000 + maven2 (2.0.8-4) unstable; urgency=low * Closes: #458895: Creating empty project with artifacts fails. diff --git a/debian/patches/command-line.patch b/debian/patches/command-line.patch deleted file mode 100644 index e1e53a9..0000000 --- a/debian/patches/command-line.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Nur maven/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java maven.new/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java ---- maven/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java 2007-10-24 00:01:40.000000000 +0100 -+++ maven.new/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java 2008-01-11 23:57:39.000000000 +0000 -@@ -675,11 +675,11 @@ - { - options = new Options(); - -- options.addOption( OptionBuilder.withLongOpt( "file" ).hasArg().withDescription( -+ options.addOption( OptionBuilder.withLongOpt( "file" ).hasArgs().withDescription( - "Force the use of an alternate POM file." ).create( ALTERNATE_POM_FILE ) ); - - options.addOption( -- OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( "Define a system property" ).create( -+ OptionBuilder.withLongOpt( "define" ).hasArgs().withDescription( "Define a system property" ).create( - SET_SYSTEM_PROPERTY ) ); - options.addOption( - OptionBuilder.withLongOpt( "offline" ).withDescription( "Work offline" ).create( OFFLINE ) ); -@@ -704,7 +704,7 @@ - options.addOption( OptionBuilder.withLongOpt( "update-snapshots" ).withDescription( - "Forces a check for updated releases and snapshots on remote repositories" ).create( UPDATE_SNAPSHOTS ) ); - options.addOption( OptionBuilder.withLongOpt( "activate-profiles" ).withDescription( -- "Comma-delimited list of profiles to activate" ).hasArg().create( ACTIVATE_PROFILES ) ); -+ "Comma-delimited list of profiles to activate" ).hasArgs().create( ACTIVATE_PROFILES ) ); - - options.addOption( OptionBuilder.withLongOpt( "batch-mode" ).withDescription( - "Run in non-interactive (batch) mode" ).create( BATCH_MODE ) ); -@@ -726,7 +726,7 @@ - CHECKSUM_WARNING_POLICY ) ); - - options.addOption( OptionBuilder.withLongOpt( "settings" ) -- .withDescription( "Alternate path for the user settings file" ).hasArg() -+ .withDescription( "Alternate path for the user settings file" ).hasArgs() - .create( ALTERNATE_USER_SETTINGS ) ); - - options.addOption( OptionBuilder.withLongOpt( "fail-fast" ).withDescription( -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
