From 8924ea8722840394bc6a48ae210f22a41a5262d0 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 21 Jun 2013 15:25:23 +0000
Subject: [PATCH] Follow up fix for OPENDJ-961: Release OpenDJ SDK 2.6.0
---
opends/pom-maven.xml | 7 ++++---
opends/ivy.xml | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opends/ivy.xml b/opends/ivy.xml
index d2bb800..a93c69d 100644
--- a/opends/ivy.xml
+++ b/opends/ivy.xml
@@ -27,9 +27,9 @@
! -->
<!-- Using entities prevent constantly declaring the same versions -->
<!DOCTYPE ivy-module [
- <!ENTITY grizzly.version "2.3">
- <!ENTITY opendj.sdk.version "2.5.0-SNAPSHOT">
- <!ENTITY crest.version "2.0.0-SNAPSHOT">
+ <!ENTITY grizzly.version "2.3.3">
+ <!ENTITY opendj.sdk.version "2.6.0">
+ <!ENTITY crest.version "2.0.0">
]>
<ivy-module version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/opends/pom-maven.xml b/opends/pom-maven.xml
index 463dedc..dc9dbd2 100644
--- a/opends/pom-maven.xml
+++ b/opends/pom-maven.xml
@@ -32,9 +32,10 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-project</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>opendj-server</artifactId>
+ <version>2.5.0-SNAPSHOT</version>
<name>OpenDJ Directory Server</name>
<description>
OpenDJ is a new LDAPv3 compliant directory service, developed for the Java
@@ -114,12 +115,12 @@
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-rest2ldap-servlet</artifactId>
- <version>${project.version}</version>
+ <version>${parent.version}</version>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-server2x-adapter</artifactId>
- <version>${project.version}</version>
+ <version>${parent.version}</version>
<!--exclude module="opendj-server"/-->
</dependency>
<dependency>
--
Gitblit v1.10.0