[pkg-java] r6022 - in trunk/maven2/debian: . patches

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2008-03-22 15:53:19 +0000 (Sat, 22 Mar 2008)
New Revision: 6022

Removed:
   trunk/maven2/debian/patches/command-line.patch
Modified:
   trunk/maven2/debian/changelog
Log:
  * 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).

Modified: trunk/maven2/debian/changelog
===================================================================
--- trunk/maven2/debian/changelog	2008-03-22 15:34:50 UTC (rev 6021)
+++ trunk/maven2/debian/changelog	2008-03-22 15:53:19 UTC (rev 6022)
@@ -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 <paul-debian at home.paulcager.org>  Sun, 16 Mar 2008 11:44:55 +0000
+
 maven2 (2.0.8-4) unstable; urgency=low
 
   * Closes: #458895: Creating empty project with artifacts fails.

Deleted: trunk/maven2/debian/patches/command-line.patch
===================================================================
--- trunk/maven2/debian/patches/command-line.patch	2008-03-22 15:34:50 UTC (rev 6021)
+++ trunk/maven2/debian/patches/command-line.patch	2008-03-22 15:53:19 UTC (rev 6022)
@@ -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(