git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439086 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2013-01-27 14:03:41 +00:00
parent c441e3a66c
commit 2e622a4e15
3 changed files with 54 additions and 20 deletions

View File

@ -27,24 +27,6 @@
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
<bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<!--<bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>-->
<!--<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>-->
<!--<bundle dependency="true">mvn:commons-codec/commons-codec/1.4</bundle>-->
<!--<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_5</bundle>-->
<!--<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.0_1</bundle>-->
<!--<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>-->
<!--<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>-->
<!--<bundle dependency="true">mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>-->
<!--<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>-->
<!--<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>-->
<!--<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>-->
<!--<bundle dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>-->
<!--<bundle>mvn:org.apache.activemq/kahadb/${project.version}</bundle>-->
<!--<bundle>mvn:org.apache.activemq/activemq-console/${project.version}</bundle>-->
<!--<bundle>mvn:org.apache.activemq/activemq-ra/${project.version}</bundle>-->
<!--<bundle>mvn:org.apache.activemq/activemq-pool/${project.version}</bundle>-->
<!--<bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>-->
<!--<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>-->
</feature> </feature>
<feature name="activemq-broker" version="${project.version}" resolver="(obr)" start-level="50"> <feature name="activemq-broker" version="${project.version}" resolver="(obr)" start-level="50">
@ -118,10 +100,11 @@
</feature> </feature>
<feature name="activemq-extra" version="${project.version}" resolver="(obr)" start-level="50"> <feature name="activemq-extra" version="${project.version}" resolver="(obr)" start-level="50">
<bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
<bundle>mvn:org.fusesource.mqtt-client/mqtt-client/${mqtt-client-version}</bundle> <bundle>mvn:org.fusesource.mqtt-client/mqtt-client/${mqtt-client-version}</bundle>
<bundle>mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle> <bundle>mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-leveldb/${project.version}/jar/bundle</bundle>
<bundle>mvn:org.fusesource.hawtdispatch/hawtdispatch/${hawtdispatch-version}</bundle> <bundle>mvn:org.fusesource.hawtdispatch/hawtdispatch/${hawtdispatch-version}</bundle>
<bundle>mvn:org.fusesource.hawtdispatch/hawtdispatch-scala/${hawtdispatch-version}</bundle>
<bundle>mvn:org.fusesource.hawtdispatch/hawtdispatch-transport/${hawtdispatch-version}</bundle> <bundle>mvn:org.fusesource.hawtdispatch/hawtdispatch-transport/${hawtdispatch-version}</bundle>
</feature> </feature>
</features> </features>

View File

@ -365,6 +365,53 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.fusesource.mvnplugins</groupId>
<artifactId>maven-uberize-plugin</artifactId>
<version>1.14</version>
<executions>
<execution>
<id>all</id>
<phase>package</phase>
<goals><goal>uberize</goal></goals>
</execution>
</executions>
<configuration>
<uberArtifactAttached>true</uberArtifactAttached>
<uberClassifierName>uber</uberClassifierName>
<artifactSet>
<includes>
<!-- <include>org.scala-lang:scala-library</include> -->
<include>org.fusesource.hawtdispatch:hawtdispatch</include>
<include>org.fusesource.hawtdispatch:hawtdispatch-scala</include>
<include>org.fusesource.hawtbuf:hawtbuf</include>
<include>org.fusesource.hawtbuf:hawtbuf-proto</include>
<include>org.iq80.leveldb:leveldb-api</include>
<include>org.iq80.leveldb:leveldb</include>
<!--
<include>org.xerial.snappy:snappy-java</include>
<include>com.google.guava:guava</include>
-->
<include>org.xerial.snappy:snappy-java</include>
<include>org.fusesource.leveldbjni:leveldbjni</include>
<include>org.fusesource.leveldbjni:leveldbjni-osx</include>
<include>org.fusesource.leveldbjni:leveldbjni-linux32</include>
<include>org.fusesource.leveldbjni:leveldbjni-linux64</include>
<include>org.fusesource.hawtjni:hawtjni-runtime</include>
<!-- include bits need to access hdfs as a client -->
<include>org.apache.hadoop:hadoop-core</include>
<include>commons-configuration:commons-configuration</include>
<include>org.codehaus.jackson:jackson-mapper-asl</include>
<include>org.codehaus.jackson:jackson-core-asl</include>
</includes>
</artifactSet>
</configuration>
</plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>

View File

@ -35,7 +35,9 @@
</activemq.osgi.import.pkg> </activemq.osgi.import.pkg>
<activemq.osgi.export> <activemq.osgi.export>
org.apache.activemq*;version=${project.version};-noimport:=true;-split-package:=merge-first org.apache.activemq*;version=${project.version};-noimport:=true;-split-package:=merge-first,
org.iq80*;-noimport:=true;-split-package:=merge-first,
org.fusesource*;-noimport:=true;-split-package:=merge-first
</activemq.osgi.export> </activemq.osgi.export>
<activemq.osgi.dynamic.import>*</activemq.osgi.dynamic.import> <activemq.osgi.dynamic.import>*</activemq.osgi.dynamic.import>
<surefire.argLine>-Xmx512M</surefire.argLine> <surefire.argLine>-Xmx512M</surefire.argLine>
@ -60,6 +62,8 @@
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-leveldb-store</artifactId> <artifactId>activemq-leveldb-store</artifactId>
<version>${project.version}</version>
<classifier>uber</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>