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:
Jean-Baptiste Onofré 2020-03-01 17:40:04 +01:00 committed by GitHub
commit 0d65b218ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions

View File

@ -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>
@ -325,11 +326,11 @@
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<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>