Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweaking the activemq osgi jar so that it does not re-bundle the leveldbjni lib since the pure java version works fine.

This commit is contained in:
Hiram Chirino 2013-10-08 11:33:29 -04:00
parent 25f70ad483
commit 26092f5a82
1 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
activemq-osgi/pom.xml
View File

@ -32,33 +32,35 @@
<properties> <properties>
<activemq.osgi.import.pkg> <activemq.osgi.import.pkg>
!org.apache.commons.daemon, !org.apache.commons.daemon,
!org.apache.maven*, !org.apache.maven*,
sun.misc*;resolution:=optional, sun.misc*;resolution:=optional,
sun.nio*;resolution:=optional, sun.nio*;resolution:=optional,
javax.jmdns*;resolution:=optional, javax.jmdns*;resolution:=optional,
javax.resource*;resolution:=optional, javax.resource*;resolution:=optional,
javax.servlet*;resolution:=optional, javax.servlet*;resolution:=optional,
com.thoughtworks.xstream*;resolution:=optional, com.thoughtworks.xstream*;resolution:=optional,
org.apache.activeio*;resolution:=optional, org.apache.activeio*;resolution:=optional,
org.apache.camel*;resolution:=optional, org.apache.camel*;resolution:=optional,
org.apache.derby.jdbc*;resolution:=optional, org.apache.derby.jdbc*;resolution:=optional,
org.apache.geronimo.transaction.manager*;resolution:=optional, org.apache.geronimo.transaction.manager*;resolution:=optional,
org.apache.hadoop*;resolution:=optional, org.apache.hadoop*;resolution:=optional,
org.apache.http*;resolution:=optional, org.apache.http*;resolution:=optional,
org.apache.xpath*;resolution:=optional, org.apache.xpath*;resolution:=optional,
org.bouncycastle*;resolution:=optional, org.bouncycastle*;resolution:=optional,
org.codehaus.jackson*;resolution:=optional, org.codehaus.jackson*;resolution:=optional,
org.codehaus.jettison*;resolution:=optional, org.codehaus.jettison*;resolution:=optional,
org.jasypt*;resolution:=optional, org.linkedin*;resolution:=optional,
org.eclipse.jetty*;resolution:=optional, org.jasypt*;resolution:=optional,
org.apache.zookeeper;resolution:=optional, org.eclipse.jetty*;resolution:=optional,
org.linkedin*;resolution:=optional, org.apache.zookeeper*;resolution:=optional,
org.springframework.jms*;version="[3,4]";resolution:=optional, org.fusesource.leveldbjni*;resolution:=optional,
org.springframework.osgi*;version="[1.2,1.3]";resolution:=optional, org.linkedin*;resolution:=optional,
org.springframework.transaction*;version="[3,4]";resolution:=optional, org.springframework.jms*;version="[3,4]";resolution:=optional,
org.xmlpull*;resolution:=optional, org.springframework.osgi*;version="[1.2,1.3]";resolution:=optional,
scala*;resolution:=optional, org.springframework.transaction*;version="[3,4]";resolution:=optional,
org.xmlpull*;resolution:=optional,
scala*;resolution:=optional,
org.springframework*;version="[3,4]";resolution:=optional, org.springframework*;version="[3,4]";resolution:=optional,
org.apache.xbean.spring*;resolution:=optional, org.apache.xbean.spring*;resolution:=optional,
javax.annotation*, javax.annotation*,
@ -77,7 +79,9 @@
org.apache.activemq.web*;version=${project.version};-noimport:=true;-split-package:=merge-first, org.apache.activemq.web*;version=${project.version};-noimport:=true;-split-package:=merge-first,
</activemq.osgi.export> </activemq.osgi.export>
<activemq.osgi.private.pkg> <activemq.osgi.private.pkg>
org.fusesource*, org.fusesource.hawtdispatch*,
org.fusesource.mqtt*,
org.fusesource.hawtbuf*,
org.apache.qpid*, org.apache.qpid*,
com.google.common*, com.google.common*,
org.iq80* org.iq80*
@ -125,6 +129,10 @@
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-http</artifactId> <artifactId>activemq-http</artifactId>
</dependency> </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-partition</artifactId>
</dependency>
<!-- Additional Dependencies. --> <!-- Additional Dependencies. -->
<dependency> <dependency>
@ -267,6 +275,7 @@
<configuration> <configuration>
<instructions> <instructions>
<Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator> <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
<!--
<Embed-Dependency> <Embed-Dependency>
*; *;
groupId=org.apache.activemq;inline=META-INF/services/*, groupId=org.apache.activemq;inline=META-INF/services/*,
@ -287,6 +296,7 @@
org/xerial/snappy/native/Linux/arm/libsnappyjava.so;osname=linux;processor=arm, org/xerial/snappy/native/Linux/arm/libsnappyjava.so;osname=linux;processor=arm,
* *
</Bundle-NativeCode> </Bundle-NativeCode>
-->
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>