You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/01/27 11:45:29 UTC

svn commit: r903600 - in /directory/apacheds/trunk: all/ core-annotations/ core-avl/ core-constants/ core-entry/ core-integ/ core-jndi/ core-mock/ core/ default-config/ http-integration/ i18n/ interceptor-kerberos/ jdbm-partition/ jdbm-store/ jdbm/ ker...

Author: elecharny
Date: Wed Jan 27 10:45:27 2010
New Revision: 903600

URL: http://svn.apache.org/viewvc?rev=903600&view=rev
Log:
o Cleaned the poms
o refers to version from the parent's pom

Modified:
    directory/apacheds/trunk/all/pom.xml
    directory/apacheds/trunk/core-annotations/pom.xml
    directory/apacheds/trunk/core-avl/pom.xml
    directory/apacheds/trunk/core-constants/pom.xml
    directory/apacheds/trunk/core-entry/pom.xml
    directory/apacheds/trunk/core-integ/pom.xml
    directory/apacheds/trunk/core-jndi/pom.xml
    directory/apacheds/trunk/core-mock/pom.xml
    directory/apacheds/trunk/core/pom.xml
    directory/apacheds/trunk/default-config/pom.xml
    directory/apacheds/trunk/http-integration/pom.xml
    directory/apacheds/trunk/i18n/pom.xml
    directory/apacheds/trunk/interceptor-kerberos/pom.xml
    directory/apacheds/trunk/jdbm-partition/pom.xml
    directory/apacheds/trunk/jdbm-store/pom.xml
    directory/apacheds/trunk/jdbm/pom.xml
    directory/apacheds/trunk/kerberos-shared/pom.xml
    directory/apacheds/trunk/kerberos-test/pom.xml
    directory/apacheds/trunk/ldif-partition/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/server-annotations/pom.xml
    directory/apacheds/trunk/server-integ/pom.xml
    directory/apacheds/trunk/server-replication/pom.xml
    directory/apacheds/trunk/server-tools/pom.xml

Modified: directory/apacheds/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/all/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/all/pom.xml (original)
+++ directory/apacheds/trunk/all/pom.xml Wed Jan 27 10:45:27 2010
@@ -33,233 +33,233 @@
 
   <dependencies>
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-avl-partition</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-core</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-core-annotations</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-core-api</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-core-avl</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-core-constants</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-core-entry</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <!-- 
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-core-integ</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
      -->
      
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-core-jndi</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-core-mock</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <!-- 
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-http-integration</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     -->
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-interceptor-kerberos</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-jdbm</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-jdbm-partition</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-jdbm-store</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <!-- 
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-kerberos-test</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
      -->
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-ldif-partition</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-protocol-changepw</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-protocol-dhcp</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-protocol-dns</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-protocol-kerberos</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-protocol-ldap</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-protocol-ntp</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-server-annotations</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <!-- 
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-server-integ</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
      -->
      
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-server-jndi</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-server-replication</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <!-- 
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-server-tools</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
      -->
      
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-server-xml</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-test-framework</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-utils</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-xbean-spring</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-xdbm-base</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-xdbm-search</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>${groupId}</groupId>
       <artifactId>apacheds-xdbm-tools</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>
   </dependencies>

Modified: directory/apacheds/trunk/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/pom.xml (original)
+++ directory/apacheds/trunk/core-annotations/pom.xml Wed Jan 27 10:45:27 2010
@@ -9,7 +9,6 @@
   
   <artifactId>apacheds-core-annotations</artifactId>
   <packaging>jar</packaging>
-  <version>1.5.6-SNAPSHOT</version>
   <name>ApacheDS Core Annotations</name>
   <description>Annotations used to define a DirectoryService</description>
   
@@ -17,35 +16,37 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
     </dependency>
 
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
+      <version>${commons.io.version}</version>
     </dependency>
 
     <dependency>
       <artifactId>apacheds-i18n</artifactId>
       <groupId>${groupId}</groupId>
       <version>${version}</version>
-    </dependency>  
+    </dependency>
 
     <dependency>
       <artifactId>apacheds-core-jndi</artifactId>
       <groupId>${groupId}</groupId>
       <version>${version}</version>
-    </dependency>  
+    </dependency>
 
     <dependency>
       <artifactId>apacheds-jdbm-partition</artifactId>
       <groupId>${groupId}</groupId>
       <version>${version}</version>
-    </dependency>  
+    </dependency>
 
     <dependency>
       <artifactId>apacheds-ldif-partition</artifactId>
       <groupId>${groupId}</groupId>
       <version>${version}</version>
-    </dependency>  
+    </dependency>
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/pom.xml (original)
+++ directory/apacheds/trunk/core-avl/pom.xml Wed Jan 27 10:45:27 2010
@@ -34,11 +34,10 @@
 
   <dependencies>
     <dependency>
+      <artifactId>apacheds-xdbm-base</artifactId>
       <groupId>${groupId}</groupId>
       <version>${version}</version>
-      <artifactId>apacheds-xdbm-base</artifactId>
     </dependency>
   </dependencies>
-  
 </project>
 

Modified: directory/apacheds/trunk/core-constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-constants/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/core-constants/pom.xml (original)
+++ directory/apacheds/trunk/core-constants/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-core-constants</artifactId>
   <name>ApacheDS Core Constants</name>
   <packaging>jar</packaging>

Modified: directory/apacheds/trunk/core-entry/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/pom.xml (original)
+++ directory/apacheds/trunk/core-entry/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-core-entry</artifactId>
   <name>ApacheDS Core Entry</name>
 
@@ -37,9 +38,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 

Modified: directory/apacheds/trunk/core-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/pom.xml (original)
+++ directory/apacheds/trunk/core-integ/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-core-integ</artifactId>
   <name>ApacheDS Core Integration</name>
   <packaging>jar</packaging>  
@@ -36,27 +37,29 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
+    </dependency>  
+
+    <dependency>
+      <artifactId>apacheds-test-framework</artifactId>
+      <groupId>${groupId}</groupId>
       <version>${version}</version>
     </dependency>  
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
+      <version>${commons.io.version}</version>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-test-framework</artifactId>
-      <version>${version}</version>
-    </dependency>  
   </dependencies>
 
   <profiles>

Modified: directory/apacheds/trunk/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/pom.xml (original)
+++ directory/apacheds/trunk/core-jndi/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-core-jndi</artifactId>
   <name>ApacheDS Core JNDI</name>
   <packaging>jar</packaging>
@@ -40,15 +41,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 
@@ -66,6 +67,7 @@
           </systemProperties>
         </configuration>
       </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>

Modified: directory/apacheds/trunk/core-mock/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/pom.xml (original)
+++ directory/apacheds/trunk/core-mock/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,21 +26,20 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+
   <artifactId>apacheds-core-mock</artifactId>
   <name>ApacheDS Core Mock</name>
-
   <description>
     Some commonly used mock objects that have more than bare minimum of functionality.
   </description>
+  <packaging>jar</packaging>
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-api</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
-
-  <packaging>jar</packaging>
 </project>
 

Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Wed Jan 27 10:45:27 2010
@@ -47,7 +47,7 @@
     <dependency>
       <artifactId>apacheds-core-api</artifactId>
       <groupId>${groupId}</groupId>
-      <version>${pom.version}</version>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
@@ -65,6 +65,7 @@
     <dependency>
       <groupId>bouncycastle</groupId>
       <artifactId>bcprov-jdk15</artifactId>
+      <version>${bcprov.version}</version>
     </dependency>
   </dependencies>
 

Modified: directory/apacheds/trunk/default-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/default-config/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/default-config/pom.xml (original)
+++ directory/apacheds/trunk/default-config/pom.xml Wed Jan 27 10:45:27 2010
@@ -6,75 +6,74 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.directory.server.config</groupId>
   <artifactId>apacheds-default-config</artifactId>
   <name>apacheds-default-config</name>
-  <version>1.5.6-SNAPSHOT</version>
 
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.7</version>
+      <version>${junit.version}</version>
     </dependency>
 
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
+      <version>${commons.io.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-jndi</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-partition</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-ldif-partition</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-ldap</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-kerberos</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-dns</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-dhcp</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-ntp</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server.http</groupId>
       <artifactId>apacheds-http-integration</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/http-integration/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-integration/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/http-integration/pom.xml (original)
+++ directory/apacheds/trunk/http-integration/pom.xml Wed Jan 27 10:45:27 2010
@@ -25,32 +25,30 @@
     <groupId>org.apache.directory.server</groupId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.directory.server.http</groupId>
   <artifactId>apacheds-http-integration</artifactId>
   <name>ApacheDS Jetty HTTP Server Integration</name>
-  <version>1.5.6-SNAPSHOT</version>
-  
-  <properties>
-   <jetty.version>6.1.14</jetty.version>
-  </properties>
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
+    
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
       <version>${jetty.version}</version>
     </dependency>
+    
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>servlet-api-2.5</artifactId>
       <version>${jetty.version}</version>
     </dependency>
+    
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-util</artifactId>
@@ -75,5 +73,4 @@
       </plugin>
    </plugins>
   </build>
-  
 </project>
\ No newline at end of file

Modified: directory/apacheds/trunk/i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/pom.xml (original)
+++ directory/apacheds/trunk/i18n/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,9 +26,9 @@
     <groupId>org.apache.directory.server</groupId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <groupId>org.apache.directory.server</groupId>
   <artifactId>apacheds-i18n</artifactId>
-  <version>1.5.6-SNAPSHOT</version>
   <name>ApacheDS I18n</name>
   
   <description>Internationalization of errors and other messages</description>

Modified: directory/apacheds/trunk/interceptor-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/pom.xml (original)
+++ directory/apacheds/trunk/interceptor-kerberos/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-interceptor-kerberos</artifactId>
   <name>ApacheDS Interceptors for Kerberos</name>
   <packaging>jar</packaging>
@@ -36,21 +37,21 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 
@@ -68,6 +69,7 @@
           </systemProperties>
         </configuration>
       </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>

Modified: directory/apacheds/trunk/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-partition/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-jdbm-partition</artifactId>
   <name>ApacheDS JDBM Partition</name>
   <packaging>jar</packaging>
@@ -36,19 +37,21 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-store</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
+    
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
+    
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-xdbm-search</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 
@@ -69,6 +72,5 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
 

Modified: directory/apacheds/trunk/jdbm-store/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-store/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-jdbm-store</artifactId>
   <name>ApacheDS JDBM Store</name>
   <packaging>jar</packaging>
@@ -42,36 +43,35 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <version>${pom.version}</version>
       <artifactId>apacheds-jdbm</artifactId>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-core-entry</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-core-avl</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-xdbm-tools</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>
@@ -91,6 +91,5 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
 

Modified: directory/apacheds/trunk/jdbm/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/pom.xml (original)
+++ directory/apacheds/trunk/jdbm/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-jdbm</artifactId>
   <name>ApacheDS JDBM implementation</name>
 
@@ -37,9 +38,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/kerberos-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/pom.xml (original)
+++ directory/apacheds/trunk/kerberos-shared/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-kerberos-shared</artifactId>
   <name>ApacheDS Protocol Kerberos Shared</name>
 
@@ -37,22 +38,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <!-- TODO remove dependency on JNDI core -->
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-jndi</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/kerberos-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-test/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-test/pom.xml (original)
+++ directory/apacheds/trunk/kerberos-test/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-kerberos-test</artifactId>
   <name>ApacheDS Protocol Kerberos Test</name>
 
@@ -37,34 +38,34 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
     
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-kerberos</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-test-framework</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-partition</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-interceptor-kerberos</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 
@@ -78,6 +79,7 @@
           </excludes>
         </configuration>
       </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
@@ -93,6 +95,5 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
 

Modified: directory/apacheds/trunk/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/pom.xml (original)
+++ directory/apacheds/trunk/ldif-partition/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-ldif-partition</artifactId>
   <name>ApacheDS LDIF Partition</name>
   <packaging>jar</packaging>
@@ -36,21 +37,21 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-avl-partition</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-mock</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 

Modified: directory/apacheds/trunk/protocol-changepw/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/pom.xml (original)
+++ directory/apacheds/trunk/protocol-changepw/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-protocol-changepw</artifactId>
   <name>ApacheDS Protocol Change Password</name>
 
@@ -37,14 +38,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
+    
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 
@@ -65,6 +67,5 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
 

Modified: directory/apacheds/trunk/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dhcp/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-protocol-dhcp</artifactId>
   <name>ApacheDS Protocol Dhcp</name>
 
@@ -37,9 +38,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dns/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-protocol-dns</artifactId>
   <name>ApacheDS Protocol Dns</name>
 
@@ -36,24 +37,23 @@
   <packaging>jar</packaging>  
 
   <dependencies>
-
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <!-- TODO remove dependency on JNDI core -->
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-jndi</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 
@@ -74,6 +74,5 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
 

Modified: directory/apacheds/trunk/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/trunk/protocol-kerberos/pom.xml Wed Jan 27 10:45:27 2010
@@ -40,21 +40,21 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-partition</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -69,6 +69,7 @@
           </excludes>
         </configuration>
       </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
@@ -84,6 +85,5 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
 

Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Wed Jan 27 10:45:27 2010
@@ -37,21 +37,21 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-xdbm-tools</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
   </dependencies>
 
@@ -72,6 +72,5 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
 

Modified: directory/apacheds/trunk/protocol-ntp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ntp/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ntp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ntp/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-protocol-ntp</artifactId>
   <name>ApacheDS Protocol Ntp</name>
 
@@ -37,14 +38,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -66,6 +68,5 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
 

Modified: directory/apacheds/trunk/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/pom.xml (original)
+++ directory/apacheds/trunk/protocol-shared/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <groupId>org.apache.directory.server</groupId>
   <artifactId>apacheds-protocol-shared</artifactId>
 
@@ -38,20 +39,21 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
+      <version>${mina.core.version}</version>
     </dependency>
   </dependencies>
 
@@ -72,5 +74,4 @@
       </plugin>
     </plugins>
   </build>
-  
 </project>

Modified: directory/apacheds/trunk/server-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/pom.xml (original)
+++ directory/apacheds/trunk/server-annotations/pom.xml Wed Jan 27 10:45:27 2010
@@ -39,25 +39,25 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.7</version>
+      <version>${junit.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-annotations</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>  
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-ldap</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>  
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-kerberos</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>  
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/pom.xml (original)
+++ directory/apacheds/trunk/server-integ/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-server-integ</artifactId>
   <name>ApacheDS Server Integration</name>
   <packaging>jar</packaging>  
@@ -38,30 +39,33 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
+      <version>${commons.net.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-interceptor-kerberos</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>  
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-integ</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>  
 
     <dependency>
       <groupId>ldapsdk</groupId>
       <artifactId>ldapsdk</artifactId>
+      <version>${ldapsdk.version}</version>
     </dependency>  
   </dependencies>
 

Modified: directory/apacheds/trunk/server-replication/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-replication/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/server-replication/pom.xml (original)
+++ directory/apacheds/trunk/server-replication/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-server-replication</artifactId>
   <name>ApacheDS Server Replication Service</name>
   <description>
@@ -36,11 +37,10 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>  
   </dependencies>
-  
 </project>
 

Modified: directory/apacheds/trunk/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/pom.xml?rev=903600&r1=903599&r2=903600&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/pom.xml (original)
+++ directory/apacheds/trunk/server-tools/pom.xml Wed Jan 27 10:45:27 2010
@@ -26,6 +26,7 @@
     <artifactId>apacheds-parent</artifactId>
     <version>1.5.6-SNAPSHOT</version>
   </parent>
+  
   <artifactId>apacheds-server-tools</artifactId>
   <name>ApacheDS Server Tools</name>
 
@@ -38,21 +39,21 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-xml</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-jndi</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-partition</artifactId>
-      <version>${pom.version}</version>
+      <groupId>${groupId}</groupId>
+      <version>${version}</version>
     </dependency>
 
     <dependency>