CRASH-193 : Shade jline into shell module

Author: vietj

.gitignore

@@ -12,3 +12,4 @@ nul
 org.eclipse.m2e.core.prefs
 org.eclipse.core.resources.prefs
 org.eclipse.jdt.core.prefs
+dependency-reduced-pom.xml

connectors/ssh/pom.xml

@@ -19,10 +19,6 @@
       <groupId>org.crashub</groupId>
       <artifactId>crash.shell</artifactId>
     </dependency>
-    <dependency>
-      <groupId>jline</groupId>
-      <artifactId>jline</artifactId>
-    </dependency>
 
     <!-- SSHD connector dependencies -->
     <dependency>
@@ -86,12 +82,6 @@
   <profiles>
     <profile>
       <id>main</id>
-      <dependencies>
-        <dependency>
-          <groupId>jline</groupId>
-          <artifactId>jline</artifactId>
-        </dependency>
-      </dependencies>
       <build>
         <pluginManagement>
           <plugins>

connectors/ssh/src/main/java/org/crsh/ssh/term/CRaSHCommand.java

@@ -18,8 +18,8 @@
  */
 package org.crsh.ssh.term;
 
-import jline.Terminal;
-import jline.console.ConsoleReader;
+import org.crsh.console.jline.Terminal;
+import org.crsh.console.jline.console.ConsoleReader;
 import org.apache.sshd.server.Environment;
 import org.crsh.console.jline.JLineProcessor;
 import org.crsh.shell.Shell;

connectors/telnet/pom.xml

@@ -98,15 +98,6 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>main</id>
-      <dependencies>
-        <dependency>
-          <groupId>jline</groupId>
-          <artifactId>jline</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
     <profile>
       <id>no-network</id>
       <build>

doc/api/pom.xml

@@ -78,6 +78,7 @@
             </goals>
             <configuration>
               <includes>org/**/*.java</includes>
+              <excludes>org/crsh/console/jline/**</excludes>
               <outputDirectory>${project.build.directory}/sources</outputDirectory>
             </configuration>
           </execution>

packaging/pom.xml

@@ -29,10 +29,6 @@
       <groupId>org.crashub</groupId>
       <artifactId>crash.shell</artifactId>
     </dependency>
-    <dependency>
-      <groupId>jline</groupId>
-      <artifactId>jline</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>

plugins/cron/pom.xml

@@ -59,12 +59,6 @@
   <profiles>
     <profile>
       <id>main</id>
-      <dependencies>
-        <dependency>
-          <groupId>jline</groupId>
-          <artifactId>jline</artifactId>
-        </dependency>
-      </dependencies>
       <build>
         <pluginManagement>
           <plugins>

shell/pom.xml

@@ -25,11 +25,10 @@
       <artifactId>groovy-all</artifactId>
     </dependency>
 
-    <!-- Optional as one does not have to use jline but could use another connector -->
+    <!-- Will be shaded -->
     <dependency>
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
-      <optional>true</optional>
     </dependency>
 
     <dependency>
@@ -80,7 +79,6 @@
 
   <build>
     <plugins>
-<!--
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
         <version>2.2</version>
@@ -92,11 +90,11 @@
             </goals>
             <configuration>
               <shadedArtifactAttached>false</shadedArtifactAttached>
-              <createDependencyReducedPom>false</createDependencyReducedPom>
+              <createDependencyReducedPom>true</createDependencyReducedPom>
+              <createSourcesJar>true</createSourcesJar>
               <artifactSet>
                 <includes>
                   <include>jline:jline</include>
-                  <include>org.crashub:crash.cli</include>
                 </includes>
               </artifactSet>
               <relocations>
@@ -121,7 +119,7 @@
           </execution>
         </executions>
       </plugin>
--->
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>

shell/src/main/assembly/standalone.xml

@@ -38,7 +38,9 @@
       <outputDirectory>/</outputDirectory>
       <unpack>true</unpack>
       <includes>
+<!--
         <include>jline:jline</include>
+-->
         <include>org.crashub:crash.cli</include>
         <include>org.codehaus.groovy:groovy-all</include>
         <include>org.crashub:crash.shell</include>