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 2011/11/21 15:01:13 UTC
svn commit: r1204503 - in /directory/apacheds/trunk: core-api/pom.xml
core-jndi/pom.xml core-shared/pom.xml core/pom.xml jdbm-partition/pom.xml
ldif-partition/pom.xml pom.xml protocol-ldap/pom.xml
service-builder/pom.xml xdbm-partition/pom.xml
Author: pamarcelot
Date: Mon Nov 21 14:01:12 2011
New Revision: 1204503
URL: http://svn.apache.org/viewvc?rev=1204503&view=rev
Log:
First set of cleaning for ApacheDS pom.xml files.
Fix for DIRSERVER-1677 (Dependencies cleanup).
Modified:
directory/apacheds/trunk/core-api/pom.xml
directory/apacheds/trunk/core-jndi/pom.xml
directory/apacheds/trunk/core-shared/pom.xml
directory/apacheds/trunk/core/pom.xml
directory/apacheds/trunk/jdbm-partition/pom.xml
directory/apacheds/trunk/ldif-partition/pom.xml
directory/apacheds/trunk/pom.xml
directory/apacheds/trunk/protocol-ldap/pom.xml
directory/apacheds/trunk/service-builder/pom.xml
directory/apacheds/trunk/xdbm-partition/pom.xml
Modified: directory/apacheds/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/pom.xml?rev=1204503&r1=1204502&r2=1204503&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/pom.xml (original)
+++ directory/apacheds/trunk/core-api/pom.xml Mon Nov 21 14:01:12 2011
@@ -51,21 +51,11 @@
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-constants</artifactId>
</dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
@@ -84,12 +74,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-codec-core</artifactId>
</dependency>
Modified: directory/apacheds/trunk/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/pom.xml?rev=1204503&r1=1204502&r2=1204503&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/pom.xml (original)
+++ directory/apacheds/trunk/core-jndi/pom.xml Mon Nov 21 14:01:12 2011
@@ -51,12 +51,12 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core</artifactId>
+ <artifactId>apacheds-core-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
+ <artifactId>apacheds-core-shared</artifactId>
</dependency>
<dependency>
@@ -66,21 +66,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1-ber</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</dependency>
Modified: directory/apacheds/trunk/core-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/pom.xml?rev=1204503&r1=1204502&r2=1204503&view=diff
==============================================================================
--- directory/apacheds/trunk/core-shared/pom.xml (original)
+++ directory/apacheds/trunk/core-shared/pom.xml Mon Nov 21 14:01:12 2011
@@ -53,47 +53,6 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-constants</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-codec-core</artifactId>
</dependency>
@@ -105,11 +64,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-util</artifactId>
</dependency>
Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?rev=1204503&r1=1204502&r2=1204503&view=diff
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Mon Nov 21 14:01:12 2011
@@ -48,18 +48,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-i18n</artifactId>
</dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -103,21 +91,11 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-interceptors-hash</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-interceptors-journal</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-interceptors-logger</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-interceptors-normalization</artifactId>
</dependency>
@@ -147,48 +125,17 @@
</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-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-codec-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-extras-util</artifactId>
</dependency>
@@ -211,17 +158,6 @@
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Modified: directory/apacheds/trunk/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/pom.xml?rev=1204503&r1=1204502&r2=1204503&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-partition/pom.xml Mon Nov 21 14:01:12 2011
@@ -39,11 +39,6 @@
<artifactId>junit-addons</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core</artifactId>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -89,11 +84,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</dependency>
Modified: directory/apacheds/trunk/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/pom.xml?rev=1204503&r1=1204502&r2=1204503&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/pom.xml (original)
+++ directory/apacheds/trunk/ldif-partition/pom.xml Mon Nov 21 14:01:12 2011
@@ -34,11 +34,6 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-api</artifactId>
</dependency>
@@ -63,11 +58,6 @@
<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>
Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=1204503&r1=1204502&r2=1204503&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Mon Nov 21 14:01:12 2011
@@ -914,13 +914,19 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-sp</artifactId>
+ <artifactId>shared-ldap-codec-core</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>shared-ldap-codec-standalone</artifactId>
+ <version>${org.apache.directory.shared.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-extras-aci</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
@@ -932,37 +938,37 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
+ <artifactId>shared-ldap-extras-codec-api</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>shared-ldap-extras-sp</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>shared-ldap-extras-trigger</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
+ <artifactId>shared-ldap-extras-util</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
+ <artifactId>shared-ldap-model</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <artifactId>shared-ldap-schema-data</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?rev=1204503&r1=1204502&r2=1204503&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Mon Nov 21 14:01:12 2011
@@ -42,13 +42,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-core</artifactId>
</dependency>
-
- <!-- dependency:analyze reports this as 'unused declared', however it is used.
- This is a know issue, see http://jira.codehaus.org/browse/MDEP-124 -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-constants</artifactId>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -87,53 +80,63 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1-api</artifactId>
+ <artifactId>shared-asn1-ber</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1-ber</artifactId>
+ <artifactId>shared-ldap-client-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-codec-standalone</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
+ <artifactId>shared-ldap-extras-codec-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-sp</artifactId>
+ <artifactId>shared-ldap-extras-codec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>shared-ldap-extras-sp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>shared-ldap-extras-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-util</artifactId>
+ <artifactId>shared-ldap-codec-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>shared-ldap-schema-data</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
+ <artifactId>shared-util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
</dependency>
<dependency>
Modified: directory/apacheds/trunk/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/pom.xml?rev=1204503&r1=1204502&r2=1204503&view=diff
==============================================================================
--- directory/apacheds/trunk/service-builder/pom.xml (original)
+++ directory/apacheds/trunk/service-builder/pom.xml Mon Nov 21 14:01:12 2011
@@ -47,6 +47,11 @@
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>apacheds-interceptors-hash</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apacheds-jdbm-partition</artifactId>
</dependency>
Modified: directory/apacheds/trunk/xdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/pom.xml?rev=1204503&r1=1204502&r2=1204503&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-partition/pom.xml Mon Nov 21 14:01:12 2011
@@ -59,16 +59,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</dependency>