From 7fbc83f6a1cc2326bc6922390b24d15a52f96e5d Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 23 Oct 2015 13:21:13 +0000
Subject: [PATCH] OPENDJ-2089 Code cleanup
---
opendj-sdk/opendj-rest2ldap/pom.xml | 34
opendj-sdk/opendj-copyright-maven-plugin/pom.xml | 177 +-
opendj-sdk/opendj-doc-maven-plugin/pom.xml | 144 +-
opendj-sdk/opendj-ldap-sdk-examples/pom.xml | 163 +-
opendj-sdk/opendj-ldap-toolkit/pom.xml | 576 +++++-----
opendj-sdk/pom.xml | 881 +++++++++--------
opendj-sdk/opendj-ldap-toolkit/src/main/assembly/descriptor.xml | 10
opendj-sdk/opendj-core/pom.xml | 521 +++++----
opendj-sdk/opendj-grizzly/pom.xml | 249 ++--
opendj-sdk/opendj-cli/pom.xml | 243 ++--
10 files changed, 1,580 insertions(+), 1,418 deletions(-)
diff --git a/opendj-sdk/opendj-cli/pom.xml b/opendj-sdk/opendj-cli/pom.xml
index aea6049..094ff5c 100644
--- a/opendj-sdk/opendj-cli/pom.xml
+++ b/opendj-sdk/opendj-cli/pom.xml
@@ -24,123 +24,136 @@
! 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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>opendj-sdk</artifactId>
- <groupId>org.forgerock.opendj</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>opendj-cli</artifactId>
- <name>OpenDJ CLI API</name>
- <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>
- <type>test-jar</type>
- <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>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.21</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+<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>
- <properties>
- <opendj.osgi.import.additional>
- org.forgerock.opendj.*;provide:=true
- </opendj.osgi.import.additional>
- </properties>
+ <parent>
+ <artifactId>opendj-sdk</artifactId>
+ <groupId>org.forgerock.opendj</groupId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>opendj-cli</artifactId>
+ <name>OpenDJ CLI API</name>
+ <description>This module includes CLI API for implementing CLI applications.</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate-messages</goal>
- </goals>
- <configuration>
- <messageFiles>
- <messageFile>com/forgerock/opendj/cli/cli.properties</messageFile>
- </messageFiles>
- </configuration>
- </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>
- </plugin>
+ <packaging>bundle</packaging>
- <!-- Creates opendj-cli bundle -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>com.forgerock.opendj.cli</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>cim</report>
- <report>distribution-management</report>
- </reports>
- </reportSet>
- </reportSets>
- </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>
- </plugins>
- </reporting>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-core</artifactId>
+ <type>test-jar</type>
+ <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>${forgerock-build-tools.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.21</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+
+ <properties>
+ <opendj.osgi.import.additional>
+ org.forgerock.opendj.*;provide:=true
+ </opendj.osgi.import.additional>
+ </properties>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate-messages</goal>
+ </goals>
+ <configuration>
+ <messageFiles>
+ <messageFile>com/forgerock/opendj/cli/cli.properties</messageFile>
+ </messageFiles>
+ </configuration>
+ </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>
+ </plugin>
+
+ <!-- Creates opendj-cli bundle -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>com.forgerock.opendj.cli</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>mailing-list</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>cim</report>
+ <report>distribution-management</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </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>
+ </plugins>
+ </reporting>
</project>
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/pom.xml b/opendj-sdk/opendj-copyright-maven-plugin/pom.xml
index 7e0c3a2..8c99f32 100644
--- a/opendj-sdk/opendj-copyright-maven-plugin/pom.xml
+++ b/opendj-sdk/opendj-copyright-maven-plugin/pom.xml
@@ -24,103 +24,104 @@
! 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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>opendj-sdk</artifactId>
- <groupId>org.forgerock.opendj</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
+<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>
- <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>
- <packaging>maven-plugin</packaging>
+ <parent>
+ <artifactId>opendj-sdk</artifactId>
+ <groupId>org.forgerock.opendj</groupId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
- <properties>
- <forgerockBuildToolsVersion>1.0.2</forgerockBuildToolsVersion>
- <mavenVersion>3.2.3</mavenVersion>
- <plexusUtilsVersion>3.0.17</plexusUtilsVersion>
- <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
- </properties>
+ <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>
- <dependencies>
- <!-- Maven -->
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>${mavenVersion}</version>
- <scope>provided</scope>
- </dependency>
+ <packaging>maven-plugin</packaging>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>${mavenVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${mavenVersion}</version>
- <scope>provided</scope>
- </dependency>
+ <properties>
+ <maven.version>3.2.3</maven.version>
+ <maven-plugin-plugin.version>3.2</maven-plugin-plugin.version>
+ </properties>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <version>${mavenPluginPluginVersion}</version>
- <scope>provided</scope>
- </dependency>
- <!-- Testing -->
- <dependency>
- <groupId>org.forgerock</groupId>
- <artifactId>forgerock-build-tools</artifactId>
- <version>${forgerockBuildToolsVersion}</version>
- <scope>test</scope>
- </dependency>
+ <dependencies>
+ <!-- Maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${maven.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- Other -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>${maven.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>org.twdata.maven</groupId>
- <artifactId>mojo-executor</artifactId>
- <version>2.2.0</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- Runtime -->
- <dependency>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>forgerock-util</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>${maven-plugin-plugin.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-api</artifactId>
- <version>1.9.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-svn-commons</artifactId>
- <version>1.9.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-svnexe</artifactId>
- <version>1.9.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-gitexe</artifactId>
- <version>1.9.2</version>
- </dependency>
- </dependencies>
+ <!-- Testing -->
+ <dependency>
+ <groupId>org.forgerock</groupId>
+ <artifactId>forgerock-build-tools</artifactId>
+ <version>${forgerock-build-tools.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Other -->
+ <dependency>
+ <groupId>org.twdata.maven</groupId>
+ <artifactId>mojo-executor</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+
+ <!-- Runtime -->
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>forgerock-util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svn-commons</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svnexe</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-gitexe</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/opendj-sdk/opendj-core/pom.xml b/opendj-sdk/opendj-core/pom.xml
index 14d7a1b..9493ea4 100644
--- a/opendj-sdk/opendj-core/pom.xml
+++ b/opendj-sdk/opendj-core/pom.xml
@@ -24,258 +24,285 @@
! 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>
- <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>
- This module provides the core APIs required for implementing LDAP Directory
- 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>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <opendj.osgi.import.additional>
- com.sun.security.auth*;resolution:=optional
- </opendj.osgi.import.additional>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate-messages</goal>
- </goals>
- <configuration>
- <messageFiles>
- <messageFile>com/forgerock/opendj/ldap/core.properties</messageFile>
- </messageFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
+<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>
- <!-- Creates opendj-core bundle -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>
- com.forgerock.opendj.util,
- org.forgerock.opendj.io,
- org.forgerock.opendj.ldap*,
- org.forgerock.opendj.ldif
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
+ <parent>
+ <artifactId>opendj-sdk</artifactId>
+ <groupId>org.forgerock.opendj</groupId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
- <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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <artifactId>opendj-core</artifactId>
+ <name>OpenDJ Core APIs</name>
+ <description>
+ This module provides the core APIs required for implementing LDAP Directory
+ client and server applications. Unlike the SDK this module does not
+ include a default network transport which must be obtained separately.
+ </description>
- <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 -->
- </file>
- </activation>
- <build>
+ <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>${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>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>${clirrPluginVersion}</version>
- <inherited>true</inherited>
- <configuration>
- <comparisonArtifacts>
- <comparisonArtifact>
- <groupId>${project.groupId}</groupId>
- <artifactId>opendj-ldap-sdk</artifactId><!-- former name of this jar -->
- <version>2.6.0</version>
- </comparisonArtifact>
- </comparisonArtifacts>
- <excludes>
- <exclude>com/**</exclude>
- </excludes>
- <ignoredDifferencesFile>clirr-ignored-api-changes.xml</ignoredDifferencesFile>
- </configuration>
- <executions>
- <execution>
- <id>mvn clirr:check</id>
- </execution>
- <execution>
- <id>mvn verify</id>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate-messages</goal>
+ </goals>
+ <configuration>
+ <messageFiles>
+ <messageFile>com/forgerock/opendj/ldap/core.properties</messageFile>
+ </messageFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Creates opendj-core bundle -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ com.forgerock.opendj.util,
+ org.forgerock.opendj.io,
+ org.forgerock.opendj.ldap*,
+ org.forgerock.opendj.ldif
+ </Export-Package>
+ </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>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- </build>
- <reporting>
+ </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 -->
+ </file>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>${clirrPluginVersion}</version>
+ <inherited>true</inherited>
+ <configuration>
+ <comparisonArtifacts>
+ <comparisonArtifact>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>opendj-ldap-sdk</artifactId>
+ <!-- former name of this jar -->
+ <version>2.6.0</version>
+ </comparisonArtifact>
+ </comparisonArtifacts>
+ <excludes>
+ <exclude>com/**</exclude>
+ </excludes>
+ <ignoredDifferencesFile>clirr-ignored-api-changes.xml</ignoredDifferencesFile>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>mvn clirr:check</id>
+ </execution>
+
+ <execution>
+ <id>mvn verify</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>${clirrPluginVersion}</version>
+ <inherited>true</inherited>
+ <configuration>
+ <comparisonArtifacts>
+ <comparisonArtifact>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>opendj-ldap-sdk</artifactId>
+ <!-- former name of this jar -->
+ <version>2.6.0</version>
+ </comparisonArtifact>
+ </comparisonArtifacts>
+ <excludes>
+ <exclude>com/**</exclude>
+ </excludes>
+ <ignoredDifferencesFile>clirr-ignored-api-changes.xml</ignoredDifferencesFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+
+ <!--
+ Generates consolidated Javadoc covering both LDAP SDK packages
+ and also dependency (and transitive dependency) ForgeRock packages.
+ -->
+ <profile>
+ <id>forgerock-release</id>
+
+ <properties>
+ <javadocTitle>OpenDJ LDAP SDK ${project.version} API</javadocTitle>
+ <timestamp>${maven.build.timestamp}</timestamp>
+ <maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includeDependencySources>true</includeDependencySources>
+ <includeTransitiveDependencySources>true</includeTransitiveDependencySources>
+ <dependencySourceIncludes>
+ <dependencySourceInclude>org.forgerock.*:*</dependencySourceInclude>
+ </dependencySourceIncludes>
+ <excludePackageNames>com.*:*.internal</excludePackageNames>
+ <groups>
+ <group>
+ <title>${project.name} Packages</title>
+ <packages>${project.groupId}*</packages>
+ </group>
+
+ <group>
+ <title>ForgeRock Common Packages</title>
+ <packages>*</packages>
+ </group>
+ </groups>
+ <author>false</author>
+ <doctitle>${javadocTitle}</doctitle>
+ <windowtitle>${javadocTitle}</windowtitle>
+ <header>${javadocTitle}</header>
+ <footer>${javadocTitle}</footer>
+ <bottom>Copyright 2011-${maven.build.timestamp} ForgeRock AS.</bottom>
+ <links>
+ <link>http://docs.oracle.com/javase/7/docs/api/</link>
+ <link>http://www.slf4j.org/apidocs/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
+ <reporting>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>${clirrPluginVersion}</version>
- <inherited>true</inherited>
- <configuration>
- <comparisonArtifacts>
- <comparisonArtifact>
- <groupId>${project.groupId}</groupId>
- <artifactId>opendj-ldap-sdk</artifactId><!-- former name of this jar -->
- <version>2.6.0</version>
- </comparisonArtifact>
- </comparisonArtifacts>
- <excludes>
- <exclude>com/**</exclude>
- </excludes>
- <ignoredDifferencesFile>clirr-ignored-api-changes.xml</ignoredDifferencesFile>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </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>
</plugins>
- </reporting>
- </profile>
-
- <!--
- Generates consolidated Javadoc covering both LDAP SDK packages
- and also dependency (and transitive dependency) ForgeRock packages.
- -->
- <profile>
- <id>forgerock-release</id>
-
- <properties>
- <javadocTitle>OpenDJ LDAP SDK ${project.version} API</javadocTitle>
- <timestamp>${maven.build.timestamp}</timestamp>
- <maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>javadoc-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includeDependencySources>true</includeDependencySources>
- <includeTransitiveDependencySources>true</includeTransitiveDependencySources>
- <dependencySourceIncludes>
- <dependencySourceInclude>org.forgerock.*:*</dependencySourceInclude>
- </dependencySourceIncludes>
- <excludePackageNames>com.*:*.internal</excludePackageNames>
- <groups>
- <group>
- <title>${project.name} Packages</title>
- <packages>${project.groupId}*</packages>
- </group>
- <group>
- <title>ForgeRock Common Packages</title>
- <packages>*</packages>
- </group>
- </groups>
- <author>false</author>
- <doctitle>${javadocTitle}</doctitle>
- <windowtitle>${javadocTitle}</windowtitle>
- <header>${javadocTitle}</header>
- <footer>${javadocTitle}</footer>
- <bottom>Copyright 2011-${maven.build.timestamp} ForgeRock AS.</bottom>
- <links>
- <link>http://docs.oracle.com/javase/7/docs/api/</link>
- <link>http://www.slf4j.org/apidocs/</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- </reports>
- </reportSet>
- </reportSets>
- </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>
- </plugins>
- </reporting>
+ </reporting>
</project>
diff --git a/opendj-sdk/opendj-doc-maven-plugin/pom.xml b/opendj-sdk/opendj-doc-maven-plugin/pom.xml
index ef44eb6..6412d40 100644
--- a/opendj-sdk/opendj-doc-maven-plugin/pom.xml
+++ b/opendj-sdk/opendj-doc-maven-plugin/pom.xml
@@ -24,79 +24,85 @@
! 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">
- <modelVersion>4.0.0</modelVersion>
+<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>
+ <parent>
+ <artifactId>opendj-sdk</artifactId>
+ <groupId>org.forgerock.opendj</groupId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
- <artifactId>opendj-doc-maven-plugin</artifactId>
- <packaging>maven-plugin</packaging>
+ <artifactId>opendj-doc-maven-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
- <name>OpenDJ Doc Helper Maven Plugin</name>
- <description>
- Helps to build generated documentation sources.
- </description>
+ <name>OpenDJ Doc Helper Maven Plugin</name>
+ <description>Helps to build generated documentation sources.</description>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.forgerock.opendj</groupId>
- <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>
- <version>3.2</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <build>
- <plugins>
- <plugin>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate-messages</goal>
- </goals>
- <configuration>
- <messageFiles>
- <messageFile>org/forgerock/opendj/maven/doc/docs.properties</messageFile>
- </messageFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <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>
+ <version>3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate-messages</goal>
+ </goals>
+ <configuration>
+ <messageFiles>
+ <messageFile>org/forgerock/opendj/maven/doc/docs.properties</messageFile>
+ </messageFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/opendj-sdk/opendj-grizzly/pom.xml b/opendj-sdk/opendj-grizzly/pom.xml
index ca00e5f..4ab26ab 100644
--- a/opendj-sdk/opendj-grizzly/pom.xml
+++ b/opendj-sdk/opendj-grizzly/pom.xml
@@ -24,122 +24,139 @@
! 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">
- <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>
- <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>
- <type>test-jar</type>
- <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>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.forgerock</groupId>
- <artifactId>forgerock-build-tools</artifactId>
- <version>${forgerockBuildToolsVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+<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>
- <properties>
- <opendj.osgi.import.additional>
- org.forgerock.opendj.*;provide:=true
- </opendj.osgi.import.additional>
- </properties>
+ <parent>
+ <artifactId>opendj-sdk</artifactId>
+ <groupId>org.forgerock.opendj</groupId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate-messages</goal>
- </goals>
- <configuration>
- <messageFiles>
- <messageFile>com/forgerock/opendj/grizzly/grizzly.properties</messageFile>
- </messageFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <!-- Export only public APIs of this module-->
- <Export-Package>
- org.forgerock.opendj.grizzly*
- </Export-Package>
- </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>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- </reports>
- </reportSet>
- </reportSets>
- </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>
- </plugins>
- </reporting>
+ <artifactId>opendj-grizzly</artifactId>
+ <name>OpenDJ Grizzly Transport Provider</name>
+ <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>
+ <type>test-jar</type>
+ <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>${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>${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>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate-messages</goal>
+ </goals>
+ <configuration>
+ <messageFiles>
+ <messageFile>com/forgerock/opendj/grizzly/grizzly.properties</messageFile>
+ </messageFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <!-- Export only public APIs of this module-->
+ <Export-Package>
+ org.forgerock.opendj.grizzly*
+ </Export-Package>
+ </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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </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>
+ </plugins>
+ </reporting>
</project>
diff --git a/opendj-sdk/opendj-ldap-sdk-examples/pom.xml b/opendj-sdk/opendj-ldap-sdk-examples/pom.xml
index 1161b30..105a610 100644
--- a/opendj-sdk/opendj-ldap-sdk-examples/pom.xml
+++ b/opendj-sdk/opendj-ldap-sdk-examples/pom.xml
@@ -24,78 +24,91 @@
! 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>
- <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>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <configuration>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <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-jxr-plugin</artifactId>
- <version>2.2</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>jxr</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-</project>
\ No newline at end of file
+<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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <reporting>
+ <plugins>
+ <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-jxr-plugin</artifactId>
+ <version>2.2</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jxr</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
diff --git a/opendj-sdk/opendj-ldap-toolkit/pom.xml b/opendj-sdk/opendj-ldap-toolkit/pom.xml
index 4cdda92..c160e64 100644
--- a/opendj-sdk/opendj-ldap-toolkit/pom.xml
+++ b/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,285 +24,307 @@
! 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>
- <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>
- <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>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.forgerock</groupId>
- <artifactId>forgerock-build-tools</artifactId>
- <version>${forgerockBuildToolsVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate-messages</goal>
- </goals>
- <configuration>
- <messageFiles>
- <messageFile>com/forgerock/opendj/ldap/tools/tools.properties</messageFile>
- </messageFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </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>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/descriptor.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>docs</id>
- <build>
- <plugins>
- <plugin>
+<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>
+
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
<groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-doc-maven-plugin</artifactId>
+ <artifactId>opendj-core</artifactId>
<version>${project.version}</version>
- <executions>
- <execution>
- <id>generate-doc</id>
- <goals>
- <goal>generate-refentry</goal>
- </goals>
+ </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>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.forgerock</groupId>
+ <artifactId>forgerock-build-tools</artifactId>
+ <version>${forgerock-build-tools.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate-messages</goal>
+ </goals>
+ <configuration>
+ <messageFiles>
+ <messageFile>com/forgerock/opendj/ldap/tools/tools.properties</messageFile>
+ </messageFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <outputDir>${project.build.directory}/generated-man-pages</outputDir>
- <tools>
- <tool>
- <name>addrate</name>
- <application>com.forgerock.opendj.ldap.tools.AddRate</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-80-89.xml</trailingSectionPath>
- <trailingSectionPath>addrate-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>authrate</name>
- <application>com.forgerock.opendj.ldap.tools.AuthRate</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-89.xml</trailingSectionPath>
- <trailingSectionPath>authrate-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldapcompare</name>
- <application>com.forgerock.opendj.ldap.tools.LDAPCompare</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-ldap-89.xml</trailingSectionPath>
- <trailingSectionPath>files.xml</trailingSectionPath>
- <trailingSectionPath>ldapcompare-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldapmodify</name>
- <application>com.forgerock.opendj.ldap.tools.LDAPModify</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-ldap-89.xml</trailingSectionPath>
- <trailingSectionPath>files.xml</trailingSectionPath>
- <trailingSectionPath>ldapmodify-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldappasswordmodify</name>
- <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>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldapsearch</name>
- <application>com.forgerock.opendj.ldap.tools.LDAPSearch</application>
- <trailingSectionPaths>
- <trailingSectionPath>filters.xml</trailingSectionPath>
- <trailingSectionPath>attributes.xml</trailingSectionPath>
- <trailingSectionPath>exit-codes-0-ldap-89.xml</trailingSectionPath>
- <trailingSectionPath>files.xml</trailingSectionPath>
- <trailingSectionPath>ldapsearch-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldifdiff</name>
- <application>com.forgerock.opendj.ldap.tools.LDIFDiff</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-5-6-other.xml</trailingSectionPath>
- <trailingSectionPath>ldifdiff-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldifmodify</name>
- <application>com.forgerock.opendj.ldap.tools.LDIFModify</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-gt0.xml</trailingSectionPath>
- <trailingSectionPath>ldifmodify-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldifsearch</name>
- <application>com.forgerock.opendj.ldap.tools.LDIFSearch</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-gt0.xml</trailingSectionPath>
- <trailingSectionPath>ldifsearch-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>makeldif</name>
- <application>com.forgerock.opendj.ldap.tools.MakeLDIF</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-1.xml</trailingSectionPath>
- <trailingSectionPath>makeldif-examples.xml</trailingSectionPath>
- <trailingSectionPath>makeldif-see-also.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>modrate</name>
- <application>com.forgerock.opendj.ldap.tools.ModRate</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-89.xml</trailingSectionPath>
- <trailingSectionPath>modrate-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>searchrate</name>
- <application>com.forgerock.opendj.ldap.tools.SearchRate</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-89.xml</trailingSectionPath>
- <trailingSectionPath>searchrate-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
- </tools>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
</configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>man-pages</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/man-pages.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ </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>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/descriptor.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- </build>
- </profile>
- </profiles>
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>docs</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-doc-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>generate-doc</id>
+ <goals>
+ <goal>generate-refentry</goal>
+ </goals>
+ <configuration>
+ <outputDir>${project.build.directory}/generated-man-pages</outputDir>
+ <tools>
+ <tool>
+ <name>addrate</name>
+ <application>com.forgerock.opendj.ldap.tools.AddRate</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>exit-codes-0-80-89.xml</trailingSectionPath>
+ <trailingSectionPath>addrate-examples.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
+ <name>authrate</name>
+ <application>com.forgerock.opendj.ldap.tools.AuthRate</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>exit-codes-0-89.xml</trailingSectionPath>
+ <trailingSectionPath>authrate-examples.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
+ <name>ldapcompare</name>
+ <application>com.forgerock.opendj.ldap.tools.LDAPCompare</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>exit-codes-0-ldap-89.xml</trailingSectionPath>
+ <trailingSectionPath>files.xml</trailingSectionPath>
+ <trailingSectionPath>ldapcompare-examples.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
+ <name>ldapmodify</name>
+ <application>com.forgerock.opendj.ldap.tools.LDAPModify</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>exit-codes-0-ldap-89.xml</trailingSectionPath>
+ <trailingSectionPath>files.xml</trailingSectionPath>
+ <trailingSectionPath>ldapmodify-examples.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
+ <name>ldappasswordmodify</name>
+ <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>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
+ <name>ldapsearch</name>
+ <application>com.forgerock.opendj.ldap.tools.LDAPSearch</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>filters.xml</trailingSectionPath>
+ <trailingSectionPath>attributes.xml</trailingSectionPath>
+ <trailingSectionPath>exit-codes-0-ldap-89.xml</trailingSectionPath>
+ <trailingSectionPath>files.xml</trailingSectionPath>
+ <trailingSectionPath>ldapsearch-examples.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
+ <name>ldifdiff</name>
+ <application>com.forgerock.opendj.ldap.tools.LDIFDiff</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>exit-codes-0-5-6-other.xml</trailingSectionPath>
+ <trailingSectionPath>ldifdiff-examples.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
+ <name>ldifmodify</name>
+ <application>com.forgerock.opendj.ldap.tools.LDIFModify</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>exit-codes-0-gt0.xml</trailingSectionPath>
+ <trailingSectionPath>ldifmodify-examples.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
+ <name>ldifsearch</name>
+ <application>com.forgerock.opendj.ldap.tools.LDIFSearch</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>exit-codes-0-gt0.xml</trailingSectionPath>
+ <trailingSectionPath>ldifsearch-examples.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
+ <name>makeldif</name>
+ <application>com.forgerock.opendj.ldap.tools.MakeLDIF</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>exit-codes-0-1.xml</trailingSectionPath>
+ <trailingSectionPath>makeldif-examples.xml</trailingSectionPath>
+ <trailingSectionPath>makeldif-see-also.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
+ <name>modrate</name>
+ <application>com.forgerock.opendj.ldap.tools.ModRate</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>exit-codes-0-89.xml</trailingSectionPath>
+ <trailingSectionPath>modrate-examples.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
+ <name>searchrate</name>
+ <application>com.forgerock.opendj.ldap.tools.SearchRate</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>exit-codes-0-89.xml</trailingSectionPath>
+ <trailingSectionPath>searchrate-examples.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+ </tools>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>man-pages</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/man-pages.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/descriptor.xml b/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/descriptor.xml
index d75cdd3..7c351b6 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/assembly/descriptor.xml
+++ b/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,8 +21,8 @@
!
! 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"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -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>
diff --git a/opendj-sdk/opendj-rest2ldap/pom.xml b/opendj-sdk/opendj-rest2ldap/pom.xml
index f364325..c54e6e3 100644
--- a/opendj-sdk/opendj-rest2ldap/pom.xml
+++ b/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>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>json-resource-http</artifactId>
+ <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>
diff --git a/opendj-sdk/pom.xml b/opendj-sdk/pom.xml
index af99191..51e497a 100644
--- a/opendj-sdk/pom.xml
+++ b/opendj-sdk/pom.xml
@@ -24,429 +24,478 @@
! 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-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>
- <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-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>
- <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>
- <modules>
- <module>opendj-copyright-maven-plugin</module>
- <module>opendj-doc-maven-plugin</module>
- <module>opendj-core</module>
- <module>opendj-grizzly</module>
- <module>opendj-cli</module>
- <module>opendj-ldap-toolkit</module>
- <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>
+<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>
- <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>
+ <parent>
+ <groupId>org.forgerock</groupId>
+ <artifactId>forgerock-parent</artifactId>
+ <version>2.0.3</version>
+ </parent>
- <!-- 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>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-sdk</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
- <checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
+ <packaging>pom</packaging>
- <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>
+ <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>
- </plugins>
- <pluginManagement>
- <plugins>
- <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>${i18nFrameworkVersion}</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 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>
+ <issueManagement>
+ <system>Jira</system>
+ <url>https://bugster.forgerock.org/jira/browse/OPENDJ</url>
+ </issueManagement>
- <!-- Provides build capabilities for docs in DocBook XML format. -->
- <plugin>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>forgerock-doc-maven-plugin</artifactId>
- <version>${frDocPluginVersion}</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>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>i18n-core</artifactId>
- <version>${i18nFrameworkVersion}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>i18n-slf4j</artifactId>
- <version>${i18nFrameworkVersion}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4jVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4jVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>forgerock-util</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert</artifactId>
- <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>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <profiles>
- <profile>
- <id>precommit</id>
- <build>
+ <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-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>
+ <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>
+
+ <modules>
+ <module>opendj-copyright-maven-plugin</module>
+ <module>opendj-doc-maven-plugin</module>
+ <module>opendj-core</module>
+ <module>opendj-grizzly</module>
+ <module>opendj-cli</module>
+ <module>opendj-ldap-toolkit</module>
+ <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>
+
+ <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/>
+ <!--
+ | 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>
+
+
+ <build>
<plugins>
- <plugin>
- <groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-copyright-maven-plugin</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <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>
- <version>3.0.0-SNAPSHOT</version>
- <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
- ! * 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>
+ <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>
- </build>
- </profile>
- </profiles>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <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 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>
+
+
+ <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>
+
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-core</artifactId>
+ <version>${i18n-framework.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-slf4j</artifactId>
+ <version>${i18n-framework.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>forgerock-util</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.easytesting</groupId>
+ <artifactId>fest-assert</artifactId>
+ <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>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+
+ <profiles>
+ <profile>
+ <id>precommit</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-copyright-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <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>
+ <version>3.0.0-SNAPSHOT</version>
+ <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
+ ! * 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