You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2019/08/07 05:38:11 UTC
[activemq] branch master updated: [AMQ-7254] Fix OSGi headers
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/master by this push:
new 7e72fbc [AMQ-7254] Fix OSGi headers
new ef1c17c Merge pull request #381 from jbonofre/AMQ-7254
7e72fbc is described below
commit 7e72fbc98b483bcce19c56f52a2d407260113b23
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon Aug 5 08:34:32 2019 +0200
[AMQ-7254] Fix OSGi headers
---
activemq-client/pom.xml | 9 +++++++++
activemq-karaf/pom.xml | 9 +++++++--
activemq-osgi/pom.xml | 8 +++++++-
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index 0a6f8e1..f5e2bae 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -32,6 +32,15 @@
<properties>
<surefire.argLine>-Xmx512M</surefire.argLine>
+ <activemq.osgi.import.pkg>
+ !com.google.errorprone.annotations,
+ !com.google.errorprone.annotations.concurrent,
+ *
+ </activemq.osgi.import.pkg>
+ <activemq.osgi.private.pkg>
+ com.google.errorprone.annotations,
+ com.google.errorprone.annotations.concurrent
+ </activemq.osgi.private.pkg>
</properties>
<dependencies>
diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index 7277ea7..60d64ee 100644
--- a/activemq-karaf/pom.xml
+++ b/activemq-karaf/pom.xml
@@ -153,7 +153,7 @@
</artifact>
<artifact>
<file>target/classes/activemq.xml</file>
- <type>xml</type>
+ <type>xml</type>>
<classifier>activemq</classifier>
</artifact>
<artifact>
@@ -179,12 +179,17 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.activemq.karaf*;version=${project.version};-split-package:=merge-first</Export-Package>
<Import-Package>
+ !com.google.errorprone.annotations,
+ !com.google.errorprone.annotations.concurrent,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console;version="[2,4)",
org.apache.karaf.shell.console.commands;version="[2,4)",
*
</Import-Package>
- <Private-Package>!*</Private-Package>
+ <Private-Package>
+ com.google.errorprone.annotations,
+ com.google.errorprone.annotations.concurrent
+ </Private-Package>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index c7cdac6..9f8bd8a 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -36,6 +36,9 @@
!org.apache.maven*,
!com.google.thirdparty.publicsuffix,
!com.rometools*,
+ !com.google.errorprone.annotations,
+ !com.google.errorprone.annotations.concurrent,
+ !com.google.j2objc.annotations,
sun.misc*;resolution:=optional,
sun.nio*;resolution:=optional,
javax.jmdns*;resolution:=optional,
@@ -63,7 +66,7 @@
org.springframework*;version="[4,5)";resolution:=optional,
org.xmlpull*;resolution:=optional,
scala*;resolution:=optional,
- javax.annotation*,
+ javax.annotation*;version="[1,4)",
!com.thoughtworks.qdox*,
org.apache.commons.logging;version="[1.2,2)";resolution:=optional,
javax.jms*;version="[1.1,3)",
@@ -93,6 +96,9 @@
org.fusesource.hawtbuf*,
org.apache.qpid*,
com.google.common*,
+ com.google.errorprone.annotations,
+ com.google.errorprone.annotations.concurrent,
+ com.google.j2objc.annotations,
org.linkedin*,
org.iq80*
</activemq.osgi.private.pkg>