Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-7254] Fix OSGi headers

This commit is contained in:
Jean-Baptiste Onofré 2019-08-05 08:34:32 +02:00
parent 09003e8fef
commit 7e72fbc98b
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
activemq-client/pom.xml
View File

@ -32,6 +32,15 @@
<properties> <properties>
<surefire.argLine>-Xmx512M</surefire.argLine> <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> </properties>
<dependencies> <dependencies>

9
activemq-karaf/pom.xml
View File

@ -153,7 +153,7 @@
</artifact> </artifact>
<artifact> <artifact>
<file>target/classes/activemq.xml</file> <file>target/classes/activemq.xml</file>
<type>xml</type> <type>xml</type>>
<classifier>activemq</classifier> <classifier>activemq</classifier>
</artifact> </artifact>
<artifact> <artifact>
@ -179,12 +179,17 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.activemq.karaf*;version=${project.version};-split-package:=merge-first</Export-Package> <Export-Package>org.apache.activemq.karaf*;version=${project.version};-split-package:=merge-first</Export-Package>
<Import-Package> <Import-Package>
!com.google.errorprone.annotations,
!com.google.errorprone.annotations.concurrent,
org.apache.felix.gogo.commands, org.apache.felix.gogo.commands,
org.apache.karaf.shell.console;version="[2,4)", org.apache.karaf.shell.console;version="[2,4)",
org.apache.karaf.shell.console.commands;version="[2,4)", org.apache.karaf.shell.console.commands;version="[2,4)",
* *
</Import-Package> </Import-Package>
<Private-Package>!*</Private-Package> <Private-Package>
com.google.errorprone.annotations,
com.google.errorprone.annotations.concurrent
</Private-Package>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy> <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<Embed-Transitive>true</Embed-Transitive> <Embed-Transitive>true</Embed-Transitive>
</instructions> </instructions>

8
activemq-osgi/pom.xml
View File

@ -36,6 +36,9 @@
!org.apache.maven*, !org.apache.maven*,
!com.google.thirdparty.publicsuffix, !com.google.thirdparty.publicsuffix,
!com.rometools*, !com.rometools*,
!com.google.errorprone.annotations,
!com.google.errorprone.annotations.concurrent,
!com.google.j2objc.annotations,
sun.misc*;resolution:=optional, sun.misc*;resolution:=optional,
sun.nio*;resolution:=optional, sun.nio*;resolution:=optional,
javax.jmdns*;resolution:=optional, javax.jmdns*;resolution:=optional,
@ -63,7 +66,7 @@
org.springframework*;version="[4,5)";resolution:=optional, org.springframework*;version="[4,5)";resolution:=optional,
org.xmlpull*;resolution:=optional, org.xmlpull*;resolution:=optional,
scala*;resolution:=optional, scala*;resolution:=optional,
javax.annotation*, javax.annotation*;version="[1,4)",
!com.thoughtworks.qdox*, !com.thoughtworks.qdox*,
org.apache.commons.logging;version="[1.2,2)";resolution:=optional, org.apache.commons.logging;version="[1.2,2)";resolution:=optional,
javax.jms*;version="[1.1,3)", javax.jms*;version="[1.1,3)",
@ -93,6 +96,9 @@
org.fusesource.hawtbuf*, org.fusesource.hawtbuf*,
org.apache.qpid*, org.apache.qpid*,
com.google.common*, com.google.common*,
com.google.errorprone.annotations,
com.google.errorprone.annotations.concurrent,
com.google.j2objc.annotations,
org.linkedin*, org.linkedin*,
org.iq80* org.iq80*
</activemq.osgi.private.pkg> </activemq.osgi.private.pkg>