diff options
| author | Jan Bartel | 2014-03-27 06:08:57 +0000 |
|---|---|---|
| committer | Jan Bartel | 2014-03-27 06:08:57 +0000 |
| commit | b198234d5b94972a0549528944b2a816dfcb1b7b (patch) | |
| tree | 0eb4d930dcf56dba51503c47fa4d26c09b92be3a | |
| parent | 2f6f21017499f9e6a2dfa1bda584ff440fee858d (diff) | |
| download | org.eclipse.jetty.project-b198234d5b94972a0549528944b2a816dfcb1b7b.tar.gz org.eclipse.jetty.project-b198234d5b94972a0549528944b2a816dfcb1b7b.tar.xz org.eclipse.jetty.project-b198234d5b94972a0549528944b2a816dfcb1b7b.zip | |
Ensure that jetty-annotations manifest uses 4.1 or above for asm, and that the jetty osgi spdy tests use only 4.1.
| -rw-r--r-- | jetty-annotations/pom.xml | 2 | ||||
| -rw-r--r-- | jetty-osgi/test-jetty-osgi/pom.xml | 32 |
2 files changed, 33 insertions, 1 deletions
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 23621354f3..26a1992557 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -43,7 +43,7 @@ </goals> <configuration> <instructions> - <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",*</Import-Package> + <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.objectweb.asm.*;version=4.1,*</Import-Package> <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)"</Require-Capability> </instructions> </configuration> diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index bf37dfbb54..b543553120 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -192,11 +192,43 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>4.1</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + <version>4.1</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + <version>4.1</version> + </dependency> + + <!-- Jetty Deps --> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-annotations</artifactId> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> |