Update dependencies (#6)

* require maven, update shade plugin (old breaks on current mavens) * NPE workaround * mvn plgn updts * added a comment
crashub · Feb 21, 2018 · cadb535 · cadb535
1 parent df87f89
commit cadb535
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/doc/reference/src/main/java/org/crsh/doc/Generator.java b/doc/reference/src/main/java/org/crsh/doc/Generator.java
@@ -59,16 +59,19 @@ public static void main(String[] args) throws Exception {
     StringBuilder buffer = new StringBuilder();
     for (Map.Entry<String, String> s : crash.getCommands()) {
       Command<?> cmd = crash.getCommand(s.getKey());
-      CommandDescriptor<?> desc = cmd.getDescriptor();
-      buffer.append("== ").append(desc.getName()).append("\n").append("\n");
-      buffer.append("----\n");
-      buffer.append(cmd.describe("", Format.MAN));
-      buffer.append("----\n");
-      for (CommandDescriptor<?> m : desc.getSubordinates().values()) {
-        buffer.append("=== ").append(desc.getName()).append(" ").append(m.getName()).append("\n").append("\n");
+//      need to escape as 'bye' and 'exit' are not valid commands, but we want them in the help's output
+      if(cmd != null) {
+        CommandDescriptor<?> desc = cmd.getDescriptor();
+        buffer.append("== ").append(desc.getName()).append("\n").append("\n");
         buffer.append("----\n");
-        buffer.append(cmd.describe(m.getName(), Format.MAN));
-        buffer.append("----\n\n");
+        buffer.append(cmd.describe("", Format.MAN));
+        buffer.append("----\n");
+        for (CommandDescriptor<?> m : desc.getSubordinates().values()) {
+          buffer.append("=== ").append(desc.getName()).append(" ").append(m.getName()).append("\n").append("\n");
+          buffer.append("----\n");
+          buffer.append(cmd.describe(m.getName(), Format.MAN));
+          buffer.append("----\n\n");
+        }
       }
     }
     if (buffer.length() > 0) {

diff --git a/pom.xml b/pom.xml
@@ -33,6 +33,10 @@
     <url>http://www.corda.net</url>
   </scm>
 
+  <prerequisites>
+    <maven>3.0.0</maven>
+  </prerequisites>
+
   <developers>
     <developer>
       <id>julien.viet</id>
@@ -524,6 +528,10 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
@@ -562,7 +570,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
+          <version>3.7.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -577,7 +585,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.1</version>
+          <version>3.0.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -592,7 +600,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>2.4.1</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -607,7 +615,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>exec-maven-plugin</artifactId>
-          <version>1.1.1</version>
+          <version>1.6.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -622,14 +630,14 @@
         <plugin>
           <groupId>org.asciidoctor</groupId>
           <artifactId>asciidoctor-maven-plugin</artifactId>
-          <version>0.1.4</version>
+          <version>1.5.6</version>
         </plugin>
 
         <!-- Make standalone configuration -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2.1</version>
+          <version>3.1.0</version>
           <executions>
 
             <execution>
@@ -679,7 +687,7 @@
 
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.12</version>
+          <version>2.20.1</version>
           <executions>
             <execution>
               <id>default-test</id>

diff --git a/shell/pom.xml b/shell/pom.xml
@@ -81,7 +81,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.2</version>
         <executions>
           <execution>
             <phase>package</phase>