mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Gaetan Boismal
23.44.2015 9a15f5029ff0c01bbacaee5a5de5867beee9e9c6
Update to forgerock-bom:2.1.1

Moves the forgerock-bom import from opendj-sdk-parent to opendj-sdk-bom.
Apply API changes since forgerock-bom-1.0.0
3 files modified
23 ■■■■ changed files
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java 5 ●●●●● patch | view | raw | blame | history
opendj-sdk/opendj-sdk-parent/pom.xml 9 ●●●●● patch | view | raw | blame | history
opendj-sdk/pom.xml 9 ●●●●● patch | view | raw | blame | history
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
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>
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>