You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/06/03 17:06:39 UTC
svn commit: r951022 [1/2] - in /directory/apacheds/trunk: ./ all/
avl-partition/ core-annotations/ core-api/ core-avl/ core-constants/
core-integ/ core-jndi/ core-mock/ core/ default-config/ http-integration/
i18n/ interceptor-kerberos/ jdbm-partition/...
Author: pamarcelot
Date: Thu Jun 3 15:06:38 2010
New Revision: 951022
URL: http://svn.apache.org/viewvc?rev=951022&view=rev
Log:
Cleaning in pom.xml files:
o Removed versions from the pom.xml files of sub-modules
o Declared a dependency management for each sub-module
o Removed unnecessary tags
Modified:
directory/apacheds/trunk/all/pom.xml
directory/apacheds/trunk/avl-partition/pom.xml
directory/apacheds/trunk/core-annotations/pom.xml
directory/apacheds/trunk/core-api/pom.xml
directory/apacheds/trunk/core-avl/pom.xml
directory/apacheds/trunk/core-constants/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/ldap-client-test/pom.xml
directory/apacheds/trunk/ldif-partition/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/server-annotations/pom.xml
directory/apacheds/trunk/server-integ/pom.xml
directory/apacheds/trunk/server-jndi/pom.xml
directory/apacheds/trunk/server-replication/pom.xml
directory/apacheds/trunk/server-tools/pom.xml
directory/apacheds/trunk/server-xml/pom.xml
directory/apacheds/trunk/test-framework/pom.xml
directory/apacheds/trunk/xbean-spring/pom.xml
directory/apacheds/trunk/xdbm-search/pom.xml
directory/apacheds/trunk/xdbm-tools/pom.xml
Modified: directory/apacheds/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/all/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/all/pom.xml (original)
+++ directory/apacheds/trunk/all/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,198 +27,159 @@
<artifactId>apacheds-all</artifactId>
<name>ApacheDS All</name>
- <packaging>jar</packaging>
<dependencies>
<dependency>
- <artifactId>apacheds-avl-partition</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-avl-partition</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-core</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-core-annotations</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-annotations</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-core-api</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-api</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-core-avl</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-avl</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-core-constants</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-constants</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-core-jndi</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-jndi</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-core-mock</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-mock</artifactId>
</dependency>
<!--
<dependency>
- <artifactId>apacheds-http-integration</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-http-integration</artifactId>
</dependency>
-->
<dependency>
- <artifactId>apacheds-interceptor-kerberos</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-interceptor-kerberos</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-jdbm</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-jdbm</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-jdbm-partition</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-jdbm-partition</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-jdbm-store</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-jdbm-store</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-kerberos-shared</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-kerberos-shared</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-ldif-partition</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-ldif-partition</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-changepw</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-changepw</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-dhcp</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-dhcp</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-dns</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-dns</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-kerberos</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-kerberos</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-ldap</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-ldap</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-ntp</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-ntp</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-shared</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-shared</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-server-annotations</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-server-annotations</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-server-jndi</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-server-jndi</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-server-replication</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-server-replication</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-server-xml</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-server-xml</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-test-framework</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-test-framework</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-xbean-spring</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-xbean-spring</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-xdbm-search</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-xdbm-search</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-xdbm-tools</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- the parent pom defines commons-io with test scope,
- so including here explicitly to include the classes from commons-io -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <artifactId>apacheds-xdbm-tools</artifactId>
</dependency>
-
</dependencies>
<build>
Modified: directory/apacheds/trunk/avl-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/pom.xml (original)
+++ directory/apacheds/trunk/avl-partition/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,34 +27,28 @@
<artifactId>apacheds-avl-partition</artifactId>
<name>ApacheDS Avl Partition</name>
- <packaging>jar</packaging>
- <description>
- A partition that backs it's entries and indices in AvlTrees within memory.
- </description>
+
+ <description>A partition that backs it's entries and indices in AvlTrees within memory</description>
<dependencies>
<dependency>
- <artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core</artifactId>
</dependency>
-
+
<dependency>
- <artifactId>apacheds-core-avl</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-avl</artifactId>
</dependency>
-
+
<dependency>
- <artifactId>apacheds-core</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-i18n</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-xdbm-search</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-xdbm-search</artifactId>
</dependency>
</dependencies>
@@ -78,4 +70,3 @@
</plugins>
</build>
</project>
-
Modified: directory/apacheds/trunk/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/pom.xml (original)
+++ directory/apacheds/trunk/core-annotations/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,3 +1,22 @@
+<?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
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -8,45 +27,89 @@
</parent>
<artifactId>apacheds-core-annotations</artifactId>
- <packaging>jar</packaging>
<name>ApacheDS Core Annotations</name>
+
<description>Annotations used to define a DirectoryService</description>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-avl-partition</artifactId>
</dependency>
-
+
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-core</artifactId>
</dependency>
-
+
<dependency>
- <artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-api</artifactId>
</dependency>
-
+
<dependency>
- <artifactId>apacheds-core-jndi</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-i18n</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-jdbm-partition</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-jdbm-store</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-ldif-partition</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-xdbm-search</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-loader</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-manager</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldif</artifactId>
</dependency>
</dependencies>
</project>
Modified: directory/apacheds/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/pom.xml (original)
+++ directory/apacheds/trunk/core-api/pom.xml Thu Jun 3 15:06:38 2010
@@ -37,34 +37,79 @@
<dependencies>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-i18n</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-core-constants</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>${commons.collections.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>${commons.lang.version}</version>
</dependency>
<dependency>
- <artifactId>apacheds-i18n</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
-
+
<dependency>
- <artifactId>apacheds-core-constants</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldif</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-constants</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-loader</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-manager</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-cursor</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-i18n</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-asn1</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.client.ldap</groupId>
<artifactId>ldap-client-api</artifactId>
- <version>${org.apache.directory.ldap.client.api.version}</version>
- </dependency>
+ </dependency>
</dependencies>
<build>
Modified: directory/apacheds/trunk/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/pom.xml (original)
+++ directory/apacheds/trunk/core-avl/pom.xml Thu Jun 3 15:06:38 2010
@@ -15,7 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Rev: $ $Date: $ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -26,18 +25,28 @@
<artifactId>apacheds-core-avl</artifactId>
<name>ApacheDS Core AVL</name>
- <description>
- A linked in memory AVL tree implementation with Cursor.
- </description>
-
- <packaging>jar</packaging>
+
+ <description>A linked in memory AVL tree implementation with Cursor</description>
<dependencies>
<dependency>
- <artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-i18n</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-cursor</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</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=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/core-constants/pom.xml (original)
+++ directory/apacheds/trunk/core-constants/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,10 +27,6 @@
<artifactId>apacheds-core-constants</artifactId>
<name>ApacheDS Core Constants</name>
- <packaging>jar</packaging>
- <description>
- Contains classes that store interfaces with various constants in ApacheDS.
- </description>
+ <description>Contains classes that store interfaces with various constants in ApacheDS.</description>
</project>
-
Modified: directory/apacheds/trunk/core-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/pom.xml (original)
+++ directory/apacheds/trunk/core-integ/pom.xml Thu Jun 3 15:06:38 2010
@@ -29,36 +29,78 @@
<artifactId>apacheds-core-integ</artifactId>
<name>ApacheDS Core Integration</name>
- <packaging>jar</packaging>
- <description>
- Integration testing framework for Apache Directory Server.
- </description>
+ <description>Integration testing framework for Apache Directory Server.</description>
<dependencies>
<dependency>
- <artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
-
+ <artifactId>apacheds-core</artifactId>
+ </dependency>
+
<dependency>
- <artifactId>apacheds-test-framework</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
+ <artifactId>apacheds-core-annotations</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-core-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-core-jndi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-i18n</artifactId>
+ </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>provided</scope>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-test-framework</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-cursor</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-constants</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-jndi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-loader</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldif</artifactId>
</dependency>
<!-- the below dependency creates a circular dependency issue, should be changed to 0.1.0 after the client-api
@@ -66,7 +108,6 @@
<dependency>
<groupId>org.apache.directory.client.ldap</groupId>
<artifactId>ldap-client-api</artifactId>
- <version>${org.apache.directory.ldap.client.api.version}</version>
</dependency>
</dependencies>
Modified: directory/apacheds/trunk/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/pom.xml (original)
+++ directory/apacheds/trunk/core-jndi/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +27,6 @@
<artifactId>apacheds-core-jndi</artifactId>
<name>ApacheDS Core JNDI</name>
- <packaging>jar</packaging>
<description>
Contains a JNDI provider implementation which wraps the core so existing
@@ -41,15 +38,43 @@
<dependencies>
<dependency>
- <artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-i18n</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-cursor</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-constants</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-jndi</artifactId>
</dependency>
</dependencies>
@@ -91,4 +116,3 @@
</resources>
</build>
</project>
-
Modified: directory/apacheds/trunk/core-mock/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/pom.xml (original)
+++ directory/apacheds/trunk/core-mock/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,16 +27,43 @@
<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>
+
+ <description>Some commonly used mock objects that have more than bare minimum of functionality.</description>
<dependencies>
<dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-i18n</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-cursor</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-i18n</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-constants</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldif</artifactId>
</dependency>
</dependencies>
</project>
Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Thu Jun 3 15:06:38 2010
@@ -41,19 +41,66 @@
<dependency>
<artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
</dependency>
<dependency>
<artifactId>apacheds-core-api</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldif</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-constants</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-loader</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-manager</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-cursor</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-i18n</artifactId>
</dependency>
<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=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/default-config/pom.xml (original)
+++ directory/apacheds/trunk/default-config/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,85 +1,148 @@
-<?xml version="1.0"?><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
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apacheds-parent</artifactId>
<groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-parent</artifactId>
<version>1.5.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>apacheds-default-config</artifactId>
<name>ApacheDS Default Config</name>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-core</artifactId>
</dependency>
-
+
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-core-api</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-core-jndi</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-i18n</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-jdbm-partition</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-jdbm-store</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-kerberos-shared</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-ldif-partition</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-ldif-partition</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-ldap</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-changepw</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-kerberos</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-dhcp</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-protocol-dns</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-kerberos</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-dhcp</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-ldap</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-ntp</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-ntp</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-changepw</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-shared</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-http-integration</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-xdbm-search</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-loader</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-manager</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldif</artifactId>
</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=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/http-integration/pom.xml (original)
+++ directory/apacheds/trunk/http-integration/pom.xml Thu Jun 3 15:06:38 2010
@@ -20,39 +20,35 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>apacheds-parent</artifactId>
<groupId>org.apache.directory.server</groupId>
<version>1.5.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>apacheds-http-integration</artifactId>
<name>ApacheDS Jetty HTTP Server Integration</name>
<dependencies>
<dependency>
- <artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-i18n</artifactId>
</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>
- <version>${jetty.version}</version>
</dependency>
</dependencies>
@@ -73,4 +69,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: directory/apacheds/trunk/i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/pom.xml (original)
+++ directory/apacheds/trunk/i18n/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -27,7 +25,6 @@
<version>1.5.8-SNAPSHOT</version>
</parent>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-i18n</artifactId>
<name>ApacheDS I18n</name>
@@ -44,4 +41,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: directory/apacheds/trunk/interceptor-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/pom.xml (original)
+++ directory/apacheds/trunk/interceptor-kerberos/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,29 +27,33 @@
<artifactId>apacheds-interceptor-kerberos</artifactId>
<name>ApacheDS Interceptors for Kerberos</name>
- <packaging>jar</packaging>
- <description>
- Interceptors used by the ApacheDS kerberos service.
- </description>
+ <description>Interceptors used by the ApacheDS kerberos service.</description>
<dependencies>
<dependency>
- <artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-core</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-i18n</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-kerberos-shared</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-kerberos-shared</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
</dependency>
</dependencies>
Modified: directory/apacheds/trunk/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-partition/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +27,6 @@
<artifactId>apacheds-jdbm-partition</artifactId>
<name>ApacheDS JDBM Partition</name>
- <packaging>jar</packaging>
<description>
JDBM BTree backed partition implementation.
@@ -37,21 +34,53 @@
<dependencies>
<dependency>
- <artifactId>apacheds-jdbm-store</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-core</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-jdbm</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-jdbm-store</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-xdbm-search</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-xdbm-search</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-loader</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-manager</artifactId>
</dependency>
</dependencies>
Modified: directory/apacheds/trunk/jdbm-store/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-store/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +27,6 @@
<artifactId>apacheds-jdbm-store</artifactId>
<name>ApacheDS JDBM Store</name>
- <packaging>jar</packaging>
<description>
A JDBM entry store which does not have any dependency on core interfaces.
@@ -43,27 +40,63 @@
<dependencies>
<dependency>
- <artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-i18n</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-jdbm</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-jdbm</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-core-avl</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-avl</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-xdbm-search</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-xdbm-search</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-asn1</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-cursor</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-manager</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-loader</artifactId>
</dependency>
</dependencies>
Modified: directory/apacheds/trunk/jdbm/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/pom.xml (original)
+++ directory/apacheds/trunk/jdbm/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,18 +28,12 @@
<artifactId>apacheds-jdbm</artifactId>
<name>ApacheDS JDBM implementation</name>
- <description>
- specific JDBM Implementation
- </description>
-
- <packaging>jar</packaging>
+ <description>Specific JDBM Implementation</description>
<dependencies>
<dependency>
- <artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-i18n</artifactId>
</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=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/pom.xml (original)
+++ directory/apacheds/trunk/kerberos-shared/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,30 +28,42 @@
<artifactId>apacheds-kerberos-shared</artifactId>
<name>ApacheDS Protocol Kerberos Shared</name>
- <description>
- The Kerberos protocol provider for ApacheDS
- </description>
-
- <packaging>jar</packaging>
+ <description>The Kerberos protocol provider for ApacheDS</description>
<dependencies>
<dependency>
- <artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-api</artifactId>
</dependency>
-
- <!-- TODO remove dependency on JNDI core -->
+
<dependency>
- <artifactId>apacheds-core-jndi</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-i18n</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-shared</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-protocol-shared</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-asn1</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-constants</artifactId>
</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=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-test/pom.xml (original)
+++ directory/apacheds/trunk/kerberos-test/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,42 +28,47 @@
<artifactId>apacheds-kerberos-test</artifactId>
<name>ApacheDS Protocol Kerberos Test</name>
- <description>
- The Kerberos Protocol tests
- </description>
-
- <packaging>jar</packaging>
+ <description>The Kerberos Protocol tests</description>
<dependencies>
<dependency>
- <artifactId>apacheds-kerberos-shared</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-annotations</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-protocol-kerberos</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-core-jndi</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-test-framework</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-interceptor-kerberos</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-kerberos-shared</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-jdbm-partition</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <artifactId>apacheds-protocol-ldap</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-interceptor-kerberos</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-server-annotations</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-test-framework</artifactId>
</dependency>
</dependencies>
@@ -96,4 +99,3 @@
</plugins>
</build>
</project>
-
Modified: directory/apacheds/trunk/ldap-client-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/pom.xml (original)
+++ directory/apacheds/trunk/ldap-client-test/pom.xml Thu Jun 3 15:06:38 2010
@@ -22,9 +22,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.directory.client.ldap</groupId>
- <artifactId>ldap-client</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-parent</artifactId>
+ <version>1.5.8-SNAPSHOT</version>
</parent>
<artifactId>ldap-client-test</artifactId>
@@ -36,115 +36,50 @@
<url>http://issues.apache.org/jira/browse/DIRAPI</url>
</issueManagement>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/directory/apacheds/trunk/ldap-client-test</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/apacheds/trunk/ldap-client-test</developerConnection>
- <url>http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test</url>
- </scm>
-
- <description>
- LDAP Client API Tests
- </description>
+ <description>LDAP Client API Tests</description>
<dependencies>
<!-- Apacheds dependencies -->
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-annotations</artifactId>
- <version>${org.apache.directory.server.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-api</artifactId>
- <version>${org.apache.directory.server.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
- <version>${org.apache.directory.server.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-shared</artifactId>
- <version>${org.apache.directory.server.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-server-annotations</artifactId>
- <version>${org.apache.directory.server.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-test-framework</artifactId>
- <version>${org.apache.directory.server.version}</version>
</dependency>
<!-- Shared dependencies -->
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
- <version>${org.apache.directory.shared.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</artifactId>
- <version>${org.apache.directory.shared.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-cursor</artifactId>
- <version>${org.apache.directory.shared.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-constants</artifactId>
- <version>${org.apache.directory.shared.version}</version>
</dependency>
<!-- Other dependencies -->
<dependency>
+ <groupId>org.apache.directory.client.ldap</groupId>
<artifactId>ldap-client-api</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${mina.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.log4j12.version}</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
</dependency>
</dependencies>
@@ -192,19 +127,4 @@
</build>
</profile>
</profiles>
-
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
-
Modified: directory/apacheds/trunk/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/pom.xml?rev=951022&r1=951021&r2=951022&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/pom.xml (original)
+++ directory/apacheds/trunk/ldif-partition/pom.xml Thu Jun 3 15:06:38 2010
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,29 +27,78 @@
<artifactId>apacheds-ldif-partition</artifactId>
<name>ApacheDS LDIF Partition</name>
- <packaging>jar</packaging>
- <description>
- A partition that backs it's entries and indices in AvlTrees within memory.
- </description>
+ <description>A partition that backs it's entries and indices in AvlTrees within memory.</description>
<dependencies>
<dependency>
- <artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-avl-partition</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-core</artifactId>
</dependency>
<dependency>
- <artifactId>apacheds-avl-partition</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-core-api</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-mock</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>apacheds-xdbm-search</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-i18n</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-constants</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-loader</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema-manager</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldif</artifactId>
</dependency>
</dependencies>
@@ -73,4 +120,3 @@
</plugins>
</build>
</project>
-