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/02 16:28:50 UTC
svn commit: r1196630 - in /directory:
apacheds/trunk/core-annotations/pom.xml apacheds/trunk/service/pom.xml
apacheds/trunk/test-framework/pom.xml shared/trunk/dsml/parser/pom.xml
shared/trunk/ldap/extras/sp/pom.xml shared/trunk/ldap/extras/util/pom.xml
Author: pamarcelot
Date: Wed Nov 2 15:28:50 2011
New Revision: 1196630
URL: http://svn.apache.org/viewvc?rev=1196630&view=rev
Log:
Fix for DIRAPI-59 (Some projects shouldn't depend on 'shared-ldap-codec-standalone').
Removed dependency where it was not needed.
Switched scope to 'test' in some projects.
Adapted ApacheDS projects which depended on it via transitive dependencies.
Modified:
directory/apacheds/trunk/core-annotations/pom.xml
directory/apacheds/trunk/service/pom.xml
directory/apacheds/trunk/test-framework/pom.xml
directory/shared/trunk/dsml/parser/pom.xml
directory/shared/trunk/ldap/extras/sp/pom.xml
directory/shared/trunk/ldap/extras/util/pom.xml
Modified: directory/apacheds/trunk/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/pom.xml?rev=1196630&r1=1196629&r2=1196630&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/pom.xml (original)
+++ directory/apacheds/trunk/core-annotations/pom.xml Wed Nov 2 15:28:50 2011
@@ -80,6 +80,12 @@
<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-ldap-model</artifactId>
</dependency>
Modified: directory/apacheds/trunk/service/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/pom.xml?rev=1196630&r1=1196629&r2=1196630&view=diff
==============================================================================
--- directory/apacheds/trunk/service/pom.xml (original)
+++ directory/apacheds/trunk/service/pom.xml Wed Nov 2 15:28:50 2011
@@ -51,6 +51,12 @@
<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-ldap-model</artifactId>
</dependency>
Modified: directory/apacheds/trunk/test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/pom.xml?rev=1196630&r1=1196629&r2=1196630&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/pom.xml (original)
+++ directory/apacheds/trunk/test-framework/pom.xml Wed Nov 2 15:28:50 2011
@@ -67,6 +67,11 @@
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-server-annotations</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-codec-standalone</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
Modified: directory/shared/trunk/dsml/parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/pom.xml?rev=1196630&r1=1196629&r2=1196630&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/pom.xml (original)
+++ directory/shared/trunk/dsml/parser/pom.xml Wed Nov 2 15:28:50 2011
@@ -35,16 +35,10 @@
<artifactId>junit-addons</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-net-mina</artifactId>
+ <artifactId>shared-ldap-codec-standalone</artifactId>
<scope>test</scope>
</dependency>
Modified: directory/shared/trunk/ldap/extras/sp/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/sp/pom.xml?rev=1196630&r1=1196629&r2=1196630&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/sp/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/sp/pom.xml Wed Nov 2 15:28:50 2011
@@ -54,11 +54,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>shared-ldap-extras-codec</artifactId>
</dependency>
Modified: directory/shared/trunk/ldap/extras/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/util/pom.xml?rev=1196630&r1=1196629&r2=1196630&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/util/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/util/pom.xml Wed Nov 2 15:28:50 2011
@@ -36,31 +36,21 @@
<artifactId>junit-addons</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-asn1-api</artifactId>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shared-i18n</artifactId>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-model</artifactId>
- </dependency>
+ <artifactId>shared-ldap-codec-core</artifactId>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- </dependency>
+ <artifactId>shared-ldap-model</artifactId>
+ </dependency>
</dependencies>
<build>