You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2022/03/09 20:35:00 UTC
[activemq] branch main updated: [AMQ-8533] Fix maven-bundle-plugin instructions to avoid shading all packages
This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 9ba7aab [AMQ-8533] Fix maven-bundle-plugin instructions to avoid shading all packages
new 5f9a516 Merge pull request #799 from jbonofre/AMQ-8533
9ba7aab is described below
commit 9ba7aab24dea5feefcb474374fb02e0dd50e9a83
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Wed Mar 9 20:51:56 2022 +0100
[AMQ-8533] Fix maven-bundle-plugin instructions to avoid shading all packages
---
activemq-client/pom.xml | 1 -
activemq-jms-pool/pom.xml | 2 +-
activemq-osgi/pom.xml | 2 +-
activemq-pool/pom.xml | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index 56ba23f..d754e15 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -199,7 +199,6 @@
<inherited>true</inherited>
<configuration>
<instructions>
- <Export-Package>*</Export-Package>
<Import-Package>
!com.google.errorprone.annotations,
!com.google.errorprone.annotations.concurrent,
diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml
index d685316..4233842 100644
--- a/activemq-jms-pool/pom.xml
+++ b/activemq-jms-pool/pom.xml
@@ -109,7 +109,7 @@
<inherited>true</inherited>
<configuration>
<instructions>
- <Export-Package>*</Export-Package>
+ <Export-Package>org.apache.activemq.jms.pool*;version=${project.version};-noimport:=true</Export-Package>
<Import-Package>
javax.jms*;version="[1.1,3)",
javax.transaction*;resolution:=optional,
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index dfdd7cd..3552cfd 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -213,7 +213,7 @@
org.apache.tools.ant*;resolution:=optional,
org.apache.log4j*;resolution:=optional,
org.json*;resolution:=optional,
- org.objectweb.asm;version="[5,8)";resolution:=optional,
+ org.objectweb.asm;version="[5,10)";resolution:=optional,
mx4j.tools*;resolution:=optional,
org.slf4j*;resolution:=optional,
org.osgi.service.blueprint;resolution:=optional,
diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
index f1512f1..3fe683b 100644
--- a/activemq-pool/pom.xml
+++ b/activemq-pool/pom.xml
@@ -131,7 +131,7 @@
<inherited>true</inherited>
<configuration>
<instructions>
- <Export-Package>*</Export-Package>
+ <Export-Package>org.apache.activemq.pool*;version=${project.version};-noimport:=true</Export-Package>
<Import-Package>
javax.transaction*;resolution:=optional,
org.apache.activemq.jms.pool*;resolution:=optional,