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/11/25 17:47:15 UTC
svn commit: r1039092 - in /directory/studio/trunk/plugins:
connection.core/pom.xml connection.ui/pom.xml ldapbrowser.common/pom.xml
ldapbrowser.core/pom.xml ldapbrowser.ui/pom.xml ldifeditor/pom.xml
ldifparser/pom.xml
Author: pamarcelot
Date: Thu Nov 25 16:47:15 2010
New Revision: 1039092
URL: http://svn.apache.org/viewvc?rev=1039092&view=rev
Log:
Cleaning in pom.xml dependencies.
Modified:
directory/studio/trunk/plugins/connection.core/pom.xml
directory/studio/trunk/plugins/connection.ui/pom.xml
directory/studio/trunk/plugins/ldapbrowser.common/pom.xml
directory/studio/trunk/plugins/ldapbrowser.core/pom.xml
directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml
directory/studio/trunk/plugins/ldifeditor/pom.xml
directory/studio/trunk/plugins/ldifparser/pom.xml
Modified: directory/studio/trunk/plugins/connection.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/pom.xml?rev=1039092&r1=1039091&r2=1039092&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/pom.xml (original)
+++ directory/studio/trunk/plugins/connection.core/pom.xml Thu Nov 25 16:47:15 2010
@@ -155,39 +155,71 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap.client.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.httpcomponents.httpclient</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.dom4j.dom4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Start sub-dependencies of provided plugins -->
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.antlr.antlr</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.commons.collections</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.lang</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <artifactId>org.apache.commons.pool</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.shared.ldap.client.api</artifactId>
+ <artifactId>org.apache.directory.shared.i18n</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.httpcomponents.httpclient</artifactId>
+ <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.mina.core</artifactId>
+ <artifactId>org.apache.httpcomponents.httpcore</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.dom4j.dom4j</artifactId>
+ <artifactId>org.apache.mina.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.slf4j.log4j12</artifactId>
+ <artifactId>org.slf4j.api</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- End sub-dependencies of provided plugins -->
<!-- Apache Directory Studio plugins dependencies -->
<dependency>
Modified: directory/studio/trunk/plugins/connection.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/pom.xml?rev=1039092&r1=1039091&r2=1039092&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/pom.xml (original)
+++ directory/studio/trunk/plugins/connection.ui/pom.xml Thu Nov 25 16:47:15 2010
@@ -124,7 +124,7 @@
org.eclipse.ui.forms,
org.eclipse.ui.workbench.texteditor</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
- <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
+ <Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
</instructions>
</configuration>
@@ -150,27 +150,36 @@
</build>
<dependencies>
- <!-- Apache Directory Studio plugins dependencies -->
+ <!-- Apache Directory Studio library plugins dependencies -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>common.core</artifactId>
+ <artifactId>org.bouncycastle.bcprov.jdk15</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>common.ui</artifactId>
+ <artifactId>org.apache.commons.lang</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>connection.core</artifactId>
+ <artifactId>org.apache.commons.codec</artifactId>
<scope>provided</scope>
</dependency>
-
- <!-- Apache Directory Studio library plugins dependencies -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.bouncycastle.bcprov.jdk15</artifactId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Start sub-dependencies of provided plugins -->
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.antlr.antlr</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.commons.collections</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -180,17 +189,35 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.codec</artifactId>
+ <artifactId>org.apache.directory.shared.i18n</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <artifactId>org.apache.mina.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- End sub-dependencies of provided plugins -->
+
+ <!-- Apache Directory Studio plugins dependencies -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.slf4j.log4j12</artifactId>
+ <artifactId>common.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>common.ui</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>connection.core</artifactId>
<scope>provided</scope>
</dependency>
Modified: directory/studio/trunk/plugins/ldapbrowser.common/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/pom.xml?rev=1039092&r1=1039091&r2=1039092&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/pom.xml Thu Nov 25 16:47:15 2010
@@ -125,7 +125,7 @@
org.eclipse.ui.editors,
org.eclipse.ui.workbench.texteditor</Require-Bundle>
<Export-Package>org.apache.directory.studio.ldapbrowser.common.*, org.apache.directory.studio.valueeditors.*</Export-Package>
- <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
+ <Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
</instructions>
</configuration>
@@ -167,11 +167,6 @@
<artifactId>org.apache.directory.shared.ldap</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.slf4j.log4j12</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Apache Directory Studio plugins dependencies -->
<dependency>
Modified: directory/studio/trunk/plugins/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/pom.xml?rev=1039092&r1=1039091&r2=1039092&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/pom.xml Thu Nov 25 16:47:15 2010
@@ -123,7 +123,7 @@
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
<Export-Package>org.apache.directory.studio.ldapbrowser.core.*</Export-Package>
- <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
+ <Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
</instructions>
</configuration>
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml?rev=1039092&r1=1039091&r2=1039092&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml Thu Nov 25 16:47:15 2010
@@ -138,7 +138,7 @@
org.eclipse.ui.workbench.texteditor,
org.eclipse.search</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
- <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
+ <Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
</instructions>
</configuration>
Modified: directory/studio/trunk/plugins/ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/pom.xml?rev=1039092&r1=1039091&r2=1039092&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifeditor/pom.xml (original)
+++ directory/studio/trunk/plugins/ldifeditor/pom.xml Thu Nov 25 16:47:15 2010
@@ -134,7 +134,7 @@
org.eclipse.ui.workbench.texteditor,
org.eclipse.search</Require-Bundle>
<Export-Package>org.apache.directory.studio.ldifeditor.*</Export-Package>
- <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
+ <Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
</instructions>
</configuration>
Modified: directory/studio/trunk/plugins/ldifparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/pom.xml?rev=1039092&r1=1039091&r2=1039092&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/pom.xml (original)
+++ directory/studio/trunk/plugins/ldifparser/pom.xml Thu Nov 25 16:47:15 2010
@@ -166,23 +166,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.logging.log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.slf4j.api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.slf4j.log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.collections</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>