From 8965bcaaf6e374ea490db25b47f6b3ae547bfe0e Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 24 Nov 2015 23:50:05 +0000
Subject: [PATCH] OPENDJ-2385 / OPENDJ-2046 Upgrade Grizzly to 2.3.23
---
opendj-sdk/opendj-sdk-parent/pom.xml | 1 +
opendj-sdk/opendj-grizzly/pom.xml | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opendj-grizzly/pom.xml b/opendj-sdk/opendj-grizzly/pom.xml
index 11b6577..07c05b4 100644
--- a/opendj-sdk/opendj-grizzly/pom.xml
+++ b/opendj-sdk/opendj-grizzly/pom.xml
@@ -22,7 +22,7 @@
! CDDL HEADER END
!
! Copyright 2013-2015 ForgeRock AS
- !
+ !
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -41,8 +41,6 @@
<packaging>bundle</packaging>
<properties>
- <grizzly-framework.version>2.3.14</grizzly-framework.version>
-
<opendj.osgi.import.additional>
org.forgerock.opendj.*;provide:=true
</opendj.osgi.import.additional>
diff --git a/opendj-sdk/opendj-sdk-parent/pom.xml b/opendj-sdk/opendj-sdk-parent/pom.xml
index e085342..4b2b1de 100644
--- a/opendj-sdk/opendj-sdk-parent/pom.xml
+++ b/opendj-sdk/opendj-sdk-parent/pom.xml
@@ -60,6 +60,7 @@
<properties>
<forgerock-build-tools.version>1.0.2</forgerock-build-tools.version>
<forgerock-doc-plugin.version>3.1.0</forgerock-doc-plugin.version>
+ <grizzly-framework.version>2.3.23</grizzly-framework.version>
<!-- OSGi bundles properties -->
<opendj.osgi.import.additional />
--
Gitblit v1.10.0