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

Matthew Swift
03.36.2013 61d4a9f9d5d9ffb8886cbae50fb33da71b3cb7f2
Additional fix for OPENDJ-176: Use SLF4J for logging in the SDK

* add slf4j-jdk14 compile dependency for the examples, toolkit, and rest2ldap servlet
* add slf4j-jdk14 test dependency for all sub-modules.
5 files modified
66 ■■■■ changed files
opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml 9 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml 16 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml 17 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml 8 ●●●●● patch | view | raw | blame | history
opendj-sdk/opendj3/pom.xml 16 ●●●●● patch | view | raw | blame | history
opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
@@ -39,7 +39,14 @@
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-ldap-sdk</artifactId>
      <version>${project.version}</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-api</artifactId>
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-jdk14</artifactId>
    </dependency>
  </dependencies>
  <build>
opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml
@@ -47,7 +47,10 @@
      <groupId>org.glassfish.grizzly</groupId>
      <artifactId>grizzly-framework</artifactId>
      <version>${grizzlyFrameworkVersion}</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-api</artifactId>
    </dependency>
    <dependency>
      <groupId>org.forgerock</groupId>
@@ -55,17 +58,6 @@
      <version>${forgerockBuildToolsVersion}</version>
      <scope>test</scope>
    </dependency>
    <dependency>
        <groupId>org.slf4j</groupId>
        <artifactId>slf4j-api</artifactId>
        <version>1.7.5</version>
    </dependency>
    <dependency>
        <groupId>org.slf4j</groupId>
        <artifactId>slf4j-jdk14</artifactId>
        <version>1.7.5</version>
        <scope>test</scope>
    </dependency>
  </dependencies>
  <properties>
    <opendj.osgi.import>
opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml
@@ -42,7 +42,18 @@
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-ldap-sdk</artifactId>
      <version>${project.version}</version>
      <scope>compile</scope>
    </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</groupId>
@@ -50,10 +61,6 @@
      <version>${forgerockBuildToolsVersion}</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.forgerock.commons</groupId>
      <artifactId>i18n-core</artifactId>
    </dependency>
  </dependencies>
  <build>
    <plugins>
opendj-sdk/opendj3/opendj-rest2ldap-servlet/pom.xml
@@ -53,6 +53,14 @@
            <scope>runtime</scope>
        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-jdk14</artifactId>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
            <version>3.0.1</version>
opendj-sdk/opendj3/pom.xml
@@ -106,6 +106,7 @@
    <siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
    <i18nFrameworkVersion>1.4.0</i18nFrameworkVersion>
    <grizzlyFrameworkVersion>2.3.6</grizzlyFrameworkVersion>
    <slf4jVersion>1.7.5</slf4jVersion>
    <forgerockRestVersion>2.1.0-SNAPSHOT</forgerockRestVersion>
    <gaId>UA-23412190-8</gaId>
    <!-- OSGi bundles properties -->
@@ -448,6 +449,16 @@
        <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>
    </dependencies>
  </dependencyManagement>
  <dependencies>
@@ -469,6 +480,11 @@
      <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>