jline 2.7 should be released soon, and at least before preview2.

Revert "Remove JLine from being seen by maven and jarjar'ing our internal committed version to a non-conflicting package (to be reverted for next release when jline 2.7 is out)" This reverts commit 47d42eb.
lifus · Jun 8, 2012 · 9739565 · 9739565
1 parent 96bba04
commit 9739565
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/build.xml b/build.xml
@@ -435,8 +435,6 @@
         <attribute name="Main-Class" value="org.jruby.Main"/>
       </manifest>
       <rule pattern="org.objectweb.asm.**" result="org.jruby.org.objectweb.asm.@1"/>
-      <rule pattern="jline.**" result="org.jruby.hidden.jline.@1"/>
-      <rule pattern="org.fusesource.**" result="org.jruby.hidden.org.fusesource.@1"/>
     </jarjar>
     <antcall target="_osgify-jar_">
       <param name="bndfile" value="jruby.bnd" />
@@ -507,8 +505,6 @@
         <attribute name="Main-Class" value="org.jruby.Main"/>
       </manifest>
       <rule pattern="org.objectweb.asm.**" result="org.jruby.org.objectweb.asm.@1"/>
-      <rule pattern="jline.**" result="org.jruby.hidden.jline.@1"/>
-      <rule pattern="org.fusesource.**" result="org.jruby.hidden.org.fusesource.@1"/>
     </jarjar>
     <antcall target="_osgify-jar_">
       <param name="bndfile" value="jruby.bnd" />
@@ -674,8 +670,6 @@
         <attribute name="Main-Class" value="${mainclass}"/>
       </manifest>
       <rule pattern="org.objectweb.asm.**" result="org.jruby.org.objectweb.asm.@1"/>
-      <rule pattern="jline.**" result="org.jruby.hidden.jline.@1"/>
-      <rule pattern="org.fusesource.**" result="org.jruby.hidden.org.fusesource.@1"/>
     </jarjar>
     <antcall target="_osgify-jar_">
       <param name="bndfile" value="jruby-complete.bnd" />

diff --git a/maven/jruby-complete/pom.xml b/maven/jruby-complete/pom.xml
@@ -59,6 +59,11 @@
       <artifactId>snakeyaml</artifactId>
       <scope>${jar.scope}</scope>
     </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+      <scope>${jar.scope}</scope>
+    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>

diff --git a/maven/jruby-core/pom.xml b/maven/jruby-core/pom.xml
@@ -59,6 +59,11 @@
       <artifactId>snakeyaml</artifactId>
       <scope>${jar.scope}</scope>
     </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+      <scope>${jar.scope}</scope>
+    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>

diff --git a/maven/jruby/pom.xml b/maven/jruby/pom.xml
@@ -59,6 +59,11 @@
       <artifactId>snakeyaml</artifactId>
       <scope>${jar.scope}</scope>
     </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+      <scope>${jar.scope}</scope>
+    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -115,6 +115,12 @@
       <version>1.10</version>
       <scope>${jar.scope}</scope>
     </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+      <version>2.7</version>
+      <scope>${jar.scope}</scope>
+    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>