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 2020/03/01 16:41:12 UTC
[activemq] branch activemq-5.15.x updated: [AMQ-7431] Fix
webconsole deployment on Apache Karaf (due to ASM embedded)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
new 40aaee5 [AMQ-7431] Fix webconsole deployment on Apache Karaf (due to ASM embedded)
40aaee5 is described below
commit 40aaee5ee2158d51efe87d96c1fa1948d2bd6cb7
Author: jbonofre <jb...@apache.org>
AuthorDate: Sun Mar 1 16:38:33 2020 +0100
[AMQ-7431] Fix webconsole deployment on Apache Karaf (due to ASM embedded)
(cherry picked from commit 4864bcedf86e8db50ca7b159f82871210b4980cf)
---
activemq-web-console/pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 2789add..0e268b5 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -161,7 +161,8 @@
org.slf4j.spi;version="[1.6,2)";resolution:=optional,
org.apache.log4j;version="[1.2.14,2)";resolution:=optional,
org.apache.log4j.spi;version="[1.2.14,2)";resolution:=optional,
- org.eclipse.jetty*;resolution:=optional;version="[9.0,10)"
+ org.eclipse.jetty*;resolution:=optional;version="[9.0,10)",
+ org.objectweb.asm*;version="[6,8)"
</Import-Package>
</instructions>
</configuration>
@@ -325,11 +326,11 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
-
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>