OPENDJ-1301-1306 modified pom and ivy to add dependency to opendj-cli and o...

Violette Roche-Montane

04.22.2014 78538b1aae828b910e69bd9c8978366c583c561d

OPENDJ-1301-1306 modified pom and ivy to add dependency to opendj-cli and opendj-server

 opendj-sdk/opendj3-server-dev/ivy.xml

@@ -51,9 +51,15 @@
    <dependency org="javax.servlet"         name="javax.servlet-api"        rev="[3.1-b02]" />
    <dependency org="com.sleepycat"         name="je"                       rev="5.0.103" />
    <dependency org="org.forgerock.opendj"  name="opendj-rest2ldap-servlet" rev="&opendj.sdk.version;" conf="default->master,compile" />
     <dependency org="org.forgerock.opendj"  name="opendj-slf4j-adapter" rev="&opendj.sdk.version;" />
    <dependency org="org.forgerock.commons"  name="i18n-slf4j"  rev="&i18n.version;" />
    <dependency org="org.forgerock.opendj"  name="opendj-server2x-adapter"  rev="&opendj.sdk.version;" />
    <dependency org="org.forgerock.opendj"  name="opendj-slf4j-adapter"     rev="&opendj.sdk.version;" />
    <dependency org="org.forgerock.commons" name="i18n-slf4j"               rev="&i18n.version;" />
    <dependency org="org.forgerock.opendj"  name="opendj-cli"               rev="&opendj.sdk.version;" />    
    <dependency org="org.forgerock.opendj"  name="opendj-server2x-adapter"  rev="&opendj.sdk.version;">
      <exclude module="opendj-server" /> 	
    </dependency>
    <dependency org="org.forgerock.opendj"  name="opendj-server"            rev="&opendj.sdk.version;">
      <exclude module="opendj-config" /> 	
    </dependency>
    <dependency org="org.glassfish.grizzly" name="grizzly-http-servlet"     rev="&grizzly.version;">
      <exclude module="javax.servlet-api" />
    </dependency>
@@ -85,7 +91,6 @@

    <exclude org="javax.activation" artifact="activation" />
    <!-- This is already the OpenDJ server module :) -->
    <exclude  module="opendj-server"/>
    <exclude  module="opendj3-server-dev"/>
  </dependencies>
</ivy-module>

 opendj-sdk/opendj3-server-dev/pom-maven.xml

@@ -111,6 +111,11 @@
      <groupId>com.sleepycat</groupId>
      <artifactId>je</artifactId>
      <version>5.0.84</version>
    </dependency>    
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-server</artifactId>
      <version>${parent.version}</version>
    </dependency>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>