activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject activemq-artemis git commit: [ARTEMIS-1141] Fix some OSGi metadata issues
Date Fri, 05 May 2017 06:23:47 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 955bba7ed -> f46fa8b92


[ARTEMIS-1141] Fix some OSGi metadata 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/f46fa8b9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f46fa8b9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f46fa8b9

Branch: refs/heads/master
Commit: f46fa8b927a6e0d618744322fad57c544a323200
Parents: 955bba7
Author: Guillaume Nodet <gnodet@apache.org>
Authored: Fri May 5 08:18:25 2017 +0200
Committer: Guillaume Nodet <gnodet@apache.org>
Committed: Fri May 5 08:18:39 2017 +0200

----------------------------------------------------------------------
 artemis-features/src/main/resources/features.xml | 5 ++---
 artemis-server-osgi/pom.xml                      | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f46fa8b9/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 c6f4b42..b547140 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -62,10 +62,9 @@
 	</feature>
 
 	<feature name="artemis-amqp" version="${pom.version}" description="ActiveMQ Artemis AMQP
protocol libraries">
-		<feature prerequisite="true">wrap</feature>
 		<feature>artemis-core</feature>
-		<bundle dependency="true">wrap:mvn:org.apache.qpid/proton-j/${proton.version}</bundle>
-		<bundle dependency="true">wrap:mvn:org.apache.qpid/qpid-jms-client/${qpid.jms.version}</bundle>
+		<bundle>mvn:org.apache.qpid/proton-j/${proton.version}</bundle>
+		<bundle>mvn:org.apache.qpid/qpid-jms-client/${qpid.jms.version}</bundle>
 		<bundle>mvn:org.apache.activemq/artemis-amqp-protocol/${pom.version}</bundle>
 	</feature>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f46fa8b9/artemis-server-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-server-osgi/pom.xml b/artemis-server-osgi/pom.xml
index 832702c..c34c8b2 100644
--- a/artemis-server-osgi/pom.xml
+++ b/artemis-server-osgi/pom.xml
@@ -119,18 +119,17 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
-            <version>3.0.0</version>
+            <version>3.3.0</version>
             <extensions>true</extensions>
             <configuration>
                <instructions>
                   <Embed-Dependency>*;scope=compile|runtime;groupId=org.apache.activemq</Embed-Dependency>
                   <Import-Package>
-                     !org.apache.activemq.artemis.*,
                      org.postgresql*;resolution:=optional,
-                     io.netty.*;version="[4.1,5)",
+                     io.netty.buffer;io.netty.*;version="[4.1,5)",
                      *
                   </Import-Package>
-                  <_exportcontents>org.apache.activemq.artemis.*</_exportcontents>
+                  <_exportcontents>org.apache.activemq.artemis.*;-noimport:=true</_exportcontents>
                </instructions>
             </configuration>
          </plugin>


Mime
View raw message