OPENDJ-2275 Migrate to Bom 1.0.0

Gaetan Boismal

26.43.2015 74c27ef05a1a1b54a17792cd568699040ea5985b

OPENDJ-2275 Migrate to Bom 1.0.0

* Note that opendj-config and opendj-server-legacy testNG version is not upgraded since we have some test failures (OPENDJ-2389)

 opendj-config/pom.xml

@@ -74,6 +74,14 @@
      <artifactId>opendj-cli</artifactId>
      <version>${project.version}</version>
    </dependency>

    <!-- We need to override testNG version to make test works (see OPENDJ-2389) -->
    <dependency>
      <groupId>org.testng</groupId>
      <artifactId>testng</artifactId>
      <version>6.0.1</version>
      <scope>test</scope>
    </dependency>
  </dependencies>

  <properties>

 opendj-rest2ldap-servlet/pom.xml

@@ -43,7 +43,6 @@
    <dependency>
      <groupId>org.forgerock.http</groupId>
      <artifactId>chf-http-servlet</artifactId>
      <version>0.0.1-SNAPSHOT</version>
    </dependency>

    <dependency>

 opendj-server-legacy/pom.xml

@@ -98,15 +98,18 @@
      <artifactId>opendj-rest2ldap</artifactId>
      <version>${project.version}</version>
    </dependency>

    <dependency>
      <groupId>org.forgerock.commons</groupId>
      <artifactId>i18n-slf4j</artifactId>
    </dependency>

    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-config</artifactId>
      <version>${project.version}</version>
    </dependency>

    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-server</artifactId>
@@ -134,23 +137,21 @@
    <dependency>
      <groupId>org.forgerock.commons</groupId>
      <artifactId>json-resource</artifactId>
      <version>${forgerockRestVersion}</version>
    </dependency>

    <dependency>
      <groupId>org.forgerock.commons</groupId>
      <artifactId>json-resource-http</artifactId>
      <version>${forgerockRestVersion}</version>
    </dependency>
    
    <dependency>
      <groupId>org.forgerock.http</groupId>
      <artifactId>chf-http-core</artifactId>
      <version>${forgerockHttpVersion}</version>
    </dependency>

    <dependency>
      <groupId>org.forgerock.http</groupId>
      <artifactId>chf-http-servlet</artifactId>
      <version>${forgerockHttpVersion}</version>
    </dependency>

    <!-- servlet and mail -->
@@ -159,6 +160,7 @@
      <artifactId>javax.servlet-api</artifactId>
      <version>3.1-b02</version>
    </dependency>

    <dependency>
      <groupId>org.glassfish.grizzly</groupId>
      <artifactId>grizzly-http-servlet</artifactId>
@@ -170,13 +172,14 @@
        </exclusion>
      </exclusions>
    </dependency>

    <dependency>
      <groupId>com.sun.mail</groupId>
      <artifactId>javax.mail</artifactId>
      <version>1.5.1</version>
    </dependency>

    <!-- Tests -->
    <!-- We need to override testNG version to make test works (see OPENDJ-2389) -->
    <dependency>
      <groupId>org.testng</groupId>
      <artifactId>testng</artifactId>
@@ -187,15 +190,15 @@
    <dependency>
      <groupId>org.assertj</groupId>
      <artifactId>assertj-core</artifactId>
      <version>1.7.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>org.mockito</groupId>
      <artifactId>mockito-core</artifactId>
      <version>1.9.5</version>
      <artifactId>mockito-all</artifactId>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-core</artifactId>
@@ -203,6 +206,7 @@
      <version>${project.version}</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>org.freemarker</groupId>
      <artifactId>freemarker</artifactId>
@@ -216,6 +220,7 @@
      <artifactId>je</artifactId>
      <version>5.0.104</version>
    </dependency>

    <dependency>
      <groupId>org.forgerock.commons</groupId>
      <artifactId>forgerock-persistit-core</artifactId>

 pom.xml

@@ -104,9 +104,6 @@

    <forgerock-build-tools.version>1.0.2</forgerock-build-tools.version>
    <i18n-framework.version>1.4.2-SNAPSHOT</i18n-framework.version>
    <slf4jVersion>1.7.5</slf4jVersion>
    <forgerockRestVersion>3.0.0-SNAPSHOT</forgerockRestVersion>
    <forgerockHttpVersion>0.0.1-SNAPSHOT</forgerockHttpVersion>
    <forgerock-doc-plugin.version>3.1.0-SNAPSHOT</forgerock-doc-plugin.version>

    <!-- OSGi bundles properties -->
@@ -351,62 +348,61 @@
      </snapshots>
    </repository>
  </repositories>

  <dependencyManagement>
    <dependencies>
      <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.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>${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>