From 9a15f5029ff0c01bbacaee5a5de5867beee9e9c6 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 23 Nov 2015 16:44:15 +0000
Subject: [PATCH] Update to forgerock-bom:2.1.1
---
opendj-sdk/opendj-sdk-parent/pom.xml | 9 ---------
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java | 5 +++--
opendj-sdk/pom.xml | 9 +++++++++
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java
index f94c182..14645c1 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2015 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.spi;
@@ -121,8 +121,9 @@
}
@Override
- public void thenOnRuntimeException(RuntimeExceptionHandler onRuntimeException) {
+ public LdapPromise<R> thenOnRuntimeException(RuntimeExceptionHandler onRuntimeException) {
wrappedPromise.thenOnRuntimeException(onRuntimeException);
+ return this;
}
@Override
diff --git a/opendj-sdk/opendj-sdk-parent/pom.xml b/opendj-sdk/opendj-sdk-parent/pom.xml
index 7f931c9..e085342 100644
--- a/opendj-sdk/opendj-sdk-parent/pom.xml
+++ b/opendj-sdk/opendj-sdk-parent/pom.xml
@@ -77,15 +77,6 @@
<dependencyManagement>
<dependencies>
- <!-- ForgeRock BOM -->
- <dependency>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>forgerock-bom</artifactId>
- <version>1.0.0</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
<!-- Commons -->
<dependency>
<groupId>org.forgerock</groupId>
diff --git a/opendj-sdk/pom.xml b/opendj-sdk/pom.xml
index 3f52558..cfa503b 100644
--- a/opendj-sdk/pom.xml
+++ b/opendj-sdk/pom.xml
@@ -163,6 +163,15 @@
<dependencyManagement>
<dependencies>
+ <!-- ForgeRock BOM -->
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>forgerock-bom</artifactId>
+ <version>2.1.1</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
<!-- I18N framework -->
<dependency>
<groupId>org.forgerock.commons</groupId>
--
Gitblit v1.10.0