From e0eee7304d6402b896b756c5c024a884df482a59 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 30 Sep 2013 13:13:34 +0000
Subject: [PATCH] Fix OPENDJ-1131: Rest2LDAP fails to start with GlassFish3.1
---
opendj3/opendj-rest2ldap-servlet/pom.xml | 18 ++++++++++++++++++
opendj3/pom.xml | 2 +-
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/opendj3/opendj-rest2ldap-servlet/pom.xml b/opendj3/opendj-rest2ldap-servlet/pom.xml
index 9ef1f7d..0bc7004 100644
--- a/opendj3/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj3/opendj-rest2ldap-servlet/pom.xml
@@ -38,9 +38,20 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <!-- Required for compilation -->
<groupId>org.forgerock.commons</groupId>
<artifactId>json-resource-servlet</artifactId>
<version>${forgerockRestVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <!-- Required for runtime via WAR overlay -->
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>json-resource-servlet</artifactId>
+ <version>${forgerockRestVersion}</version>
+ <type>war</type>
+ <classifier>servlet</classifier>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -84,6 +95,13 @@
</goals>
<configuration>
<classifier>servlet</classifier>
+ <overlays>
+ <overlay>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>json-resource-servlet</artifactId>
+ <classifier>servlet</classifier>
+ </overlay>
+ </overlays>
</configuration>
</execution>
</executions>
diff --git a/opendj3/pom.xml b/opendj3/pom.xml
index 5b16fbf..051f0f4 100644
--- a/opendj3/pom.xml
+++ b/opendj3/pom.xml
@@ -106,7 +106,7 @@
<siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
<i18nFrameworkVersion>1.4.0</i18nFrameworkVersion>
<grizzlyFrameworkVersion>2.3.6</grizzlyFrameworkVersion>
- <forgerockRestVersion>2.0.1</forgerockRestVersion>
+ <forgerockRestVersion>2.1.0-SNAPSHOT</forgerockRestVersion>
<gaId>UA-23412190-8</gaId>
<!-- OSGi bundles properties -->
<opendj.osgi.import.additional />
--
Gitblit v1.10.0