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/11/19 22:14:38 UTC
[1/2] activemq-artemis git commit: ARTEMIS-860 add artemis-openwire
protocol to osgi feature and fix bundle issues
Repository: activemq-artemis
Updated Branches:
refs/heads/master a3bd2c9c7 -> 135f00e99
ARTEMIS-860 add artemis-openwire protocol to osgi feature and fix bundle issues
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/fd122664
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fd122664
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fd122664
Branch: refs/heads/master
Commit: fd122664494020e8bb6f006a2045d4d20de5a2b0
Parents: a3bd2c9
Author: Ryan Yeats <ry...@gmail.com>
Authored: Fri Nov 18 13:43:24 2016 -0700
Committer: Ryan Yeats <ry...@gmail.com>
Committed: Sat Nov 19 08:55:58 2016 -0700
----------------------------------------------------------------------
.../src/main/resources/features.xml | 8 +++++++
.../artemis-openwire-protocol/pom.xml | 23 ++++++++++++++++++++
2 files changed, 31 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fd122664/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 b331369..2579332 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -25,6 +25,7 @@
<feature>artemis-stomp</feature>
<feature>artemis-mqtt</feature>
<feature>artemis-hornetq</feature>
+ <feature>artemis-openwire</feature>
</feature>
<feature name="netty-core" version="${netty.version}" description="Netty libraries">
@@ -84,4 +85,11 @@
<bundle>mvn:org.apache.activemq/artemis-hornetq-protocol/${pom.version}</bundle>
</feature>
+ <feature name="artemis-openwire" version="${pom.version}" description="ActiveMQ Artemis HornetQ protocol libraries">
+ <feature>artemis-core</feature>
+ <bundle>mvn:org.fusesource.hawtbuf/hawtbuf/1.11</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
+ <bundle>mvn:org.apache.activemq/artemis-openwire-protocol/${pom.version}</bundle>
+ </feature>
+
</features>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fd122664/artemis-protocols/artemis-openwire-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/pom.xml b/artemis-protocols/artemis-openwire-protocol/pom.xml
index 2aece8d..2bd25cb 100644
--- a/artemis-protocols/artemis-openwire-protocol/pom.xml
+++ b/artemis-protocols/artemis-openwire-protocol/pom.xml
@@ -65,4 +65,27 @@
</dependencies>
<packaging>bundle</packaging>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>activemq-client</Embed-Dependency>
+ <Import-Package>
+ !org.apache.commons.net.ftp,
+ !javax.jmdns,
+ javax.jms;version="[2,3)",
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
[2/2] activemq-artemis git commit: This closes #892
Posted by cl...@apache.org.
This closes #892
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/135f00e9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/135f00e9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/135f00e9
Branch: refs/heads/master
Commit: 135f00e99ce4faab2c3fb8e53d7fb3ed3445fc6c
Parents: a3bd2c9 fd12266
Author: Clebert Suconic <cl...@apache.org>
Authored: Sat Nov 19 17:05:39 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Sat Nov 19 17:05:39 2016 -0500
----------------------------------------------------------------------
.../src/main/resources/features.xml | 8 +++++++
.../artemis-openwire-protocol/pom.xml | 23 ++++++++++++++++++++
2 files changed, 31 insertions(+)
----------------------------------------------------------------------