Merge remote-tracking branch 'origin/master' into vharseko-master

vharseko

19.21.2018 33ebabfeaf6ac35ccfa1cf3106872f93cb7985a8

Merge remote-tracking branch 'origin/master' into vharseko-master

Conflicts:
	opendj-bom/pom.xml
	pom.xml

 README.md

@@ -55,6 +55,7 @@
```

## Support and Mailing List Information
* OpenDJ Community Wiki: https://github.com/OpenIdentityPlatform/OpenDJ/wiki
* OpenDJ Community Mailing List: open-identity-platform-opendj@googlegroups.com
* OpenDJ Community Archive: https://groups.google.com/d/forum/open-identity-platform-opendj
* OpenDJ Community on Gitter: https://gitter.im/OpenIdentityPlatform/OpenDJ

 opendj-cli/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-cli</artifactId>

 opendj-config/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.forgerock.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.2.4-SNAPSHOT</version>
    <version>4.2.5-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-config</artifactId>
  <name>OpenDJ Configuration API</name>

 opendj-core/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-core</artifactId>

 opendj-doc-generated-ref/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-doc-generated-ref</artifactId>

 opendj-doc-maven-plugin/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-doc-maven-plugin</artifactId>

 opendj-dsml-servlet/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-parent</artifactId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-dsml-servlet</artifactId>

 opendj-embedded-server-examples/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-embedded-server-examples</artifactId>

 opendj-grizzly/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-grizzly</artifactId>

 opendj-ldap-sdk-examples/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-ldap-sdk-examples</artifactId>

 opendj-ldap-toolkit/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-ldap-toolkit</artifactId>

 opendj-legacy/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.forgerock.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.2.4-SNAPSHOT</version>
    <version>4.2.5-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-legacy</artifactId>
  <name>OpenDJ Legacy</name>

 opendj-maven-plugin/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.forgerock.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.2.4-SNAPSHOT</version>
    <version>4.2.5-SNAPSHOT</version>
  </parent>

  <artifactId>opendj-maven-plugin</artifactId>

 opendj-openidm-account-change-notification-handler/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.forgerock.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.2.4-SNAPSHOT</version>
    <version>4.2.5-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-openidm-account-change-notification-handler</artifactId>
  <name>OpenDJ account change notification handler for OpenIDM</name>

 opendj-packages/opendj-deb/opendj-deb-standard/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-deb</artifactId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-deb-standard</artifactId>

 opendj-packages/opendj-deb/pom.xml

@@ -22,7 +22,7 @@
    <parent>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-packages</artifactId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <profiles>

 opendj-packages/opendj-docker/pom.xml

@@ -22,7 +22,7 @@
    <parent>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-packages</artifactId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <profiles>

 opendj-packages/opendj-msi/opendj-msi-standard/pom.xml

@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-msi</artifactId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-msi-standard</artifactId>

 opendj-packages/opendj-msi/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-packages</artifactId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-msi</artifactId>

 opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-rpm</artifactId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-rpm-standard</artifactId>

 opendj-packages/opendj-rpm/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-packages</artifactId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <packaging>pom</packaging>

 opendj-packages/opendj-svr4/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-packages</artifactId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-svr4</artifactId>

 opendj-packages/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-parent</artifactId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-packages</artifactId>

 opendj-rest2ldap-servlet/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.forgerock.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.2.4-SNAPSHOT</version>
    <version>4.2.5-SNAPSHOT</version>
  </parent>

  <artifactId>opendj-rest2ldap-servlet</artifactId>

 opendj-rest2ldap/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>4.2.4-SNAPSHOT</version>
        <version>4.2.5-SNAPSHOT</version>
    </parent>
    
    <artifactId>opendj-rest2ldap</artifactId>

 opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfiguratorTest.java

@@ -26,6 +26,7 @@
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.net.URISyntaxException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;
@@ -471,7 +472,11 @@
    }

    private static Path getPathToClass(Class<?> clazz) {
        return Paths.get(clazz.getProtectionDomain().getCodeSource().getLocation().getPath());
        try {
            return Paths.get(clazz.getProtectionDomain().getCodeSource().getLocation().toURI());
        } catch (URISyntaxException e) {
            throw new RuntimeException(e);
        }
    }

    private static Path getPathToMavenModule(String moduleName) {

 opendj-server-example-plugin/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.forgerock.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.2.4-SNAPSHOT</version>
    <version>4.2.5-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-server-example-plugin</artifactId>
  <name>OpenDJ Server Example Plugin</name>

 opendj-server-legacy/pom.xml

@@ -20,7 +20,7 @@
  <parent>
    <groupId>org.forgerock.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.2.4-SNAPSHOT</version>
    <version>4.2.5-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-server-legacy</artifactId>
  <packaging>jar</packaging>

 opendj-server/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.forgerock.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.2.4-SNAPSHOT</version>
    <version>4.2.5-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-server</artifactId>
  <name>OpenDJ Server NG</name>

 pom.xml

@@ -17,15 +17,9 @@
<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>

    <parent>
        <groupId>org.forgerock</groupId>
        <artifactId>forgerock-parent</artifactId>
        <version>2.0.6</version>
        <relativePath>../forgerock-parent</relativePath>
    </parent>
    <groupId>org.forgerock</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.2.4-SNAPSHOT</version>
    <version>4.2.5-SNAPSHOT</version>
    <packaging>pom</packaging>

    <name>OpenDJ Directory Services Project</name>