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 2012/02/22 23:38:38 UTC

svn commit: r1292560 - in /directory/apacheds/trunk: all/pom.xml jdbm-partition/pom.xml pom.xml protocol-ldap/pom.xml

Author: elecharny
Date: Wed Feb 22 22:38:37 2012
New Revision: 1292560

URL: http://svn.apache.org/viewvc?rev=1292560&view=rev
Log:
Referenced the JDBM project which is not anymore part of ApacheDS project

Modified:
    directory/apacheds/trunk/all/pom.xml
    directory/apacheds/trunk/jdbm-partition/pom.xml
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/protocol-ldap/pom.xml

Modified: directory/apacheds/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/all/pom.xml?rev=1292560&r1=1292559&r2=1292560&view=diff
==============================================================================
--- directory/apacheds/trunk/all/pom.xml (original)
+++ directory/apacheds/trunk/all/pom.xml Wed Feb 22 22:38:37 2012
@@ -72,8 +72,8 @@
     </dependency>
     
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-jdbm2</artifactId>
+      <groupId>org.apache.directory.jdbm</groupId>
+      <artifactId>apacheds-jdbm</artifactId>
     </dependency>
     
     <dependency>

Modified: directory/apacheds/trunk/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/pom.xml?rev=1292560&r1=1292559&r2=1292560&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-partition/pom.xml Wed Feb 22 22:38:37 2012
@@ -56,8 +56,8 @@
     </dependency>
     
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-jdbm2</artifactId>
+      <groupId>org.apache.directory.jdbm</groupId>
+      <artifactId>apacheds-jdbm</artifactId>
     </dependency>
     
     <dependency>

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=1292560&r1=1292559&r2=1292560&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Wed Feb 22 22:38:37 2012
@@ -48,6 +48,7 @@
     <org.apache.directory.shared.version>1.0.0-M11-SNAPSHOT</org.apache.directory.shared.version>
     <org.apache.directory.checkstyle-configuration.version>0.1</org.apache.directory.checkstyle-configuration.version>
     <org.apache.directory.junit.junit-addons.version>0.1</org.apache.directory.junit.junit-addons.version>
+    <org.apache.directory.jdbm.version>2.0.0-SNAPSHOT</org.apache.directory.jdbm.version>
     <skin.version>1.0.2</skin.version>
     
     <!-- Set versions for depending jars -->
@@ -65,6 +66,7 @@
     <derby.version>10.8.2.2</derby.version>
     <dnsjava.version>2.1.1</dnsjava.version>
     <ehcache.version>2.4.4</ehcache.version>
+    <findbugs.annotations.version>1.0.0</findbugs.annotations.version>
     <jetty.version>6.1.14</jetty.version>
     <jug.asl.version>2.0.0.RC1</jug.asl.version>
     <junit.version>4.10</junit.version>
@@ -76,13 +78,14 @@
     <maven.project.version>3.0-alpha-2</maven.project.version>
     <mina.core.version>2.0.4</mina.core.version>
     <plexus.utils.version>3.0</plexus.utils.version>
+    <mina.core.version>2.0.4</mina.core.version>
+    <plexus.utils.version>3.0</plexus.utils.version>
     <quartz.version>1.6.3</quartz.version>
     <slf4j.api.version>1.6.4</slf4j.api.version>
     <slf4j.log4j12.version>1.6.4</slf4j.log4j12.version>
     <velocity.version>1.7-beta1</velocity.version>
     <wrapper.version>3.2.3</wrapper.version>
     <xercesImpl.version>2.10.0</xercesImpl.version>
-    <findbugs.annotations.version>1.0.0</findbugs.annotations.version>
   </properties>
 
   <url>http://directory.apache.org/apacheds/1.5</url>
@@ -102,8 +105,6 @@
   <modules>
     <module>i18n</module>
     <module>all</module>
-    <module>jdbm</module>
-    <module>jdbm2</module>
     <module>jdbm-partition</module>
     <module>xdbm-partition</module>
     <module>xdbm-tools</module>
@@ -209,8 +210,6 @@
               <exclude>**/*.ldif</exclude>
               <!-- PDU_FILES_EXCLUDES -->
               <exclude>**/*.pdu</exclude>
-              <!-- JDBM_FILES_EXCLUDES -->
-              <exclude>jdbm/**/*</exclude>
               <!-- INSTALLERS_FILES_EXCLUDES -->
               <exclude>installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/control</exclude>
               <exclude>installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/License.rtf</exclude>
@@ -598,6 +597,12 @@
         <version>${project.version}</version>
       </dependency>
       
+      <dependency>
+        <groupId>org.apache.directory.jdbm</groupId>
+        <artifactId>apacheds-jdbm</artifactId>
+        <version>${org.apache.directory.jdbm.version}</version>
+      </dependency>
+     
       <!-- Interceptors --> 
       <dependency>
         <groupId>${project.groupId}</groupId>
@@ -700,20 +705,8 @@
         <artifactId>apacheds-interceptors-trigger</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <!-- Interceptors --> 
-
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>apacheds-jdbm</artifactId>
-        <version>${project.version}</version>
-      </dependency>
 
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>apacheds-jdbm2</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      
+      <!-- Interceptors --> 
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>apacheds-jdbm-partition</artifactId>
@@ -1281,3 +1274,12 @@
     </repository>
   </repositories>
 </project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance

Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?rev=1292560&r1=1292559&r2=1292560&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Wed Feb 22 22:38:37 2012
@@ -59,8 +59,8 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-jdbm2</artifactId>
+      <groupId>org.apache.directory.jdbm</groupId>
+      <artifactId>apacheds-jdbm</artifactId>
     </dependency>
 
     <dependency>