From d8ed63bfe8ced8be6fb779674752a98d378e51e7 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 29 Jan 2014 13:45:55 +0000
Subject: [PATCH] ivy.xml: javax-servlet should still be specifically excluded for grizzly-http-servlet
---
opendj3-server-dev/ivy.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/opendj3-server-dev/ivy.xml b/opendj3-server-dev/ivy.xml
index 2e34a1f..17147e3 100644
--- a/opendj3-server-dev/ivy.xml
+++ b/opendj3-server-dev/ivy.xml
@@ -54,7 +54,9 @@
<dependency org="org.forgerock.opendj" name="opendj-slf4j-adapter" rev="&opendj.sdk.version;" />
<dependency org="org.forgerock.commons" name="i18n-slf4j" rev="&i18n.version;" />
<dependency org="org.forgerock.opendj" name="opendj-server2x-adapter" rev="&opendj.sdk.version;" />
- <dependency org="org.glassfish.grizzly" name="grizzly-http-servlet" rev="&grizzly.version;" />
+ <dependency org="org.glassfish.grizzly" name="grizzly-http-servlet" rev="&grizzly.version;">
+ <exclude module="javax.servlet-api" />
+ </dependency>
<!-- Test libs -->
<!--dependency org="org.testng" name="testng" rev="6.8.1" /-->
--
Gitblit v1.10.0