From e6910ef3c8e287da40a06ef6e15208ba8564386a Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 17 Nov 2015 10:08:03 +0000
Subject: [PATCH] OPENDJ-882 Code cleanup

---
 pom.xml | 1061 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 547 insertions(+), 514 deletions(-)

diff --git a/pom.xml b/pom.xml
index f975ec0..76fdaa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,542 +24,575 @@
   !      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">
-  <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-server-parent</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>OpenDJ Directory Services Project</name>
-  <description>
-    OpenDJ is a new LDAPv3 compliant directory service, developed for the Java
-    platform, providing a high performance, highly available and secure store
-    for the identities managed by enterprises.
-  </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>
-      <archive>http://lists.forgerock.org/pipermail/opendj/</archive>
-      <subscribe>https://lists.forgerock.org/mailman/listinfo/opendj/</subscribe>
-      <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>
-      <subscribe>https://lists.forgerock.org/mailman/listinfo/opendj-dev/</subscribe>
-      <unsubscribe>https://lists.forgerock.org/mailman/listinfo/opendj-dev/</unsubscribe>
-      <post>opendj-dev@forgerock.org</post>
-    </mailingList>
-  </mailingLists>
-  <scm>
-    <url>https://stash.forgerock.org/projects/OPENDJ/repos/opendj/browse</url>
-    <connection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj.git</connection>
-    <developerConnection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj.git</developerConnection>
-    <tag>HEAD</tag>
-  </scm>
-  <ciManagement>
-    <system>jenkins</system>
-    <url>https://ci.forgerock.org/view/OpenDJ/job/OpenDJ%20-%20postcommit</url>
-    <notifiers>
-      <notifier>
-        <type>mail</type>
-        <sendOnError>true</sendOnError>
-        <sendOnFailure>true</sendOnFailure>
-        <sendOnSuccess>false</sendOnSuccess>
-        <sendOnWarning>false</sendOnWarning>
-        <address>opendj-dev@forgerock.org</address>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <distributionManagement>
-    <site>
-      <id>forgerock.org</id>
-      <name>OpenDJ Community</name>
-      <url>${siteDistributionURL}</url>
-    </site>
-  </distributionManagement>
+<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>
 
-  <modules>
-    <module>opendj-maven-plugin</module>
-    <module>opendj-config</module>
-    <module>opendj-rest2ldap-servlet</module>
-    <module>opendj-server</module>
-    <module>opendj-server-example-plugin</module>
-    <module>opendj-legacy</module>
-    <module>opendj-server-legacy</module>
-    <module>opendj-dsml-servlet</module>
-  </modules>
+    <parent>
+        <groupId>org.forgerock</groupId>
+        <artifactId>forgerock-parent</artifactId>
+        <version>2.0.3</version>
+    </parent>
 
-  <properties>
-    <mavenRepoSnapshots>http://maven.forgerock.org/repo/snapshots</mavenRepoSnapshots>
-    <mavenRepoReleases>http://maven.forgerock.org/repo/releases</mavenRepoReleases>
+    <groupId>org.forgerock.opendj</groupId>
+    <artifactId>opendj-server-parent</artifactId>
+    <version>3.0.0-SNAPSHOT</version>
 
-    <opendj-sdk.version>3.0.0-SNAPSHOT</opendj-sdk.version>
-    <forgerock-build-tools.version>1.0.2</forgerock-build-tools.version>
-    <i18n-framework.version>1.4.2</i18n-framework.version>
-    <forgerock-doc-plugin.version>3.1.0</forgerock-doc-plugin.version>
+    <packaging>pom</packaging>
 
-    <!-- Product information properties -->
-    <product.name>OpenDJ</product.name>
+    <name>OpenDJ Directory Services Project</name>
+    <description>
+        OpenDJ is a new LDAPv3 compliant directory service, developed for the Java
+        platform, providing a high performance, highly available and secure store
+        for the identities managed by enterprises.
+    </description>
+    <inceptionYear>2011</inceptionYear>
+    <url>http://opendj.forgerock.org</url>
 
-    <!-- OSGi bundles properties -->
-    <opendj.osgi.import.additional />
-    <!--
-     | Use provide:=true to disallow mixing OpenDJ and ForgeRock resource versions.
-     | it change the version policy from == + to == =+  [2.0,3) [2.0,2.1)
-    -->
-    <opendj.osgi.import>
-      ${opendj.osgi.import.additional},
-      *
-    </opendj.osgi.import>
+    <issueManagement>
+        <system>Jira</system>
+        <url>https://bugster.forgerock.org/jira/browse/OPENDJ</url>
+    </issueManagement>
 
-    <checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
+    <mailingLists>
+        <mailingList>
+            <name>OpenDJ Users Mailing List</name>
+            <archive>http://lists.forgerock.org/pipermail/opendj/</archive>
+            <subscribe>https://lists.forgerock.org/mailman/listinfo/opendj/</subscribe>
+            <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>
+            <subscribe>https://lists.forgerock.org/mailman/listinfo/opendj-dev/</subscribe>
+            <unsubscribe>https://lists.forgerock.org/mailman/listinfo/opendj-dev/</unsubscribe>
+            <post>opendj-dev@forgerock.org</post>
+        </mailingList>
+    </mailingLists>
 
-    <siteDistributionURL>scp://community.internal.forgerock.com/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
-  </properties>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.forgerock.maven.plugins</groupId>
-        <artifactId>javadoc-updater-maven-plugin</artifactId>
-        <version>1.0.0</version>
-        <executions>
-          <execution>
-            <phase>site</phase>
-            <goals>
-              <goal>fixjavadoc</goal>
-            </goals>
-            <configuration>
-              <directory>${project.reporting.outputDirectory}</directory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+    <scm>
+        <url>https://stash.forgerock.org/projects/OPENDJ/repos/opendj/browse</url>
+        <connection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj.git</connection>
+        <developerConnection>scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj.git</developerConnection>
+        <tag>HEAD</tag>
+    </scm>
 
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.forgerock.opendj</groupId>
-          <artifactId>opendj-copyright-maven-plugin</artifactId>
-          <version>${opendj-sdk.version}</version>
-          <configuration>
-            <!-- Disable copyright on README and legal files -->
-            <disabledFiles>
-              <disabledFile>README</disabledFile>
-              <disabledFile>**/README</disabledFile>
-              <disabledFile>README.txt</disabledFile>
-              <disabledFile>**/README.txt</disabledFile>
-              <disabledFile>**/THIRDPARTYREADME.txt</disabledFile>
-              <disabledFile>legal-notices/CDDLv1_0.txt</disabledFile>
-            </disabledFiles>
-          </configuration>
-        </plugin>
+    <ciManagement>
+        <system>jenkins</system>
+        <url>https://ci.forgerock.org/view/OpenDJ/job/OpenDJ%20-%20postcommit</url>
+        <notifiers>
+            <notifier>
+                <type>mail</type>
+                <sendOnError>true</sendOnError>
+                <sendOnFailure>true</sendOnFailure>
+                <sendOnSuccess>false</sendOnSuccess>
+                <sendOnWarning>false</sendOnWarning>
+                <address>opendj-dev@forgerock.org</address>
+            </notifier>
+        </notifiers>
+    </ciManagement>
 
-        <plugin>
-          <groupId>org.forgerock.opendj</groupId>
-          <artifactId>opendj-doc-maven-plugin</artifactId>
-          <version>${opendj-sdk.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.forgerock.opendj</groupId>
-          <artifactId>opendj-maven-plugin</artifactId>
-          <version>${project.version}</version>
-        </plugin>
-        <plugin>
-          <inherited>true</inherited>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <configuration>
-            <source>1.7</source>
-            <target>1.7</target>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <argLine>-server</argLine>
-            <properties>
-              <property>
-                <name>usedefaultlisteners</name>
-                <value>false</value>
-              </property>
-              <property>
-                <name>listener</name>
-                <value>org.forgerock.testng.ForgeRockTestListener</value>
-              </property>
-            </properties>
-          </configuration>
-        </plugin>
-          <plugin>
-              <groupId>org.apache.felix</groupId>
-              <artifactId>maven-bundle-plugin</artifactId>
-              <version>2.3.7</version>
-              <extensions>true</extensions>
-              <configuration>
-                  <instructions>
-                      <!--
-                      | Remove the by default removed headers plus some other to make cleaner the generated MANIFEST.MF
-                      -->
-                      <_removeheaders>
-                          Bnd-LastModified,Built-By,Private-Package,Tool,Created-By,Build-Jdk,Include-Resource,
-                          Ignore-Package,Private-Package,Bundle-DocURL
-                      </_removeheaders>
-                      <Import-Package>${opendj.osgi.import}</Import-Package>
-                  </instructions>
-                  <archive>
-                    <addMavenDescriptor>false</addMavenDescriptor>
-                    <index>true</index>
-                    <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                  </archive>
-              </configuration>
-          </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <configuration>
-            <links>
-             <link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link>
-            </links>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <executions>
-            <execution>
-              <goals>
-                <goal>jar</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <configuration>
-            <locales>en</locales>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.forgerock.commons</groupId>
-          <artifactId>i18n-maven-plugin</artifactId>
-          <version>${i18n-framework.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>cobertura-maven-plugin</artifactId>
-          <configuration>
-            <instrumentation>
-              <excludes>
-                <exclude>**/*Messages.class</exclude>
-              </excludes>
-            </instrumentation>
-          </configuration>
-        </plugin>
-        <!--This plugin's configuration is used to store Eclipse m2e settings only.
-            It has no influence on the Maven build itself.-->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
+    <distributionManagement>
+        <site>
+            <id>forgerock.org</id>
+            <name>OpenDJ Community</name>
+            <url>${siteDistributionURL}</url>
+        </site>
+    </distributionManagement>
+
+    <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>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <repositories>
+        <repository>
+            <id>forgerock-staging-repository</id>
+            <name>ForgeRock Release Repository</name>
+            <url>http://maven.forgerock.org/repo/releases</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>forgerock-snapshots-repository</id>
+            <name>ForgeRock Snapshot Repository</name>
+            <url>http://maven.forgerock.org/repo/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>jvnet-nexus-snapshots</id>
+            <url>https://maven.java.net/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Commons -->
+            <dependency>
+                <groupId>org.forgerock.commons</groupId>
+                <artifactId>forgerock-bom</artifactId>
+                <version>1.0.0</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.forgerock</groupId>
+                <artifactId>forgerock-build-tools</artifactId>
+                <version>${forgerock-build-tools.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <!-- I18N framework -->
+            <dependency>
+                <groupId>org.forgerock.commons</groupId>
+                <artifactId>i18n-core</artifactId>
+                <version>${i18n-framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.forgerock.commons</groupId>
+                <artifactId>i18n-slf4j</artifactId>
+                <version>${i18n-framework.version}</version>
+            </dependency>
+
+            <!-- OpenDJ SDK -->
+            <dependency>
+                <groupId>org.forgerock.opendj</groupId>
+                <artifactId>opendj-cli</artifactId>
+                <version>${opendj-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.forgerock.opendj</groupId>
+                <artifactId>opendj-core</artifactId>
+                <version>${opendj-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.forgerock.opendj</groupId>
+                <artifactId>opendj-core</artifactId>
+                <type>test-jar</type>
+                <version>${opendj-sdk.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.forgerock.opendj</groupId>
+                <artifactId>opendj-grizzly</artifactId>
+                <version>${opendj-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.forgerock.opendj</groupId>
+                <artifactId>opendj-rest2ldap</artifactId>
+                <version>${opendj-sdk.version}</version>
+            </dependency>
+
+            <!-- OpenDJ Server -->
+            <dependency>
+                <groupId>org.forgerock.opendj</groupId>
+                <artifactId>opendj-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.forgerock.opendj</groupId>
+                <artifactId>opendj-legacy</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.forgerock.opendj</groupId>
+                <artifactId>opendj-server</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.easytesting</groupId>
+            <artifactId>fest-assert</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <modules>
+        <module>opendj-maven-plugin</module>
+        <module>opendj-config</module>
+        <module>opendj-rest2ldap-servlet</module>
+        <module>opendj-server</module>
+        <module>opendj-server-example-plugin</module>
+        <module>opendj-legacy</module>
+        <module>opendj-server-legacy</module>
+        <module>opendj-dsml-servlet</module>
+    </modules>
+
+    <properties>
+        <mavenRepoSnapshots>http://maven.forgerock.org/repo/snapshots</mavenRepoSnapshots>
+        <mavenRepoReleases>http://maven.forgerock.org/repo/releases</mavenRepoReleases>
+
+        <opendj-sdk.version>3.0.0-SNAPSHOT</opendj-sdk.version>
+        <forgerock-build-tools.version>1.0.2</forgerock-build-tools.version>
+        <i18n-framework.version>1.4.2</i18n-framework.version>
+        <forgerock-doc-plugin.version>3.1.0</forgerock-doc-plugin.version>
+
+        <!-- Product information properties -->
+        <product.name>OpenDJ</product.name>
+
+        <!-- OSGi bundles properties -->
+        <opendj.osgi.import.additional/>
+        <!--
+         | Use provide:=true to disallow mixing OpenDJ and ForgeRock resource versions.
+         | it change the version policy from == + to == =+  [2.0,3) [2.0,2.1)
+        -->
+        <opendj.osgi.import>
+            ${opendj.osgi.import.additional},
+            *
+        </opendj.osgi.import>
+
+        <checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
+
+        <siteDistributionURL>scp://community.internal.forgerock.com/var/www/vhosts/opendj.forgerock.org/httpdocs
+        </siteDistributionURL>
+    </properties>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>mailing-list</report>
+                            <report>issue-tracking</report>
+                            <report>license</report>
+                            <report>scm</report>
+                            <report>cim</report>
+                            <report>distribution-management</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.forgerock.maven.plugins</groupId>
+                <artifactId>javadoc-updater-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <phase>site</phase>
+                        <goals>
+                            <goal>fixjavadoc</goal>
+                        </goals>
+                        <configuration>
+                            <directory>${project.reporting.outputDirectory}</directory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.forgerock.opendj</groupId>
+                    <artifactId>opendj-copyright-maven-plugin</artifactId>
+                    <version>${opendj-sdk.version}</version>
+                    <configuration>
+                        <!-- Disable copyright on README and legal files -->
+                        <disabledFiles>
+                            <disabledFile>README</disabledFile>
+                            <disabledFile>**/README</disabledFile>
+                            <disabledFile>README.txt</disabledFile>
+                            <disabledFile>**/README.txt</disabledFile>
+                            <disabledFile>**/THIRDPARTYREADME.txt</disabledFile>
+                            <disabledFile>legal-notices/CDDLv1_0.txt</disabledFile>
+                        </disabledFiles>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.forgerock.opendj</groupId>
+                    <artifactId>opendj-doc-maven-plugin</artifactId>
+                    <version>${opendj-sdk.version}</version>
+                </plugin>
+
+                <plugin>
                     <groupId>org.forgerock.opendj</groupId>
                     <artifactId>opendj-maven-plugin</artifactId>
-                    <versionRange>[1.0.0,)</versionRange>
-                    <goals>
-                      <goal>generate-config</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute>
-                        <!-- <runOnIncremental>true</runOnIncremental> -->
-                        <runOnConfiguration>true</runOnConfiguration>
-                    </execute>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-        <!-- This is needed to use annotations in maven plugins with maven 3.0.x -->
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-plugin-plugin</artifactId>
-            <version>3.2</version>
-            <configuration>
-                <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-            </configuration>
-            <executions>
-                <execution>
-                    <id>mojo-descriptor</id>
-                    <phase>process-classes</phase>
-                    <goals>
-                        <goal>descriptor</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
+                    <version>${project.version}</version>
+                </plugin>
 
-        <!-- Provides build capabilities for docs in DocBook XML format. -->
-        <plugin>
-            <groupId>org.forgerock.commons</groupId>
-            <artifactId>forgerock-doc-maven-plugin</artifactId>
-            <version>${forgerock-doc-plugin.version}</version>
-            <configuration>
-                <projectName>OpenDJ</projectName>
-                <projectVersion>${project.version}</projectVersion>
-                <releaseVersion>${project.version}</releaseVersion>
-                <googleAnalyticsId>UA-23412190-8</googleAnalyticsId>
-            </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>index</report>
-              <report>mailing-list</report>
-              <report>issue-tracking</report>
-              <report>license</report>
-              <report>scm</report>
-              <report>cim</report>
-              <report>distribution-management</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
-  <repositories>
-    <repository>
-      <id>forgerock-staging-repository</id>
-      <name>ForgeRock Release Repository</name>
-      <url>http://maven.forgerock.org/repo/releases</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>forgerock-snapshots-repository</id>
-      <name>ForgeRock Snapshot Repository</name>
-      <url>http://maven.forgerock.org/repo/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>jvnet-nexus-snapshots</id>
-      <url>https://maven.java.net/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
+                <plugin>
+                    <inherited>true</inherited>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.7</source>
+                        <target>1.7</target>
+                    </configuration>
+                </plugin>
 
-  <dependencyManagement>
-    <dependencies>
-      <!-- Commons -->
-      <dependency>
-        <groupId>org.forgerock.commons</groupId>
-        <artifactId>forgerock-bom</artifactId>
-        <version>1.0.0</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.forgerock</groupId>
-        <artifactId>forgerock-build-tools</artifactId>
-        <version>${forgerock-build-tools.version}</version>
-        <scope>test</scope>
-      </dependency>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <argLine>-server</argLine>
+                        <properties>
+                            <property>
+                                <name>usedefaultlisteners</name>
+                                <value>false</value>
+                            </property>
+                            <property>
+                                <name>listener</name>
+                                <value>org.forgerock.testng.ForgeRockTestListener</value>
+                            </property>
+                        </properties>
+                    </configuration>
+                </plugin>
 
-      <!-- I18N framework -->
-      <dependency>
-        <groupId>org.forgerock.commons</groupId>
-        <artifactId>i18n-core</artifactId>
-        <version>${i18n-framework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.forgerock.commons</groupId>
-        <artifactId>i18n-slf4j</artifactId>
-        <version>${i18n-framework.version}</version>
-      </dependency>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.3.7</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <instructions>
+                            <!--
+                            | Remove the by default removed headers plus some other to make cleaner the generated MANIFEST.MF
+                            -->
+                            <_removeheaders>
+                                Bnd-LastModified,Built-By,Private-Package,Tool,Created-By,Build-Jdk,Include-Resource,
+                                Ignore-Package,Private-Package,Bundle-DocURL
+                            </_removeheaders>
+                            <Import-Package>${opendj.osgi.import}</Import-Package>
+                        </instructions>
+                        <archive>
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                            <index>true</index>
+                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        </archive>
+                    </configuration>
+                </plugin>
 
-      <!-- OpenDJ SDK -->
-      <dependency>
-        <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-cli</artifactId>
-        <version>${opendj-sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-core</artifactId>
-        <version>${opendj-sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-core</artifactId>
-        <type>test-jar</type>
-        <version>${opendj-sdk.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-grizzly</artifactId>
-        <version>${opendj-sdk.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-rest2ldap</artifactId>
-        <version>${opendj-sdk.version}</version>
-      </dependency>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <links>
+                            <link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link>
+                        </links>
+                    </configuration>
+                </plugin>
 
-      <!-- OpenDJ Server -->
-      <dependency>
-        <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-config</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-legacy</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-server</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.easytesting</groupId>
-      <artifactId>fest-assert</artifactId>
-      <scope>test</scope>
-    </dependency>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <configuration>
+                        <locales>en</locales>
+                    </configuration>
+                </plugin>
 
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
+                <plugin>
+                    <groupId>org.forgerock.commons</groupId>
+                    <artifactId>i18n-maven-plugin</artifactId>
+                    <version>${i18n-framework.version}</version>
+                </plugin>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>cobertura-maven-plugin</artifactId>
+                    <configuration>
+                        <instrumentation>
+                            <excludes>
+                                <exclude>**/*Messages.class</exclude>
+                            </excludes>
+                        </instrumentation>
+                    </configuration>
+                </plugin>
 
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <scope>test</scope>
-    </dependency>
+                <!--
+                | This plugin's configuration is used to store Eclipse m2e settings only.
+                | It has no influence on the Maven build itself.
+                -->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.forgerock.opendj</groupId>
+                                        <artifactId>opendj-maven-plugin</artifactId>
+                                        <versionRange>[1.0.0,)</versionRange>
+                                        <goals>
+                                            <goal>generate-config</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <execute>
+                                            <!-- <runOnIncremental>true</runOnIncremental> -->
+                                            <runOnConfiguration>true</runOnConfiguration>
+                                        </execute>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+                <!-- This is needed to use annotations in maven plugins with maven 3.0.x -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-plugin-plugin</artifactId>
+                    <version>3.2</version>
+                    <configuration>
+                        <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>mojo-descriptor</id>
+                            <phase>process-classes</phase>
+                            <goals>
+                                <goal>descriptor</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <!-- Provides build capabilities for docs in DocBook XML format. -->
+                <plugin>
+                    <groupId>org.forgerock.commons</groupId>
+                    <artifactId>forgerock-doc-maven-plugin</artifactId>
+                    <version>${forgerock-doc-plugin.version}</version>
+                    <configuration>
+                        <projectName>OpenDJ</projectName>
+                        <projectVersion>${project.version}</projectVersion>
+                        <releaseVersion>${project.version}</releaseVersion>
+                        <googleAnalyticsId>UA-23412190-8</googleAnalyticsId>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
 
-  <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>
-    <distribution>repo</distribution>
-   </license>
-  </licenses>
-  <profiles>
-    <profile>
-      <id>precommit</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.forgerock.opendj</groupId>
-            <artifactId>opendj-copyright-maven-plugin</artifactId>
-            <executions>
-                <execution>
-                    <id>check-copyright</id>
-                    <goals>
-                        <goal>check-copyright</goal>
-                    </goals>
-                </execution>
-            </executions>
-          </plugin>
-        </plugins>
-        </build>
-    </profile>
+    <profiles>
+        <profile>
+            <id>precommit</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.forgerock.opendj</groupId>
+                        <artifactId>opendj-copyright-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>check-copyright</id>
+                                <goals>
+                                    <goal>check-copyright</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
-    <profile>
-      <id>update-copyrights</id>
-        <build>
-          <plugins>
-            <plugin>
-              <groupId>org.forgerock.opendj</groupId>
-              <artifactId>opendj-copyright-maven-plugin</artifactId>
-              <executions>
-                  <execution>
-                    <id>check-copyright</id>
-                    <phase>none</phase>
-                    <goals>
-                        <goal>check-copyright</goal>
-                    </goals>
-                  </execution>
-                  <execution>
-                      <id>update-copyright</id>
-                      <goals>
-                          <goal>update-copyright</goal>
-                      </goals>
-                      <configuration>
-                        <!-- We need to accept the second part of the following regular expression for submodules:
-                           ! * opendj-rest2ldap-servlet
-                           ! * opendj-legacy
-                           !
-                           ! 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>
-                      </configuration>
-                  </execution>
-              </executions>
-            </plugin>
-          </plugins>
-        </build>
-    </profile>
-  </profiles>
+        <profile>
+            <id>update-copyrights</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.forgerock.opendj</groupId>
+                        <artifactId>opendj-copyright-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>check-copyright</id>
+                                <phase>none</phase>
+                                <goals>
+                                    <goal>check-copyright</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>update-copyright</id>
+                                <goals>
+                                    <goal>update-copyright</goal>
+                                </goals>
+                                <configuration>
+                                    <!-- We need to accept the second part of the following regular expression for submodules:
+                                       ! * opendj-rest2ldap-servlet
+                                       ! * opendj-legacy
+                                       !
+                                       ! 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>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

--
Gitblit v1.10.0