Revert "[KARAF-4555] Update to jline 2.14.2"
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0453b3fb Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0453b3fb Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0453b3fb Branch: refs/heads/karaf-4.0.x Commit: 0453b3fba0b32d4701226f3c69292b70b14f7ff6 Parents: 6a654fa Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Dec 12 21:43:17 2016 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Dec 12 21:43:17 2016 +0100 ---------------------------------------------------------------------- pom.xml | 7 +------ shell/table/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/0453b3fb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e3dd03d..e23f6dd 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ <hibernate.validator.version>5.0.3.Final</hibernate.validator.version> <jansi.version>1.14</jansi.version> <javassist.version>3.9.0.GA</javassist.version> - <jline.version>2.14.2</jline.version> + <jline.version>2.14.1</jline.version> <jledit.version>0.2.1</jledit.version> <jsw.version>3.2.3</jsw.version> <log4j.version>1.2.17</log4j.version> @@ -1180,11 +1180,6 @@ <version>${log4j.version}</version> </dependency> <dependency> - <groupId>org.fusesource.jansi</groupId> - <artifactId>jansi</artifactId> - <version>${jansi.version}</version> - </dependency> - <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> <version>${jline.version}</version> http://git-wip-us.apache.org/repos/asf/karaf/blob/0453b3fb/shell/table/pom.xml ---------------------------------------------------------------------- diff --git a/shell/table/pom.xml b/shell/table/pom.xml index 6fb2349..4d76004 100644 --- a/shell/table/pom.xml +++ b/shell/table/pom.xml @@ -49,11 +49,6 @@ <version>2.4</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.fusesource.jansi</groupId> - <artifactId>jansi</artifactId> - <optional>true</optional> - </dependency> </dependencies> <build> @@ -61,6 +56,11 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Import-Package>org.fusesource.jansi;version="[1.9,2)",*</Import-Package> + </instructions> + </configuration> </plugin> </plugins> </build>
