You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2014/08/27 17:38:37 UTC

[6/6] git commit: Merge remote-tracking branch 'origin/master' into sixpack

Merge remote-tracking branch 'origin/master' into sixpack


Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/b03b841c
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/b03b841c
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/b03b841c

Branch: refs/heads/master
Commit: b03b841c00b51bc5cd1bc2687a30bc59e7796471
Parents: 875d7b4 7e7202d
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Wed Aug 27 17:36:09 2014 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Wed Aug 27 17:36:09 2014 +0200

----------------------------------------------------------------------
 .../apache/maven/index/cli/NexusIndexerCli.java |  2 +-
 indexer-cli/src/site/apt/index.apt.vm           | 34 ++++++++++
 .../maven/index/cli/NexusIndexerCliTest.java    | 66 ++++++++++++++++++++
 indexer-examples/src/site/site.xml              | 42 +++++++++++++
 4 files changed, 143 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/b03b841c/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
----------------------------------------------------------------------
diff --cc indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
index 5fe0738,2fac778..dc4a8f7
--- a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
+++ b/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
@@@ -206,8 -207,11 +206,8 @@@ public class NexusIndexerCl
          .withDescription( "Create checksums for all files (sha1, md5)." ).create( CREATE_FILE_CHECKSUMS ) );
  
          options.addOption( OptionBuilder.withLongOpt( "type" ).hasArg() //
-         .withDescription( "Indexer type (default, min, full or coma separated list of custom types)." ).create( TYPE ) );
+         .withDescription( "Indexer type (default, min, full or comma separated list of custom types)." ).create( TYPE ) );
  
 -        options.addOption( OptionBuilder.withLongOpt( "legacy" ) //
 -        .withDescription( "Build legacy .zip index file" ).create( LEGACY ) );
 -
          options.addOption( OptionBuilder.withLongOpt( "unpack" ) //
          .withDescription( "Unpack an index file" ).create( UNPACK ) );