You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2013/06/21 13:31:24 UTC
svn commit: r1495392 - in /activemq/trunk:
activemq-karaf/src/main/resources/features.xml
activemq-leveldb-store/pom.xml activemq-osgi/pom.xml pom.xml
Author: dejanb
Date: Fri Jun 21 11:31:23 2013
New Revision: 1495392
URL: http://svn.apache.org/r1495392
Log:
https://issues.apache.org/jira/browse/AMQ-4593 - upgrade snappy java
Modified:
activemq/trunk/activemq-karaf/src/main/resources/features.xml
activemq/trunk/activemq-leveldb-store/pom.xml
activemq/trunk/activemq-osgi/pom.xml
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1495392&r1=1495391&r2=1495392&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Fri Jun 21 11:31:23 2013
@@ -49,7 +49,6 @@
<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.xstream/${xstream-bundle-version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snappy-java/${snappy-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>
<bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries-version}</bundle>
Modified: activemq/trunk/activemq-leveldb-store/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/pom.xml?rev=1495392&r1=1495391&r2=1495392&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb-store/pom.xml (original)
+++ activemq/trunk/activemq-leveldb-store/pom.xml Fri Jun 21 11:31:23 2013
@@ -145,7 +145,7 @@
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
- <version>1.0.3</version>
+ <version>${snappy-version}</version>
</dependency>
<dependency>
<groupId>org.iq80.snappy</groupId>
Modified: activemq/trunk/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-osgi/pom.xml?rev=1495392&r1=1495391&r2=1495392&view=diff
==============================================================================
--- activemq/trunk/activemq-osgi/pom.xml (original)
+++ activemq/trunk/activemq-osgi/pom.xml Fri Jun 21 11:31:23 2013
@@ -280,11 +280,12 @@
META-INF/native/osx/libleveldbjni.jnilib;osname=macosx,
META-INF/native/linux32/libleveldbjni.so;osname=Linux;processor=x86,
META-INF/native/linux64/libleveldbjni.so;osname=Linux;processor=x86-64,
- org/xerial/snappy/native/Linux/i386/libsnappyjava.so;osname=Linux;processor=x86,
- org/xerial/snappy/native/Mac/i386/libsnappyjava.jnilib;osname=macosx;processor=x86,
+ org/xerial/snappy/native/Windows/amd64/snappyjava.dll;osname=win32;processor=x86-64,
+ org/xerial/snappy/native/Windows/x86/snappyjava.dll;osname=win32;processor=x86,
org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib;osname=macosx;processor=x86-64,
- org/xerial/snappy/native/Windows/amd64/snappyjava.dll;osname=Win32;processor=x86-64,
- org/xerial/snappy/native/Windows/x86/snappyjava.dll;osname=Win32;processor=x86,
+ org/xerial/snappy/native/Linux/amd64/libsnappyjava.so;osname=linux;processor=x86-64,
+ org/xerial/snappy/native/Linux/i386/libsnappyjava.so;osname=linux;processor=x86,
+ org/xerial/snappy/native/Linux/arm/libsnappyjava.so;osname=linux;processor=arm,
*
</Bundle-NativeCode>
</instructions>
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1495392&r1=1495391&r2=1495392&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Jun 21 11:31:23 2013
@@ -107,7 +107,7 @@
<scala-bundle-version>2.9.1_3</scala-bundle-version>
<scalatest-version>1.8</scalatest-version>
<slf4j-version>1.6.6</slf4j-version>
- <snappy-bundle-version>1.0.4.1_1</snappy-bundle-version>
+ <snappy-version>1.1.0-M3</snappy-version>
<spring-version>3.1.3.RELEASE</spring-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-oxm-version>1.5.10</spring-oxm-version>