Merge branch 'master' of https://github.com/OpenIdentityPlatform/OpenDJ.git

vharseko

11.21.2018 d5b0a03b710cf353995e8cbd941dabb46415ca4c

Merge branch 'master' of https://github.com/OpenIdentityPlatform/OpenDJ.git

 opendj-bom/pom.xml

@@ -26,7 +26,7 @@

    <groupId>org.forgerock.opendj</groupId>
    <artifactId>opendj-bom</artifactId>
    <version>4.1.5-SNAPSHOT</version>
    <version>4.1.6-SNAPSHOT</version>

    <packaging>pom</packaging>


 opendj-cli/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>4.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
    <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
    <version>4.1.6-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.1.5-SNAPSHOT</version>
    <version>4.1.6-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.1.5-SNAPSHOT</version>
    <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-msi</artifactId>
@@ -85,9 +85,9 @@
                <module>opendj-msi-standard</module>
            </modules>
            <properties>
                <exec.heat>${project.build.directory}/wix/heat.exe</exec.heat><param.heat></param.heat>
                <exec.candle>${project.build.directory}/wix/candle.exe</exec.candle><param.candle></param.candle>
                <exec.light>${project.build.directory}/wix/light.exe</exec.light><param.light></param.light>
                <exec.heat>${project.build.directory}/wix/heat.exe</exec.heat><param.heat />
                <exec.candle>${project.build.directory}/wix/candle.exe</exec.candle><param.candle />
                <exec.light>${project.build.directory}/wix/light.exe</exec.light><param.light />
            </properties>
        </profile>
    </profiles>

 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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-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.1.5-SNAPSHOT</version>
    <version>4.1.6-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.1.5-SNAPSHOT</version>
        <version>4.1.6-SNAPSHOT</version>
    </parent>
    
    <artifactId>opendj-rest2ldap</artifactId>

 opendj-server-example-plugin/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.forgerock.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.1.5-SNAPSHOT</version>
    <version>4.1.6-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.1.5-SNAPSHOT</version>
    <version>4.1.6-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.1.5-SNAPSHOT</version>
    <version>4.1.6-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-server</artifactId>
  <name>OpenDJ Server NG</name>

 pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-bom</artifactId>
        <version>4.1.5-SNAPSHOT</version>
        <version>4.1.6-SNAPSHOT</version>
        <relativePath>opendj-bom/pom.xml</relativePath>
    </parent>