directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r555858 - in /directory/shared/trunk: asn1-codec/pom.xml asn1/pom.xml convert/pom.xml ldap-constants/pom.xml ldap/pom.xml pom.xml
Date Fri, 13 Jul 2007 03:36:41 GMT
Author: ccustine
Date: Thu Jul 12 20:36:40 2007
New Revision: 555858

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

Modified:
    directory/shared/trunk/asn1-codec/pom.xml
    directory/shared/trunk/asn1/pom.xml
    directory/shared/trunk/convert/pom.xml
    directory/shared/trunk/ldap-constants/pom.xml
    directory/shared/trunk/ldap/pom.xml
    directory/shared/trunk/pom.xml

Modified: directory/shared/trunk/asn1-codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1-codec/pom.xml?view=diff&rev=555858&r1=555857&r2=555858
==============================================================================
--- directory/shared/trunk/asn1-codec/pom.xml (original)
+++ directory/shared/trunk/asn1-codec/pom.xml Thu Jul 12 20:36:40 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.shared</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>shared-parent</artifactId>
     <version>0.9.7-SNAPSHOT</version>
   </parent>
   <artifactId>shared-asn1-codec</artifactId>
@@ -20,12 +20,6 @@
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <scope>provided</scope>
     </dependency>
 
   </dependencies>

Modified: directory/shared/trunk/asn1/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/pom.xml?view=diff&rev=555858&r1=555857&r2=555858
==============================================================================
--- directory/shared/trunk/asn1/pom.xml (original)
+++ directory/shared/trunk/asn1/pom.xml Thu Jul 12 20:36:40 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.shared</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>shared-parent</artifactId>
     <version>0.9.7-SNAPSHOT</version>
   </parent>
   <artifactId>shared-asn1</artifactId>
@@ -17,6 +17,7 @@
     </site>
   </distributionManagement>
 
+<!--
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -24,6 +25,7 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
+-->
 
   <build>
     <plugins>

Modified: directory/shared/trunk/convert/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/convert/pom.xml?view=diff&rev=555858&r1=555857&r2=555858
==============================================================================
--- directory/shared/trunk/convert/pom.xml (original)
+++ directory/shared/trunk/convert/pom.xml Thu Jul 12 20:36:40 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.shared</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>shared-parent</artifactId>
     <version>0.9.7-SNAPSHOT</version>
   </parent>
   <artifactId>shared-converter</artifactId>
@@ -47,12 +47,6 @@
   </licenses>
 
   <dependencies>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>

Modified: directory/shared/trunk/ldap-constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/pom.xml?view=diff&rev=555858&r1=555857&r2=555858
==============================================================================
--- directory/shared/trunk/ldap-constants/pom.xml (original)
+++ directory/shared/trunk/ldap-constants/pom.xml Thu Jul 12 20:36:40 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.shared</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>shared-parent</artifactId>
     <version>0.9.7-SNAPSHOT</version>
   </parent>
   <artifactId>shared-ldap-constants</artifactId>

Modified: directory/shared/trunk/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/pom.xml?view=diff&rev=555858&r1=555857&r2=555858
==============================================================================
--- directory/shared/trunk/ldap/pom.xml (original)
+++ directory/shared/trunk/ldap/pom.xml Thu Jul 12 20:36:40 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.shared</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>shared-parent</artifactId>
     <version>0.9.7-SNAPSHOT</version>
   </parent>
   <artifactId>shared-ldap</artifactId>
@@ -47,12 +47,6 @@
   </licenses>
 
   <dependencies>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
     <dependency>
       <groupId>commons-lang</groupId>

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?view=diff&rev=555858&r1=555857&r2=555858
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Thu Jul 12 20:36:40 2007
@@ -7,7 +7,7 @@
     <version>7</version>
   </parent>
   <groupId>org.apache.directory.shared</groupId>
-  <artifactId>build</artifactId>
+  <artifactId>shared-parent</artifactId>
   <name>Apache Directory Shared</name>
   <packaging>pom</packaging>  
   <version>0.9.7-SNAPSHOT</version>
@@ -21,11 +21,27 @@
   </modules>
 
   <dependencies>
+
+    <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>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
+      <scope>test</scope>
     </dependency>
+
   </dependencies>
 
   <dependencyManagement>
@@ -44,14 +60,14 @@
 
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>nlog4j</artifactId>
-        <version>1.2.25</version>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.4.0</version>
       </dependency>
- 
+
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-simple</artifactId>
-        <version>1.4.0</version>
+        <artifactId>nlog4j</artifactId>
+        <version>1.2.25</version>
       </dependency>
  
       <dependency>



Mime
View raw message