You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2011/11/24 00:58:07 UTC
svn commit: r1205672 - in /activemq/activemq-apollo/trunk:
apollo-distro/src/main/descriptors/common-bin.xml apollo-leveldb/pom.xml
pom.xml
Author: chirino
Date: Wed Nov 23 23:58:06 2011
New Revision: 1205672
URL: http://svn.apache.org/viewvc?rev=1205672&view=rev
Log:
Better packaging of the leveldb bits so that you can remove the levedbjni jars if they are not needed.
Modified:
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml
activemq/activemq-apollo/trunk/pom.xml
Modified: activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml?rev=1205672&r1=1205671&r2=1205672&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml Wed Nov 23 23:58:06 2011
@@ -31,8 +31,12 @@
<include>org.fusesource.hawtdispatch:*</include>
<include>org.codehaus.jackson:jackson-mapper-asl</include>
<include>org.codehaus.jackson:jackson-core-asl</include>
- <include>org.fusesource.leveldbjni:leveldbjni-all</include>
- <include>org.iq80.leveldb:leveldb</include>
+
+ <include>org.iq80.leveldb:*</include>
+ <include>com.google.guava:guava</include>
+
+ <include>org.fusesource.leveldbjni:*</include>
+ <include>org.fusesource.hawtjni:*</include>
<!-- security stuff -->
<include>org.jasypt:jasypt</include>
Modified: activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml?rev=1205672&r1=1205671&r2=1205672&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml Wed Nov 23 23:58:06 2011
@@ -43,15 +43,31 @@
</dependency>
<dependency>
- <groupId>org.fusesource.leveldbjni</groupId>
- <artifactId>leveldbjni-all</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <groupId>org.iq80.leveldb</groupId>
+ <artifactId>leveldb-api</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.fusesource.leveldbjni</groupId>
+ <artifactId>leveldbjni-osx</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.leveldbjni</groupId>
+ <artifactId>leveldbjni-linux32</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.leveldbjni</groupId>
+ <artifactId>leveldbjni-linux64</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+
<!-- Since we implement a jade template to display the LevelDB status -->
<dependency>
Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1205672&r1=1205671&r2=1205672&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Wed Nov 23 23:58:06 2011
@@ -107,7 +107,7 @@
<scalamd-version>1.5</scalamd-version>
<servlet-api-version>2.5</servlet-api-version>
- <jackson-version>1.6.1</jackson-version>
+ <jackson-version>1.7.5</jackson-version>
<logback-version>0.9.24</logback-version>
<jersey-version>1.5</jersey-version>
<snakeyaml-version>1.7</snakeyaml-version>