d0a0421e10e222f76c30cdaa04fed2f4911a5272

Author
Marc Cornellà <marc.cornella@live.com>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

mvn: sort aliases and improve comments and README

Diff

  1diff --git a/plugins/mvn/README.md b/plugins/mvn/README.md
  2index be6bd6db3d453d72c264bb838ac04fc5631e44fc..3f08c56d818b9ba0a2afea709427b251fb44a6d5 100644
  3--- a/plugins/mvn/README.md
  4+++ b/plugins/mvn/README.md
  5@@ -10,26 +10,45 @@ plugins=(... mvn)
  6 
  7 ## Aliases
  8 
  9+The plugin aliases mvn to a either calls `mvnw` ([Maven Wrapper](https://github.com/takari/maven-wrapper))
 10+if it's found, or the mvn command otherwise.
 11+
 12 | Alias                | Command                                         |
 13 |:---------------------|:------------------------------------------------|
 14-| `mvncie`             | `mvn clean install eclipse:eclipse`             |
 15+| `mvn!`               | `mvn -f <root>/pom.xml`                         |
 16+| `mvnag`              | `mvn archetype:generate`                        |
 17+| `mvnboot`            | `mvn spring-boot:run`                           |
 18+| `mvnc`               | `mvn clean`                                     |
 19+| `mvncd`              | `mvn clean deploy`                              |
 20+| `mvnce`              | `mvn clean eclipse:clean eclipse:eclipse`       |
 21 | `mvnci`              | `mvn clean install`                             |
 22+| `mvncie`             | `mvn clean install eclipse:eclipse`             |
 23+| `mvncini`            | `mvn clean initialize`                          |
 24 | `mvncist`            | `mvn clean install -DskipTests`                 |
 25 | `mvncisto`           | `mvn clean install -DskipTests --offline`       |
 26-| `mvne`               | `mvn eclipse:eclipse`                           |
 27-| `mvncv`              | `mvn clean verify`                              |
 28-| `mvnd`               | `mvn deploy`                                    |
 29-| `mvncd`              | `mvn clean deploy`                              |
 30-| `mvnp`               | `mvn package`                                   |
 31-| `mvnc`               | `mvn clean`                                     |
 32 | `mvncom`             | `mvn compile`                                   |
 33+| `mvncp`              | `mvn clean package`                             |
 34 | `mvnct`              | `mvn clean test`                                |
 35-| `mvnt`               | `mvn test`                                      |
 36-| `mvnag`              | `mvn archetype:generate`                        |
 37-| `mvn-updates`        | `mvn versions:display-dependency-updates`       |
 38-| `mvntc7`             | `mvn tomcat7:run`                               |
 39-| `mvnjetty`           | `mvn jetty:run`                                 |
 40+| `mvncv`              | `mvn clean verify`                              |
 41+| `mvncvst`            | `mvn clean verify -DskipTests`                  |
 42+| `mvnd`               | `mvn deploy`                                    |
 43+| `mvndocs`            | `mvn dependency:resolve -Dclassifier=javadoc`   |
 44 | `mvndt`              | `mvn dependency:tree`                           |
 45+| `mvne`               | `mvn eclipse:eclipse`                           |
 46+| `mvnjetty`           | `mvn jetty:run`                                 |
 47+| `mvnp`               | `mvn package`                                   |
 48 | `mvns`               | `mvn site`                                      |
 49 | `mvnsrc`             | `mvn dependency:sources`                        |
 50-| `mvndocs`            | `mvn dependency:resolve -Dclassifier=javadoc`   |
 51+| `mvnt`               | `mvn test`                                      |
 52+| `mvntc`              | `mvn tomcat:run`                                |
 53+| `mvntc7`             | `mvn tomcat7:run`                               |
 54+| `mvn-updates`        | `mvn versions:display-dependency-updates`       |
 55+
 56+## mvn-color
 57+
 58+It's a function that wraps the mvn command to colorize it's output. Since Maven 3.5.0
 59+the mvn command adds colored output, so this function will be soon removed from the
 60+plugin.
 61+
 62+It also has a bug where it won't print when mvn prompts for user input, _e.g._ when
 63+using `archetype:generate`. See [#5052](https://github.com/robbyrussell/oh-my-zsh/issues/5052).
 64diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
 65index 7e31da46a1624e4e66657a073c0722ba79e94106..66ea548ad196341ae27eb87a4f9c6499fbd53d70 100644
 66--- a/plugins/mvn/mvn.plugin.zsh
 67+++ b/plugins/mvn/mvn.plugin.zsh
 68@@ -1,4 +1,4 @@
 69-# if found an executable ./mvnw file execute it otherwise execute orignal mvn
 70+# Calls ./mvnw if found, otherwise execute the original mvn
 71 mvn-or-mvnw() {
 72 	if [ -x ./mvnw ]; then
 73 		echo "executing mvnw instead of mvn"
 74@@ -8,8 +8,7 @@ mvn-or-mvnw() {
 75 	fi
 76 }
 77 
 78-# Wrapper function for Maven's mvn command.
 79-# based on https://gist.github.com/1027800
 80+# Wrapper function for Maven's mvn command. Based on https://gist.github.com/1027800
 81 mvn-color() {
 82 	local BOLD=$(echoti bold)
 83 	local TEXT_RED=$(echoti setaf 1)
 84@@ -34,40 +33,40 @@ mvn-color() {
 85 	)
 86 }
 87 
 88-# either use orignal mvn oder the mvn wrapper
 89+# either use orignal mvn or the mvn wrapper
 90 alias mvn="mvn-or-mvnw"
 91 
 92 # Run mvn against the pom found in a project's root directory (assumes a git repo)
 93 alias 'mvn!'='mvn -f $(git rev-parse --show-toplevel 2>/dev/null || echo ".")/pom.xml'
 94 
 95 # aliases
 96-alias mvncini='mvn clean initialize'
 97-alias mvncie='mvn clean install eclipse:eclipse'
 98+alias mvnag='mvn archetype:generate'
 99+alias mvnboot='mvn spring-boot:run'
100+alias mvnc='mvn clean'
101+alias mvncd='mvn clean deploy'
102+alias mvnce='mvn clean eclipse:clean eclipse:eclipse'
103 alias mvnci='mvn clean install'
104-alias mvncp='mvn clean package'
105+alias mvncie='mvn clean install eclipse:eclipse'
106+alias mvncini='mvn clean initialize'
107 alias mvncist='mvn clean install -DskipTests'
108 alias mvncisto='mvn clean install -DskipTests --offline'
109-alias mvne='mvn eclipse:eclipse'
110-alias mvnce='mvn clean eclipse:clean eclipse:eclipse'
111+alias mvncom='mvn compile'
112+alias mvncp='mvn clean package'
113+alias mvnct='mvn clean test'
114 alias mvncv='mvn clean verify'
115 alias mvncvst='mvn clean verify -DskipTests'
116 alias mvnd='mvn deploy'
117-alias mvncd='mvn clean deploy'
118-alias mvnp='mvn package'
119-alias mvnc='mvn clean'
120-alias mvncom='mvn compile'
121-alias mvnct='mvn clean test'
122-alias mvnt='mvn test'
123-alias mvnag='mvn archetype:generate'
124-alias mvn-updates='mvn versions:display-dependency-updates'
125-alias mvntc7='mvn tomcat7:run'
126-alias mvntc='mvn tomcat:run'
127-alias mvnjetty='mvn jetty:run'
128-alias mvnboot='mvn spring-boot:run'
129+alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
130 alias mvndt='mvn dependency:tree'
131+alias mvne='mvn eclipse:eclipse'
132+alias mvnjetty='mvn jetty:run'
133+alias mvnp='mvn package'
134 alias mvns='mvn site'
135 alias mvnsrc='mvn dependency:sources'
136-alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
137+alias mvnt='mvn test'
138+alias mvntc='mvn tomcat:run'
139+alias mvntc7='mvn tomcat7:run'
140+alias mvn-updates='mvn versions:display-dependency-updates'
141 
142 
143 function listMavenCompletions {