You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ld...@apache.org on 2011/03/02 13:33:13 UTC
svn commit: r1076193 - /karaf/trunk/shell/console/pom.xml
Author: ldywicki
Date: Wed Mar 2 12:33:13 2011
New Revision: 1076193
URL: http://svn.apache.org/viewvc?rev=1076193&view=rev
Log:
Fix building issues with duplicated dependency to jansi through jline
Modified:
karaf/trunk/shell/console/pom.xml
Modified: karaf/trunk/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/pom.xml?rev=1076193&r1=1076192&r2=1076193&view=diff
==============================================================================
--- karaf/trunk/shell/console/pom.xml (original)
+++ karaf/trunk/shell/console/pom.xml Wed Mar 2 12:33:13 2011
@@ -43,14 +43,20 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.sonatype.jline</groupId>
- <artifactId>jline</artifactId>
- </dependency>
- <dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
</dependency>
<dependency>
+ <groupId>org.sonatype.jline</groupId>
+ <artifactId>jline</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
@@ -123,14 +129,14 @@
org.apache.felix.service.command;version=${felix.gogo.version};status=provisional;mandatory:=status,
org.apache.felix.service.threadio;version=${felix.gogo.version};status=provisional;mandatory:=status,
org.apache.karaf.shell.console*;version=${project.version},
- org.fusesource.jansi;version=${jansi.version},
+ org.fusesource.jansi;version=${jansi.version};-split-package:=first,
jline*;version=${jline.version},
- org.fusesource.hawtjni*;version=1.0
+ org.fusesource.hawtjni*;version=1.0;-split-package:=first
</Export-Package>
<Private-Package>
- org.fusesource.jansi.internal,
- org.apache.felix.gogo.runtime*,
- META-INF.native.*
+ org.fusesource.jansi.internal;-split-package:=first,
+ org.apache.felix.gogo.runtime*;-split-package:=first,
+ META-INF.native.*;-split-package:=first
</Private-Package>
<Bundle-NativeCode>
META-INF/native/windows32/jansi.dll;osname=Win32;processor=x86,