You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2014/04/03 23:10:53 UTC
[1/2] git commit: https://issues.apache.org/jira/browse/AMQ-5131
Repository: activemq
Updated Branches:
refs/heads/trunk 10394734f -> 3adffc18e
https://issues.apache.org/jira/browse/AMQ-5131
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a7145785
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a7145785
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a7145785
Branch: refs/heads/trunk
Commit: a71457856d4fbe5c490afa281a624ddf95f39dcd
Parents: 1039473
Author: Timothy Bish <ta...@gmai.com>
Authored: Thu Apr 3 09:58:43 2014 -0400
Committer: Timothy Bish <ta...@gmai.com>
Committed: Thu Apr 3 09:58:43 2014 -0400
----------------------------------------------------------------------
activemq-osgi/pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/a7145785/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 4a917b0..eec1151 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -281,7 +281,8 @@
<Embed-Dependency>
*;
groupId=org.apache.activemq;inline=META-INF/services/*,
- <!--
+ groupId=org.apache.qpid;inline=META-INF/services/*,
+ <!--
groupId=org.fusesource.leveldbjni;inline=META-INF/native/*,
groupId=org.xerial.snappy;inline=org/xerial/snappy/*
-->
@@ -301,7 +302,7 @@
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>
+ </Bundle-NativeCode>
-->
</instructions>
</configuration>
[2/2] git commit: https://issues.apache.org/jira/browse/AMQ-5131
Posted by ta...@apache.org.
https://issues.apache.org/jira/browse/AMQ-5131
remove trailing comma.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3adffc18
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3adffc18
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3adffc18
Branch: refs/heads/trunk
Commit: 3adffc18e1d747a710eee5a0e648e74c2fc8bdc8
Parents: a714578
Author: Timothy Bish <ta...@gmai.com>
Authored: Thu Apr 3 10:03:04 2014 -0400
Committer: Timothy Bish <ta...@gmai.com>
Committed: Thu Apr 3 10:03:04 2014 -0400
----------------------------------------------------------------------
activemq-osgi/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/3adffc18/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index eec1151..d47bd1f 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -281,7 +281,7 @@
<Embed-Dependency>
*;
groupId=org.apache.activemq;inline=META-INF/services/*,
- groupId=org.apache.qpid;inline=META-INF/services/*,
+ groupId=org.apache.qpid;inline=META-INF/services/*
<!--
groupId=org.fusesource.leveldbjni;inline=META-INF/native/*,
groupId=org.xerial.snappy;inline=org/xerial/snappy/*