directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r555884 - in /directory/apacheds/trunk: ./ benchmarks/ bootstrap-extract/ bootstrap-partition/ bootstrap-plugin/ btree-base/ constants/ core-plugin/ core-shared/ core-unit/ core/ jdbm-store/ kerberos-shared/ mitosis/ protocol-changepw/ prot...
Date Fri, 13 Jul 2007 05:55:15 GMT
Author: ccustine
Date: Thu Jul 12 22:55:14 2007
New Revision: 555884

URL: http://svn.apache.org/viewvc?view=rev&rev=555884
Log:
DIRSERVER-977 - Rename parent artifactId to be unique within project.
DIRSERVER-995 - Cleaning up slf4j dependency defs in poms.

Modified:
    directory/apacheds/trunk/benchmarks/pom.xml
    directory/apacheds/trunk/bootstrap-extract/pom.xml
    directory/apacheds/trunk/bootstrap-partition/pom.xml
    directory/apacheds/trunk/bootstrap-plugin/pom.xml
    directory/apacheds/trunk/btree-base/pom.xml
    directory/apacheds/trunk/constants/pom.xml
    directory/apacheds/trunk/core-plugin/pom.xml
    directory/apacheds/trunk/core-shared/pom.xml
    directory/apacheds/trunk/core-unit/pom.xml
    directory/apacheds/trunk/core/pom.xml
    directory/apacheds/trunk/jdbm-store/pom.xml
    directory/apacheds/trunk/kerberos-shared/pom.xml
    directory/apacheds/trunk/mitosis/pom.xml
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/protocol-changepw/pom.xml
    directory/apacheds/trunk/protocol-dhcp/pom.xml
    directory/apacheds/trunk/protocol-dns/pom.xml
    directory/apacheds/trunk/protocol-kerberos/pom.xml
    directory/apacheds/trunk/protocol-ldap/pom.xml
    directory/apacheds/trunk/protocol-ntp/pom.xml
    directory/apacheds/trunk/protocol-shared/pom.xml
    directory/apacheds/trunk/sar-plugin/pom.xml
    directory/apacheds/trunk/schema-bootstrap/pom.xml
    directory/apacheds/trunk/schema-extras/pom.xml
    directory/apacheds/trunk/schema-registries/pom.xml
    directory/apacheds/trunk/server-installers/pom.xml
    directory/apacheds/trunk/server-jndi/pom.xml
    directory/apacheds/trunk/server-main/pom.xml
    directory/apacheds/trunk/server-replication/pom.xml
    directory/apacheds/trunk/server-sar/pom.xml
    directory/apacheds/trunk/server-tools/pom.xml
    directory/apacheds/trunk/server-unit/pom.xml
    directory/apacheds/trunk/utils/pom.xml

Modified: directory/apacheds/trunk/benchmarks/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/benchmarks/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/benchmarks/pom.xml (original)
+++ directory/apacheds/trunk/benchmarks/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-benchmarks</artifactId>
@@ -15,11 +15,5 @@
 
   <packaging>jar</packaging>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-    </dependency>
-  </dependencies>
 </project>
 

Modified: directory/apacheds/trunk/bootstrap-extract/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-extract/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/bootstrap-extract/pom.xml (original)
+++ directory/apacheds/trunk/bootstrap-extract/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-bootstrap-extract</artifactId>
@@ -22,11 +22,11 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
+    <!--<dependency>-->
+      <!--<groupId>org.slf4j</groupId>-->
+      <!--<artifactId>nlog4j</artifactId>-->
+      <!--<scope>provided</scope>-->
+    <!--</dependency>-->
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/apacheds/trunk/bootstrap-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-partition/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/bootstrap-partition/pom.xml (original)
+++ directory/apacheds/trunk/bootstrap-partition/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-bootstrap-partition</artifactId>

Modified: directory/apacheds/trunk/bootstrap-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/bootstrap-plugin/pom.xml (original)
+++ directory/apacheds/trunk/bootstrap-plugin/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-bootstrap-plugin</artifactId>

Modified: directory/apacheds/trunk/btree-base/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/btree-base/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/btree-base/pom.xml (original)
+++ directory/apacheds/trunk/btree-base/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-btree-base</artifactId>
@@ -16,11 +16,13 @@
   </description>
 
   <dependencies>
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>${pom.groupId}</groupId>

Modified: directory/apacheds/trunk/constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/constants/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/constants/pom.xml (original)
+++ directory/apacheds/trunk/constants/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-constants</artifactId>

Modified: directory/apacheds/trunk/core-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-plugin/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/core-plugin/pom.xml (original)
+++ directory/apacheds/trunk/core-plugin/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-core-plugin</artifactId>

Modified: directory/apacheds/trunk/core-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/core-shared/pom.xml (original)
+++ directory/apacheds/trunk/core-shared/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-core-shared</artifactId>

Modified: directory/apacheds/trunk/core-unit/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-unit/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/core-unit/pom.xml (original)
+++ directory/apacheds/trunk/core-unit/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-core-unit</artifactId>
@@ -17,11 +17,13 @@
       <scope>provided</scope>
     </dependency>
 
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>commons-io</groupId>

Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-core</artifactId>
@@ -23,11 +23,13 @@
       <scope>test</scope>
     </dependency>
 
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/apacheds/trunk/jdbm-store/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/jdbm-store/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-store/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-jdbm-store</artifactId>
@@ -27,11 +27,13 @@
       <scope>test</scope>
     </dependency>
 
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>jdbm</groupId>

Modified: directory/apacheds/trunk/kerberos-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/pom.xml (original)
+++ directory/apacheds/trunk/kerberos-shared/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-kerberos-shared</artifactId>

Modified: directory/apacheds/trunk/mitosis/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/mitosis/pom.xml (original)
+++ directory/apacheds/trunk/mitosis/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>mitosis</artifactId>

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Thu Jul 12 22:55:14 2007
@@ -9,7 +9,7 @@
   </parent>
 
   <groupId>org.apache.directory.server</groupId>
-  <artifactId>build</artifactId>
+  <artifactId>apacheds-parent</artifactId>
   <version>1.5.1-SNAPSHOT</version>
   <name>ApacheDS</name>
   <packaging>pom</packaging>
@@ -114,17 +114,23 @@
         <version>1.3</version>
       </dependency>
 
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>nlog4j</artifactId>
-        <version>1.2.25</version>
-      </dependency>
+        <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl104-over-slf4j</artifactId>
+          <version>1.4.0</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+          <version>1.4.0</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>nlog4j</artifactId>
+          <version>1.2.25</version>
+        </dependency>
 
       <dependency>
         <groupId>jdbm</groupId>
@@ -255,9 +261,30 @@
     </dependency>
 
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.4.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl104-over-slf4j</artifactId>
+      <version>1.4.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>nlog4j</artifactId>
+      <version>1.2.25</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

Modified: directory/apacheds/trunk/protocol-changepw/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/pom.xml (original)
+++ directory/apacheds/trunk/protocol-changepw/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-changepw</artifactId>
@@ -16,11 +16,13 @@
   <packaging>jar</packaging>  
 
   <dependencies>
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/apacheds/trunk/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dhcp/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-dhcp</artifactId>
@@ -22,11 +22,13 @@
       <scope>test</scope>
     </dependency>
 
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>org.apache.mina</groupId>

Modified: directory/apacheds/trunk/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/protocol-dns/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dns/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-dns</artifactId>
@@ -16,11 +16,13 @@
   <packaging>jar</packaging>  
 
   <dependencies>
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>org.apache.mina</groupId>

Modified: directory/apacheds/trunk/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/trunk/protocol-kerberos/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-kerberos</artifactId>
@@ -16,11 +16,13 @@
   <packaging>jar</packaging>  
 
   <dependencies>
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-ldap</artifactId>
@@ -16,16 +16,18 @@
   <packaging>jar</packaging>  
 
   <dependencies>
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-asn1-codec</artifactId>
-      <version>0.9.6-SNAPSHOT</version>
+      <version>0.9.7-SNAPSHOT</version>
     </dependency>
 
     <dependency>

Modified: directory/apacheds/trunk/protocol-ntp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ntp/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/protocol-ntp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ntp/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-ntp</artifactId>
@@ -16,11 +16,13 @@
   <packaging>jar</packaging>  
 
   <dependencies>
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>org.apache.mina</groupId>

Modified: directory/apacheds/trunk/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/protocol-shared/pom.xml (original)
+++ directory/apacheds/trunk/protocol-shared/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.directory.server</groupId>
@@ -16,6 +16,7 @@
   <name>ApacheDS Protocol Shared</name>
   <packaging>jar</packaging>
 
+<!--
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -23,5 +24,6 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
+-->
 
 </project>

Modified: directory/apacheds/trunk/sar-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/sar-plugin/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/sar-plugin/pom.xml (original)
+++ directory/apacheds/trunk/sar-plugin/pom.xml Thu Jul 12 22:55:14 2007
@@ -1,7 +1,7 @@
 <project>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: directory/apacheds/trunk/schema-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/pom.xml (original)
+++ directory/apacheds/trunk/schema-bootstrap/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-schema-bootstrap</artifactId>
@@ -35,11 +35,13 @@
       <version>${pom.version}</version>
     </dependency>
 
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>jdbm</groupId>

Modified: directory/apacheds/trunk/schema-extras/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-extras/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/schema-extras/pom.xml (original)
+++ directory/apacheds/trunk/schema-extras/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-schema-extras</artifactId>
@@ -15,11 +15,13 @@
   </description>
 
   <dependencies>
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/apacheds/trunk/schema-registries/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-registries/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/schema-registries/pom.xml (original)
+++ directory/apacheds/trunk/schema-registries/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-schema-registries</artifactId>
@@ -16,11 +16,13 @@
   <packaging>jar</packaging>
 
   <dependencies>
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
 
     <dependency>
       <groupId>${pom.groupId}</groupId>

Modified: directory/apacheds/trunk/server-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/server-installers/pom.xml (original)
+++ directory/apacheds/trunk/server-installers/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-installers</artifactId>
@@ -53,6 +53,16 @@
 
     <dependency>
       <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl104-over-slf4j</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
     </dependency>
 
@@ -79,11 +89,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/apacheds/trunk/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/server-jndi/pom.xml (original)
+++ directory/apacheds/trunk/server-jndi/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-jndi</artifactId>
@@ -18,11 +18,13 @@
   <packaging>jar</packaging>  
 
   <dependencies>
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>  
+-->
 
     <!--dependency>
       <groupId>backport-util-concurrent</groupId>

Modified: directory/apacheds/trunk/server-main/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-main/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/server-main/pom.xml (original)
+++ directory/apacheds/trunk/server-main/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-main</artifactId>
@@ -31,6 +31,11 @@
 
     <dependency>
       <groupId>org.slf4j</groupId>
+      <artifactId>jcl104-over-slf4j</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
     </dependency>
 
@@ -42,11 +47,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/apacheds/trunk/server-replication/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-replication/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/server-replication/pom.xml (original)
+++ directory/apacheds/trunk/server-replication/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-replication</artifactId>

Modified: directory/apacheds/trunk/server-sar/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-sar/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/server-sar/pom.xml (original)
+++ directory/apacheds/trunk/server-sar/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-sar</artifactId>
@@ -46,11 +46,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/apacheds/trunk/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/server-tools/pom.xml (original)
+++ directory/apacheds/trunk/server-tools/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-tools</artifactId>

Modified: directory/apacheds/trunk/server-unit/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-unit/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/server-unit/pom.xml (original)
+++ directory/apacheds/trunk/server-unit/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-unit</artifactId>
@@ -21,11 +21,13 @@
       <scope>provided</scope>
     </dependency>  
 
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>  
+-->
 
     <dependency>
       <groupId>ldapsdk</groupId>

Modified: directory/apacheds/trunk/utils/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/utils/pom.xml?view=diff&rev=555884&r1=555883&r2=555884
==============================================================================
--- directory/apacheds/trunk/utils/pom.xml (original)
+++ directory/apacheds/trunk/utils/pom.xml Thu Jul 12 22:55:14 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-utils</artifactId>



Mime
View raw message