mirror of https://github.com/apache/activemq.git
Merge pull request #486 from jbonofre/AMQ-7431
[AMQ-7431] Fix webconsole deployment on Apache Karaf (due to ASM embedded)
This commit is contained in:
commit
0d65b218ba
|
@ -161,7 +161,8 @@
|
||||||
org.slf4j.spi;version="[1.6,2)";resolution:=optional,
|
org.slf4j.spi;version="[1.6,2)";resolution:=optional,
|
||||||
org.apache.log4j;version="[1.2.14,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.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>
|
</Import-Package>
|
||||||
</instructions>
|
</instructions>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -326,10 +327,10 @@
|
||||||
<artifactId>geronimo-annotation_1.0_spec</artifactId>
|
<artifactId>geronimo-annotation_1.0_spec</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.ow2.asm</groupId>
|
<groupId>org.ow2.asm</groupId>
|
||||||
<artifactId>asm</artifactId>
|
<artifactId>asm</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.osgi</groupId>
|
<groupId>org.osgi</groupId>
|
||||||
|
|
Loading…
Reference in New Issue