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

Gaetan Boismal
23.39.2015 7fbc83f6a1cc2326bc6922390b24d15a52f96e5d
OPENDJ-2089 Code cleanup
10 files modified
308 ■■■■ changed files
opendj-sdk/opendj-cli/pom.xml 23 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj-copyright-maven-plugin/pom.xml 29 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj-core/pom.xml 37 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj-doc-maven-plugin/pom.xml 14 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj-grizzly/pom.xml 29 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj-ldap-sdk-examples/pom.xml 15 ●●●●● patch | view | raw | blame | history
opendj-sdk/opendj-ldap-toolkit/pom.xml 38 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj-ldap-toolkit/src/main/assembly/descriptor.xml 8 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj-rest2ldap/pom.xml 30 ●●●● patch | view | raw | blame | history
opendj-sdk/pom.xml 85 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj-cli/pom.xml
@@ -24,8 +24,11 @@
  !      Copyright 2014-2015 ForgeRock AS.
  !    
-->
<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">
<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>
    <artifactId>opendj-sdk</artifactId>
    <groupId>org.forgerock.opendj</groupId>
@@ -33,16 +36,17 @@
  </parent>
  <artifactId>opendj-cli</artifactId>
  <name>OpenDJ CLI API</name>
  <description>
    This module includes CLI API for implementing CLI applications.
  </description>
    <description>This module includes CLI API for implementing CLI applications.</description>
  <packaging>bundle</packaging>
  <dependencies>
     <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-core</artifactId>
      <version>${project.version}</version>
    </dependency>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-core</artifactId>
@@ -50,16 +54,19 @@
      <version>${project.version}</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.forgerock.commons</groupId>
      <artifactId>i18n-core</artifactId>
    </dependency>
    <dependency>
      <groupId>org.forgerock</groupId>
      <artifactId>forgerock-build-tools</artifactId>
      <version>${forgerockBuildToolsVersion}</version>
            <version>${forgerock-build-tools.version}</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.freemarker</groupId>
      <artifactId>freemarker</artifactId>
@@ -68,12 +75,14 @@
    </dependency>
  </dependencies>
  <properties>
    <opendj.osgi.import.additional>
      org.forgerock.opendj.*;provide:=true
    </opendj.osgi.import.additional>
  </properties>
  <build>
    <plugins>
    <plugin>
@@ -93,10 +102,12 @@
          </execution>
        </executions>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
      </plugin>
      <plugin>
        <groupId>org.codehaus.mojo</groupId>
        <artifactId>cobertura-maven-plugin</artifactId>
@@ -115,6 +126,7 @@
    </plugins>
  </build>
  <reporting>
    <plugins>
      <plugin>
@@ -132,6 +144,7 @@
          </reportSet>
        </reportSets>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-javadoc-plugin</artifactId>
opendj-sdk/opendj-copyright-maven-plugin/pom.xml
@@ -24,8 +24,11 @@
 !      Copyright 2015 ForgeRock AS.
 !
 -->
<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">
<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>
        <artifactId>opendj-sdk</artifactId>
        <groupId>org.forgerock.opendj</groupId>
@@ -35,45 +38,44 @@
    <artifactId>opendj-copyright-maven-plugin</artifactId>
    <version>3.0.0-SNAPSHOT</version>
    <name>OpenDJ Copyright Check Maven Plugin</name>
    <description>
    Checks ForgeRock source file copyrights.
  </description>
    <description>Checks ForgeRock source file copyrights.</description>
    <packaging>maven-plugin</packaging>
    <properties>
        <forgerockBuildToolsVersion>1.0.2</forgerockBuildToolsVersion>
        <mavenVersion>3.2.3</mavenVersion>
        <plexusUtilsVersion>3.0.17</plexusUtilsVersion>
        <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
        <maven.version>3.2.3</maven.version>
        <maven-plugin-plugin.version>3.2</maven-plugin-plugin.version>
    </properties>
    <dependencies>
        <!-- Maven -->
        <dependency>
            <groupId>org.apache.maven</groupId>
            <artifactId>maven-core</artifactId>
            <version>${mavenVersion}</version>
            <version>${maven.version}</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.maven</groupId>
            <artifactId>maven-model</artifactId>
            <version>${mavenVersion}</version>
            <version>${maven.version}</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.maven</groupId>
            <artifactId>maven-plugin-api</artifactId>
            <version>${mavenVersion}</version>
            <version>${maven.version}</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.maven.plugin-tools</groupId>
            <artifactId>maven-plugin-annotations</artifactId>
            <version>${mavenPluginPluginVersion}</version>
            <version>${maven-plugin-plugin.version}</version>
            <scope>provided</scope>
        </dependency>
@@ -81,12 +83,11 @@
        <dependency>
            <groupId>org.forgerock</groupId>
            <artifactId>forgerock-build-tools</artifactId>
            <version>${forgerockBuildToolsVersion}</version>
            <version>${forgerock-build-tools.version}</version>
            <scope>test</scope>
        </dependency>
        <!-- Other -->
        <dependency>
            <groupId>org.twdata.maven</groupId>
            <artifactId>mojo-executor</artifactId>
opendj-sdk/opendj-core/pom.xml
@@ -24,13 +24,17 @@
  !      Copyright 2011-2015 ForgeRock AS
  !    
-->
<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">
<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>
    <artifactId>opendj-sdk</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-core</artifactId>
  <name>OpenDJ Core APIs</name>
  <description>
@@ -38,36 +42,46 @@
    client and server applications. Unlike the SDK this module does not
    include a default network transport which must be obtained separately.
  </description>
  <packaging>bundle</packaging>
  <dependencies>
    <dependency>
      <groupId>org.forgerock.commons</groupId>
      <artifactId>i18n-core</artifactId>
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-api</artifactId>
    </dependency>
    <dependency>
      <groupId>org.forgerock.commons</groupId>
      <artifactId>forgerock-util</artifactId>
    </dependency>
    <dependency>
      <groupId>org.forgerock.commons</groupId>
      <artifactId>i18n-slf4j</artifactId>
    </dependency>
    <dependency>
      <groupId>org.forgerock</groupId>
      <artifactId>forgerock-build-tools</artifactId>
      <version>${forgerockBuildToolsVersion}</version>
            <version>${forgerock-build-tools.version}</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <properties>
    <opendj.osgi.import.additional>
      com.sun.security.auth*;resolution:=optional
    </opendj.osgi.import.additional>
  </properties>
  <build>
    <plugins>
      <plugin>
@@ -108,10 +122,12 @@
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-source-plugin</artifactId>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
@@ -126,15 +142,18 @@
    </plugins>
  </build>
  <profiles>
    <profile>
      <!-- This profile provides API/ABI compatiblity checks and reports via Clirr -->
      <id>clirr</id>
      <activation>
        <file>
          <exists>clirr-ignored-api-changes.xml</exists><!-- this file name is duplicated due to MNG-4471 -->
                    <exists>clirr-ignored-api-changes.xml</exists>
                    <!-- this file name is duplicated due to MNG-4471 -->
        </file>
      </activation>
      <build>
        <plugins>
          <plugin>
@@ -146,7 +165,8 @@
              <comparisonArtifacts>
                <comparisonArtifact>
                  <groupId>${project.groupId}</groupId>
                  <artifactId>opendj-ldap-sdk</artifactId><!-- former name of this jar -->
                                    <artifactId>opendj-ldap-sdk</artifactId>
                                    <!-- former name of this jar -->
                  <version>2.6.0</version>
                </comparisonArtifact>
              </comparisonArtifacts>
@@ -155,10 +175,12 @@
              </excludes>
              <ignoredDifferencesFile>clirr-ignored-api-changes.xml</ignoredDifferencesFile>
            </configuration>
            <executions>
              <execution>
                <id>mvn clirr:check</id>
              </execution>
              <execution>
                <id>mvn verify</id>
                <goals>
@@ -169,6 +191,7 @@
          </plugin>
        </plugins>
      </build>
      <reporting>
        <plugins>
          <plugin>
@@ -180,7 +203,8 @@
              <comparisonArtifacts>
                <comparisonArtifact>
                  <groupId>${project.groupId}</groupId>
                  <artifactId>opendj-ldap-sdk</artifactId><!-- former name of this jar -->
                                    <artifactId>opendj-ldap-sdk</artifactId>
                                    <!-- former name of this jar -->
                  <version>2.6.0</version>
                </comparisonArtifact>
              </comparisonArtifacts>
@@ -232,6 +256,7 @@
                  <title>${project.name} Packages</title>
                  <packages>${project.groupId}*</packages>
                </group>
                <group>
                  <title>ForgeRock Common Packages</title>
                  <packages>*</packages>
@@ -254,6 +279,7 @@
    </profile>
  </profiles>
  <reporting>
    <plugins>
      <plugin>
@@ -267,6 +293,7 @@
          </reportSet>
        </reportSets>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-javadoc-plugin</artifactId>
opendj-sdk/opendj-doc-maven-plugin/pom.xml
@@ -24,7 +24,9 @@
  !      Copyright 2015 ForgeRock AS.
  !
-->
<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">
<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>
@@ -37,9 +39,7 @@
  <packaging>maven-plugin</packaging>
  <name>OpenDJ Doc Helper Maven Plugin</name>
  <description>
   Helps to build generated documentation sources.
  </description>
    <description>Helps to build generated documentation sources.</description>
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,25 +51,30 @@
      <artifactId>opendj-core</artifactId>
      <version>${project.version}</version>
    </dependency>
    <dependency>
      <groupId>org.forgerock.commons</groupId>
      <artifactId>i18n-core</artifactId>
    </dependency>
    <dependency>
      <groupId>org.freemarker</groupId>
      <artifactId>freemarker</artifactId>
      <version>2.3.21</version>
    </dependency>
    <dependency>
      <groupId>org.twdata.maven</groupId>
      <artifactId>mojo-executor</artifactId>
      <version>2.2.0</version>
    </dependency>
    <dependency>
      <groupId>com.thoughtworks.qdox</groupId>
      <artifactId>qdox</artifactId>
      <version>2.0-M3</version>
    </dependency>
    <dependency>
      <groupId>org.apache.maven.plugin-tools</groupId>
      <artifactId>maven-plugin-annotations</artifactId>
@@ -78,6 +83,7 @@
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
opendj-sdk/opendj-grizzly/pom.xml
@@ -24,25 +24,30 @@
  !      Copyright 2013-2015 ForgeRock AS
  !    
-->
<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">
<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>
    <artifactId>opendj-sdk</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-grizzly</artifactId>
  <name>OpenDJ Grizzly Transport Provider</name>
  <description>
    This module includes a Grizzly based network transport provider for OpenDJ.
  </description>
    <description>This module includes a Grizzly based network transport provider for OpenDJ.</description>
  <packaging>bundle</packaging>
  <dependencies>
     <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-core</artifactId>
      <version>${project.version}</version>
    </dependency>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-core</artifactId>
@@ -50,33 +55,39 @@
      <version>${project.version}</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.forgerock.commons</groupId>
      <artifactId>i18n-core</artifactId>
    </dependency>
    <dependency>
      <groupId>org.glassfish.grizzly</groupId>
      <artifactId>grizzly-framework</artifactId>
      <version>${grizzlyFrameworkVersion}</version>
            <version>${grizzly-framework.version}</version>
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-api</artifactId>
    </dependency>
    <dependency>
      <groupId>org.forgerock</groupId>
      <artifactId>forgerock-build-tools</artifactId>
      <version>${forgerockBuildToolsVersion}</version>
            <version>${forgerock-build-tools.version}</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <properties>
    <opendj.osgi.import.additional>
      org.forgerock.opendj.*;provide:=true
    </opendj.osgi.import.additional>
  </properties>
  <build>
    <plugins>
      <plugin>
@@ -96,6 +107,7 @@
          </execution>
        </executions>
      </plugin>
      <plugin>
        <groupId>org.apache.felix</groupId>
        <artifactId>maven-bundle-plugin</artifactId>
@@ -108,16 +120,20 @@
          </instructions>
        </configuration>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-source-plugin</artifactId>
      </plugin>
    </plugins>
  </build>
  <reporting>
    <plugins>
      <plugin>
@@ -131,6 +147,7 @@
          </reportSet>
        </reportSets>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-javadoc-plugin</artifactId>
opendj-sdk/opendj-ldap-sdk-examples/pom.xml
@@ -24,32 +24,41 @@
  !      Copyright 2011-2015 ForgeRock AS.
  !    
-->
<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">
<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>
    <artifactId>opendj-sdk</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-ldap-sdk-examples</artifactId>
  <name>OpenDJ SDK Examples</name>
  <description>Examples illustrating usage of the OpenDJ LDAP SDK</description>
  <dependencies>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-core</artifactId>
      <version>${project.version}</version>
    </dependency>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-grizzly</artifactId>
      <version>${project.version}</version>
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-jdk14</artifactId>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
@@ -67,12 +76,15 @@
          </execution>
        </executions>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-source-plugin</artifactId>
      </plugin>
    </plugins>
  </build>
  <reporting>
    <plugins>
      <plugin>
@@ -84,6 +96,7 @@
          </links>
        </configuration>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jxr-plugin</artifactId>
opendj-sdk/opendj-ldap-toolkit/pom.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<!--
 ! CDDL HEADER START
 !
@@ -24,47 +24,57 @@
 !      Copyright 2011-2015 ForgeRock AS.
 !    
 -->
<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">
<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>
    <artifactId>opendj-sdk</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-ldap-toolkit</artifactId>
  <name>OpenDJ SDK Toolkit</name>
  <description>
    This module includes LDAP command line tools based on the OpenDJ LDAP SDK.
  </description>
    <description>This module includes LDAP command line tools based on the OpenDJ LDAP SDK.</description>
  <packaging>jar</packaging>
  <dependencies>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-core</artifactId>
      <version>${project.version}</version>
    </dependency>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-grizzly</artifactId>
      <version>${project.version}</version>
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-api</artifactId>
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-jdk14</artifactId>
    </dependency>
    <dependency>
      <groupId>org.forgerock.commons</groupId>
      <artifactId>i18n-core</artifactId>
    </dependency>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-cli</artifactId>
      <version>${project.version}</version>
    </dependency>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-core</artifactId>
@@ -72,13 +82,16 @@
      <type>test-jar</type>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.forgerock</groupId>
      <artifactId>forgerock-build-tools</artifactId>
      <version>${forgerockBuildToolsVersion}</version>
            <version>${forgerock-build-tools.version}</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <build>
    <plugins>
      <plugin>
@@ -98,6 +111,7 @@
          </execution>
        </executions>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
@@ -109,10 +123,12 @@
          </archive>
        </configuration>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-assembly-plugin</artifactId>
@@ -132,6 +148,7 @@
          </execution>
        </executions>
      </plugin>
      <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-failsafe-plugin</artifactId>
@@ -146,6 +163,8 @@
     </plugin>
    </plugins>
  </build>
  <profiles>
    <profile>
      <id>docs</id>
@@ -204,11 +223,13 @@
                    <tool>
                      <name>ldappasswordmodify</name>
                      <application>com.forgerock.opendj.ldap.tools.LDAPPasswordModify</application>
                                            <application>com.forgerock.opendj.ldap.tools.LDAPPasswordModify
                                            </application>
                      <trailingSectionPaths>
                        <trailingSectionPath>exit-codes-0-ldap-89.xml</trailingSectionPath>
                        <trailingSectionPath>files.xml</trailingSectionPath>
                        <trailingSectionPath>ldappasswordmodify-examples.xml</trailingSectionPath>
                                                <trailingSectionPath>ldappasswordmodify-examples.xml
                                                </trailingSectionPath>
                      </trailingSectionPaths>
                    </tool>
@@ -283,6 +304,7 @@
              </execution>
            </executions>
          </plugin>
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-assembly-plugin</artifactId>
opendj-sdk/opendj-ldap-toolkit/src/main/assembly/descriptor.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<!--
 ! CDDL HEADER START
 !
@@ -21,7 +21,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2011 ForgeRock AS
 !      Copyright 2011-2015 ForgeRock AS
 !    
 -->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
@@ -35,7 +35,7 @@
  <fileSets>
    <fileSet>
      <directory>${project.basedir}</directory>
      <outputDirectory>/</outputDirectory>
      <outputDirectory></outputDirectory>
      <directoryMode>755</directoryMode>
      <fileMode>644</fileMode>
      <includes>
@@ -52,7 +52,7 @@
    </fileSet>
  <fileSet>
    <directory>${project.parent.parent.basedir}</directory>
    <outputDirectory>/</outputDirectory>
    <outputDirectory></outputDirectory>
    <directoryMode>755</directoryMode>
    <fileMode>644</fileMode>
    <includes>
opendj-sdk/opendj-rest2ldap/pom.xml
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<!--
  ! The contents of this file are subject to the terms of the Common Development and
  ! Distribution License (the License). You may not use this file except in compliance with the
@@ -15,19 +15,23 @@
  ! Copyright 2012-2015 ForgeRock AS.
  !
-->
<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">
<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>
        <artifactId>opendj-sdk</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>3.0.0-SNAPSHOT</version>
    </parent>
    <artifactId>opendj-rest2ldap</artifactId>
    <name>OpenDJ Commons REST Adapter</name>
    <description>
        This module includes APIs for accessing LDAP repositories using commons REST.
    </description>
    <description>This module includes APIs for accessing LDAP repositories using commons REST.</description>
    <packaging>bundle</packaging>
    <properties>
        <checkstyleHeaderLocation>org/forgerock/checkstyle/default-java-header</checkstyleHeaderLocation>
        <opendj.osgi.import.additional>
@@ -35,29 +39,36 @@
            org.forgerock.json.*;provide:=true
        </opendj.osgi.import.additional>
    </properties>
    <dependencies>
        <dependency>
            <groupId>org.forgerock.opendj</groupId>
            <artifactId>opendj-core</artifactId>
            <version>${project.version}</version>
        </dependency>
        <dependency>
            <groupId>org.forgerock.commons</groupId>
            <artifactId>json-resource</artifactId>
            <version>${forgerockRestVersion}</version>
            <version>${forgerock-rest.version}</version>
        </dependency>
        <dependency>
          <groupId>org.forgerock.commons</groupId>
          <artifactId>json-resource-http</artifactId>
          <version>${forgerockRestVersion}</version>
            <version>${forgerock-rest.version}</version>
        </dependency>
        <dependency>
            <groupId>org.forgerock</groupId>
            <artifactId>forgerock-build-tools</artifactId>
            <version>${forgerockBuildToolsVersion}</version>
            <version>${forgerock-build-tools.version}</version>
            <scope>test</scope>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
@@ -70,12 +81,15 @@
                    </instructions>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
            </plugin>
        </plugins>
    </build>
    <reporting>
        <plugins>
            <plugin>
opendj-sdk/pom.xml
@@ -24,27 +24,35 @@
  !      Copyright 2011-2015 ForgeRock AS.
  !
-->
<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">
<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.3</version>
  </parent>
  <groupId>org.forgerock.opendj</groupId>
  <artifactId>opendj-sdk</artifactId>
  <version>3.0.0-SNAPSHOT</version>
  <packaging>pom</packaging>
  <name>OpenDJ LDAP SDK</name>
  <description>
    This group module provides a complete LDAP SDK for developing LDAP Directory client and server applications.
  </description>
  <inceptionYear>2011</inceptionYear>
  <url>http://opendj.forgerock.org</url>
  <issueManagement>
    <system>Jira</system>
    <url>https://bugster.forgerock.org/jira/browse/OPENDJ</url>
  </issueManagement>
  <mailingLists>
    <mailingList>
      <name>OpenDJ Users Mailing List</name>
@@ -53,6 +61,7 @@
      <unsubscribe>https://lists.forgerock.org/mailman/listinfo/opendj/</unsubscribe>
      <post>opendj@forgerock.org</post>
    </mailingList>
    <mailingList>
      <name>OpenDJ Developers Mailing List</name>
      <archive>http://lists.forgerock.org/pipermail/opendj-dev/</archive>
@@ -61,11 +70,13 @@
      <post>opendj-dev@forgerock.org</post>
    </mailingList>
  </mailingLists>
  <scm>
      <url>https://stash.forgerock.org/projects/OPENDJ/repos/opendj-sdk/browse</url>
      <connection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-sdk.git</connection>
      <developerConnection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-sdk.git</developerConnection>
  </scm>
  <ciManagement>
    <system>jenkins</system>
    <url>https://builds.forgerock.org/view/OpenDJ/job/OpenDJ%20SDK%20-%20trunk%20-%20postcommit/</url>
@@ -80,6 +91,7 @@
      </notifier>
    </notifiers>
  </ciManagement>
  <distributionManagement>
    <site>
      <id>forgerock.org</id>
@@ -87,6 +99,7 @@
      <url>${siteDistributionURL}</url>
    </site>
  </distributionManagement>
  <modules>
    <module>opendj-copyright-maven-plugin</module>
    <module>opendj-doc-maven-plugin</module>
@@ -97,17 +110,18 @@
    <module>opendj-ldap-sdk-examples</module>
    <module>opendj-rest2ldap</module>
  </modules>
  <properties>
    <mavenRepoSnapshots>http://maven.forgerock.org/repo/snapshots</mavenRepoSnapshots>
    <mavenRepoReleases>http://maven.forgerock.org/repo/releases</mavenRepoReleases>
    <forgerockBuildToolsVersion>1.0.2</forgerockBuildToolsVersion>
    <i18nFrameworkVersion>1.4.2-SNAPSHOT</i18nFrameworkVersion>
    <grizzlyFrameworkVersion>2.3.14</grizzlyFrameworkVersion>
    <slf4jVersion>1.7.5</slf4jVersion>
    <forgerockRestVersion>3.0.0-SNAPSHOT</forgerockRestVersion>
    <forgerockHttpVersion>0.0.1-SNAPSHOT</forgerockHttpVersion>
    <frDocPluginVersion>3.1.0-SNAPSHOT</frDocPluginVersion>
        <forgerock-build-tools.version>1.0.2</forgerock-build-tools.version>
        <i18n-framework.version>1.4.2-SNAPSHOT</i18n-framework.version>
        <grizzly-framework.version>2.3.14</grizzly-framework.version>
        <slf4j.version>1.7.5</slf4j.version>
        <forgerock-rest.version>3.0.0-SNAPSHOT</forgerock-rest.version>
        <forgerock-http.version>0.0.1-SNAPSHOT</forgerock-http.version>
        <forgerock-doc-plugin.version>3.1.0-SNAPSHOT</forgerock-doc-plugin.version>
    <!-- OSGi bundles properties -->
    <opendj.osgi.import.additional />
@@ -122,8 +136,11 @@
    <checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
    <siteDistributionURL>scp://community.internal.forgerock.com/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
        <siteDistributionURL>scp://community.internal.forgerock.com/var/www/vhosts/opendj.forgerock.org/httpdocs
        </siteDistributionURL>
  </properties>
  <build>
    <plugins>
      <plugin>
@@ -142,8 +159,8 @@
          </execution>
        </executions>
      </plugin>
    </plugins>
    <pluginManagement>
      <plugins>
        <plugin>
@@ -155,6 +172,7 @@
            <target>1.7</target>
          </configuration>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-surefire-plugin</artifactId>
@@ -172,6 +190,7 @@
            </properties>
          </configuration>
        </plugin>
          <plugin>
              <groupId>org.apache.felix</groupId>
              <artifactId>maven-bundle-plugin</artifactId>
@@ -195,6 +214,7 @@
                  </archive>
              </configuration>
          </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-javadoc-plugin</artifactId>
@@ -204,6 +224,7 @@
            </links>
          </configuration>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-source-plugin</artifactId>
@@ -215,6 +236,7 @@
            </execution>
          </executions>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-site-plugin</artifactId>
@@ -222,11 +244,13 @@
            <locales>en</locales>
          </configuration>
        </plugin>
        <plugin>
          <groupId>org.forgerock.commons</groupId>
          <artifactId>i18n-maven-plugin</artifactId>
          <version>${i18nFrameworkVersion}</version>
                    <version>${i18n-framework.version}</version>
        </plugin>
        <plugin>
          <groupId>org.codehaus.mojo</groupId>
          <artifactId>cobertura-maven-plugin</artifactId>
@@ -238,6 +262,7 @@
            </instrumentation>
          </configuration>
        </plugin>
        <!-- This is needed to use annotations in maven plugins with maven 3.0.x -->
        <plugin>
            <groupId>org.apache.maven.plugins</groupId>
@@ -261,7 +286,7 @@
        <plugin>
            <groupId>org.forgerock.commons</groupId>
            <artifactId>forgerock-doc-maven-plugin</artifactId>
            <version>${frDocPluginVersion}</version>
                    <version>${forgerock-doc-plugin.version}</version>
            <configuration>
                <projectName>OpenDJ</projectName>
                <projectVersion>${project.version}</projectVersion>
@@ -272,6 +297,8 @@
      </plugins>
    </pluginManagement>
  </build>
  <reporting>
    <plugins>
      <plugin>
@@ -294,6 +321,8 @@
      </plugin>
    </plugins>
  </reporting>
  <repositories>
    <repository>
      <id>forgerock-staging-repository</id>
@@ -303,6 +332,7 @@
        <enabled>false</enabled>
      </snapshots>
    </repository>
    <repository>
      <id>forgerock-snapshots-repository</id>
      <name>ForgeRock Snapshot Repository</name>
@@ -311,6 +341,7 @@
        <enabled>false</enabled>
      </releases>
    </repository>
    <repository>
      <id>jvnet-nexus-snapshots</id>
      <url>https://maven.java.net/content/repositories/snapshots</url>
@@ -322,30 +353,36 @@
      </snapshots>
    </repository>
  </repositories>
  <dependencyManagement>
    <dependencies>
      <dependency>
        <groupId>org.forgerock.commons</groupId>
        <artifactId>i18n-core</artifactId>
        <version>${i18nFrameworkVersion}</version>
                <version>${i18n-framework.version}</version>
        <scope>compile</scope>
      </dependency>
      <dependency>
        <groupId>org.forgerock.commons</groupId>
        <artifactId>i18n-slf4j</artifactId>
        <version>${i18nFrameworkVersion}</version>
                <version>${i18n-framework.version}</version>
        <scope>compile</scope>
      </dependency>
      <dependency>
        <groupId>org.slf4j</groupId>
        <artifactId>slf4j-api</artifactId>
        <version>${slf4jVersion}</version>
                <version>${slf4j.version}</version>
      </dependency>
      <dependency>
        <groupId>org.slf4j</groupId>
        <artifactId>slf4j-jdk14</artifactId>
        <version>${slf4jVersion}</version>
                <version>${slf4j.version}</version>
      </dependency>
      <dependency>
        <groupId>org.forgerock.commons</groupId>
        <artifactId>forgerock-util</artifactId>
@@ -353,6 +390,8 @@
      </dependency>
    </dependencies>
  </dependencyManagement>
  <dependencies>
    <dependency>
      <groupId>org.easytesting</groupId>
@@ -360,34 +399,42 @@
      <version>1.4</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.mockito</groupId>
      <artifactId>mockito-all</artifactId>
      <version>1.8.5</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.testng</groupId>
      <artifactId>testng</artifactId>
      <version>6.0.1</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-jdk14</artifactId>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <licenses>
   <license>
    <name>CDDL-1.0</name>
    <url>http://www.opensource.org/licenses/CDDL-1.0</url>
    <comments>Common Development and Distribution License (CDDL) 1.0.
    This license applies to OpenDJ source code as indicated in the
    source files.</comments>
                source files.
            </comments>
    <distribution>repo</distribution>
   </license>
  </licenses>
  <profiles>
    <profile>
      <id>precommit</id>
@@ -440,7 +487,9 @@
                           ! Please note that the regexp '\"Portions Copyright \[year\] \[name of copyright owner\]\"'
                           ! must never be found before 'CDDL HEADER END' in other submodules, otherwise the plugin will fail.
                         -->
                        <lineBeforeCopyrightRegExp>(CDDL HEADER END|\"Portions Copyright \[year\] \[name of copyright owner\]\")</lineBeforeCopyrightRegExp>
                                    <lineBeforeCopyrightRegExp>(CDDL HEADER END|\"Portions Copyright \[year\] \[name of
                                        copyright owner\]\")
                                    </lineBeforeCopyrightRegExp>
                      </configuration>
                  </execution>
              </executions>