You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/05/16 16:08:36 UTC
[1/2] activemq-artemis git commit: This closes #518
Repository: activemq-artemis
Updated Branches:
refs/heads/master e04e99874 -> 5778609a8
This closes #518
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5778609a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5778609a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5778609a
Branch: refs/heads/master
Commit: 5778609a8d25251500ad4ea450d6c0a051ccad47
Parents: e04e998 84801b0
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon May 16 12:08:29 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon May 16 12:08:29 2016 -0400
----------------------------------------------------------------------
artemis-features/src/main/resources/features.xml | 2 +-
artemis-server-osgi/pom.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-521 - fix OSGi support
Posted by cl...@apache.org.
ARTEMIS-521 - fix OSGi support
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/84801b06
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/84801b06
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/84801b06
Branch: refs/heads/master
Commit: 84801b06f5082c064ea92c531e984132aa640ebb
Parents: e04e998
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Mon May 16 14:43:01 2016 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon May 16 12:08:29 2016 -0400
----------------------------------------------------------------------
artemis-features/src/main/resources/features.xml | 2 +-
artemis-server-osgi/pom.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/84801b06/artemis-features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index aa24a36..82d4cfc 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -48,7 +48,7 @@
<bundle>mvn:commons-beanutils/commons-beanutils/1.9.2</bundle>
<bundle>mvn:commons-collections/commons-collections/3.2.2</bundle>
- <bundle>mvn:org.jboss.logging/jboss-logging/3.1.4.GA</bundle>
+ <bundle>mvn:org.jboss.logging/jboss-logging/3.3.0.Final</bundle>
<bundle>mvn:org.jgroups/jgroups/3.6.0.Final</bundle>
<bundle>mvn:org.apache.activemq/artemis-native/${pom.version}</bundle>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/84801b06/artemis-server-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-server-osgi/pom.xml b/artemis-server-osgi/pom.xml
index 14b0036..2ab3fda 100644
--- a/artemis-server-osgi/pom.xml
+++ b/artemis-server-osgi/pom.xml
@@ -58,6 +58,11 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jdbc-store</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>artemis-journal</artifactId>
<version>${project.version}</version>
</dependency>