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/08/13 11:55:39 UTC
svn commit: r985148 - in /directory/studio/trunk: aciitemeditor/
apacheds.configuration/ apacheds/ common.core/ common.ui/ connection.core/
connection.ui/ ldapbrowser.common/ ldapbrowser.core/ ldapbrowser.ui/
ldapservers.apacheds.v153/ ldapservers.apac...
Author: pamarcelot
Date: Fri Aug 13 09:55:38 2010
New Revision: 985148
URL: http://svn.apache.org/viewvc?rev=985148&view=rev
Log:
Cleaned pom.xml (removed useless dependencies).
Modified:
directory/studio/trunk/aciitemeditor/pom.xml
directory/studio/trunk/apacheds.configuration/pom.xml
directory/studio/trunk/apacheds/pom.xml
directory/studio/trunk/common.core/pom.xml
directory/studio/trunk/common.ui/pom.xml
directory/studio/trunk/connection.core/pom.xml
directory/studio/trunk/connection.ui/pom.xml
directory/studio/trunk/ldapbrowser.common/pom.xml
directory/studio/trunk/ldapbrowser.core/pom.xml
directory/studio/trunk/ldapbrowser.ui/pom.xml
directory/studio/trunk/ldapservers.apacheds.v153/pom.xml
directory/studio/trunk/ldapservers.apacheds.v154/pom.xml
directory/studio/trunk/ldapservers.apacheds.v155/pom.xml
directory/studio/trunk/ldapservers.apacheds.v156/pom.xml
directory/studio/trunk/ldapservers/pom.xml
directory/studio/trunk/ldifeditor/pom.xml
directory/studio/trunk/ldifparser/pom.xml
directory/studio/trunk/org.slf4j.log4j12/pom.xml
directory/studio/trunk/schemaeditor/pom.xml
directory/studio/trunk/valueeditors/pom.xml
Modified: directory/studio/trunk/aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/aciitemeditor/pom.xml (original)
+++ directory/studio/trunk/aciitemeditor/pom.xml Fri Aug 13 09:55:38 2010
@@ -109,13 +109,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.aciitemeditor.Activator</Bundle-Activator>
- <Require-Bundle>org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.expressions,
- org.eclipse.jface.text,
- org.eclipse.core.resources,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
+ <Require-Bundle>
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
org.apache.directory.studio.common.ui,
@@ -123,7 +117,14 @@
org.apache.directory.studio.connection.ui,
org.apache.directory.studio.ldapbrowser.common,
org.apache.directory.studio.ldapbrowser.core,
- org.apache.directory.studio.valueeditors
+ org.apache.directory.studio.valueeditors,
+ org.eclipse.core.expressions,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor
</Require-Bundle>
<Export-Package>!*</Export-Package>
<Import-Package>!*</Import-Package>
Modified: directory/studio/trunk/apacheds.configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds.configuration/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/apacheds.configuration/pom.xml (original)
+++ directory/studio/trunk/apacheds.configuration/pom.xml Fri Aug 13 09:55:38 2010
@@ -110,13 +110,14 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.apacheds.configuration.ApacheDSConfigurationPlugin</Bundle-Activator>
- <Require-Bundle>org.eclipse.core.runtime,
+ <Require-Bundle>
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
org.eclipse.ui,
org.eclipse.ui.forms,
- org.eclipse.jface.text,
org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
</Require-Bundle>
<Export-Package>org.apache.directory.studio.apacheds.configuration.*</Export-Package>
Modified: directory/studio/trunk/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/pom.xml (original)
+++ directory/studio/trunk/apacheds/pom.xml Fri Aug 13 09:55:38 2010
@@ -109,21 +109,22 @@
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.apacheds.ApacheDsPlugin</Bundle-Activator>
<Eclipse-RegisterBuddy>org.apache.directory.studio.jars</Eclipse-RegisterBuddy>
- <Require-Bundle>org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.expressions,
- org.eclipse.ui.console,
- org.eclipse.ui.ide,
- org.eclipse.jface.text,
- org.eclipse.jdt.launching,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
+ <Require-Bundle>
+ org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.directory.studio.apacheds.configuration,
org.apache.directory.studio.connection.core;resolution:=optional,
- org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
org.apache.mina.core;bundle-version="${org.apache.mina.core.validversion}",
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.core.expressions,
+ org.eclipse.core.runtime,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.jdt.launching,
+ org.eclipse.jface.text,
+ org.eclipse.ui,
+ org.eclipse.ui.console,
+ org.eclipse.ui.ide
</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
Modified: directory/studio/trunk/common.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common.core/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/common.core/pom.xml (original)
+++ directory/studio/trunk/common.core/pom.xml Fri Aug 13 09:55:38 2010
@@ -100,8 +100,10 @@
<Bundle-SymbolicName>${groupId}.${artifactId};singleton:=true</Bundle-SymbolicName>
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Require-Bundle>org.eclipse.core.runtime,
- org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}"</Require-Bundle>
+ <Require-Bundle>
+ org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
+ org.eclipse.core.runtime
+ </Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/common.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common.ui/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/common.ui/pom.xml (original)
+++ directory/studio/trunk/common.ui/pom.xml Fri Aug 13 09:55:38 2010
@@ -112,8 +112,9 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.common.ui.CommonUIPlugin</Bundle-Activator>
- <Require-Bundle>org.eclipse.ui,
- org.eclipse.core.runtime
+ <Require-Bundle>
+ org.eclipse.core.runtime,
+ org.eclipse.ui
</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
Modified: directory/studio/trunk/connection.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/pom.xml (original)
+++ directory/studio/trunk/connection.core/pom.xml Fri Aug 13 09:55:38 2010
@@ -105,25 +105,20 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.connection.core.ConnectionCorePlugin</Bundle-Activator>
- <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
+ <Require-Bundle>
org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
org.apache.directory.studio.common.core,
org.apache.directory.studio.ldifparser,
org.apache.httpcomponents.httpclient;bundle-version="${org.apache.httpcomponents.version}",
- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
- org.eclipse.core.runtime,
- org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ org.eclipse.core.runtime
+ </Require-Bundle>
<Export-Package>org.apache.directory.studio.connection.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/connection.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.ui/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/connection.ui/pom.xml (original)
+++ directory/studio/trunk/connection.ui/pom.xml Fri Aug 13 09:55:38 2010
@@ -112,26 +112,19 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.connection.ui.ConnectionUIPlugin</Bundle-Activator>
- <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
+ <Require-Bundle>
org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
org.apache.directory.studio.common.core,
org.apache.directory.studio.common.ui,
org.apache.directory.studio.connection.core,
- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
org.bouncycastle.bcprovjdk15;bundle-version="${org.bouncycastle.bcprovjdk15.version}",
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.ui.forms,
- org.eclipse.core.runtime,
- org.eclipse.ui.workbench.texteditor,
- org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ 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>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/ldapbrowser.common/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.common/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.common/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser.common/pom.xml Fri Aug 13 09:55:38 2010
@@ -118,20 +118,15 @@
org.apache.directory.studio.ldifparser,
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
- org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.expressions,
org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui,
org.eclipse.ui.editors,
- org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ 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>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser.core/pom.xml Fri Aug 13 09:55:38 2010
@@ -106,7 +106,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin</Bundle-Activator>
- <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
+ <Require-Bundle>
org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
@@ -118,14 +118,11 @@
org.apache.directory.studio.common.core,
org.apache.directory.studio.connection.core,
org.apache.directory.studio.ldifparser,
- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
org.eclipse.core.runtime,
org.eclipse.search,
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}",
- org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}"
+ </Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
@@ -220,11 +217,6 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.slf4j.log4j12</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
<artifactId>org.xpp3.xpp3</artifactId>
<scope>provided</scope>
</dependency>
Modified: directory/studio/trunk/ldapbrowser.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser.ui/pom.xml Fri Aug 13 09:55:38 2010
@@ -116,11 +116,9 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin</Bundle-Activator>
- <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
+ <Require-Bundle>
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
org.apache.directory.studio.common.core,
@@ -131,8 +129,6 @@
org.apache.directory.studio.ldapbrowser.common,
org.apache.directory.studio.ldifeditor,
org.apache.directory.studio.ldifparser,
- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
org.eclipse.core.expressions,
org.eclipse.core.filesystem,
org.eclipse.core.runtime,
@@ -142,10 +138,8 @@
org.eclipse.ui.forms,
org.eclipse.ui.views,
org.eclipse.ui.workbench.texteditor,
- org.eclipse.search,
- org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ org.eclipse.search
+ </Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
<Private-Package>!</Private-Package>
@@ -194,11 +188,6 @@
<artifactId>org.apache.directory.shared.ldapconstants</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/ldapservers.apacheds.v153/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapservers.apacheds.v153/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/ldapservers.apacheds.v153/pom.xml (original)
+++ directory/studio/trunk/ldapservers.apacheds.v153/pom.xml Fri Aug 13 09:55:38 2010
@@ -114,19 +114,20 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldapservers.apacheds.v153.ApacheDS153Plugin</Bundle-Activator>
- <Require-Bundle>org.eclipse.core.runtime,
+ <Require-Bundle>
+ org.apache.directory.studio.apacheds.configuration,
+ org.apache.directory.studio.common.core,
+ org.apache.directory.studio.common.ui,
+ org.apache.directory.studio.ldapservers,
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.debug.core,
org.eclipse.debug.ui,
org.eclipse.jdt.launching,
org.eclipse.jface.text,
org.eclipse.ui,
- org.eclipse.ui.ide,
- org.apache.directory.studio.apacheds.configuration,
- org.apache.directory.studio.common.core,
- org.apache.directory.studio.common.ui,
- org.apache.directory.studio.ldapservers,
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
+ org.eclipse.ui.ide
</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
Modified: directory/studio/trunk/ldapservers.apacheds.v154/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapservers.apacheds.v154/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/ldapservers.apacheds.v154/pom.xml (original)
+++ directory/studio/trunk/ldapservers.apacheds.v154/pom.xml Fri Aug 13 09:55:38 2010
@@ -114,19 +114,20 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldapservers.apacheds.v154.ApacheDS154Plugin</Bundle-Activator>
- <Require-Bundle>org.eclipse.core.runtime,
+ <Require-Bundle>
+ org.apache.directory.studio.apacheds.configuration,
+ org.apache.directory.studio.common.core,
+ org.apache.directory.studio.common.ui,
+ org.apache.directory.studio.ldapservers,
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.debug.core,
org.eclipse.debug.ui,
org.eclipse.jdt.launching,
org.eclipse.jface.text,
org.eclipse.ui,
- org.eclipse.ui.ide,
- org.apache.directory.studio.apacheds.configuration,
- org.apache.directory.studio.common.core,
- org.apache.directory.studio.common.ui,
- org.apache.directory.studio.ldapservers,
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
+ org.eclipse.ui.ide
</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
Modified: directory/studio/trunk/ldapservers.apacheds.v155/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapservers.apacheds.v155/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/ldapservers.apacheds.v155/pom.xml (original)
+++ directory/studio/trunk/ldapservers.apacheds.v155/pom.xml Fri Aug 13 09:55:38 2010
@@ -114,19 +114,20 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldapservers.apacheds.v155.ApacheDS155Plugin</Bundle-Activator>
- <Require-Bundle>org.eclipse.core.runtime,
+ <Require-Bundle>
+ org.apache.directory.studio.apacheds.configuration,
+ org.apache.directory.studio.common.core,
+ org.apache.directory.studio.common.ui,
+ org.apache.directory.studio.ldapservers,
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.debug.core,
org.eclipse.debug.ui,
org.eclipse.jdt.launching,
org.eclipse.jface.text,
org.eclipse.ui,
- org.eclipse.ui.ide,
- org.apache.directory.studio.apacheds.configuration,
- org.apache.directory.studio.common.core,
- org.apache.directory.studio.common.ui,
- org.apache.directory.studio.ldapservers,
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
+ org.eclipse.ui.ide
</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
Modified: directory/studio/trunk/ldapservers.apacheds.v156/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapservers.apacheds.v156/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/ldapservers.apacheds.v156/pom.xml (original)
+++ directory/studio/trunk/ldapservers.apacheds.v156/pom.xml Fri Aug 13 09:55:38 2010
@@ -114,19 +114,20 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldapservers.apacheds.v156.ApacheDS156Plugin</Bundle-Activator>
- <Require-Bundle>org.eclipse.core.runtime,
+ <Require-Bundle>
+ org.apache.directory.studio.apacheds.configuration,
+ org.apache.directory.studio.common.core,
+ org.apache.directory.studio.common.ui,
+ org.apache.directory.studio.ldapservers,
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.debug.core,
org.eclipse.debug.ui,
org.eclipse.jdt.launching,
org.eclipse.jface.text,
org.eclipse.ui,
- org.eclipse.ui.ide,
- org.apache.directory.studio.apacheds.configuration,
- org.apache.directory.studio.common.core,
- org.apache.directory.studio.common.ui,
- org.apache.directory.studio.ldapservers,
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
+ org.eclipse.ui.ide
</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
Modified: directory/studio/trunk/ldapservers/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapservers/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/ldapservers/pom.xml (original)
+++ directory/studio/trunk/ldapservers/pom.xml Fri Aug 13 09:55:38 2010
@@ -114,20 +114,21 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldapservers.LdapServersPlugin</Bundle-Activator>
- <Require-Bundle>org.eclipse.core.resources,
+ <Require-Bundle>
+ org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
+ org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ org.apache.directory.studio.common.core,
+ org.apache.directory.studio.common.ui,
+ org.apache.mina.core;bundle-version="${org.apache.mina.core.validversion}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.debug.core,
org.eclipse.debug.ui,
org.eclipse.jdt.launching,
org.eclipse.jface.text,
org.eclipse.ui,
- org.eclipse.ui.ide,
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
- org.apache.directory.studio.common.core,
- org.apache.directory.studio.common.ui,
- org.apache.mina.core;bundle-version="${org.apache.mina.core.validversion}",
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
+ org.eclipse.ui.ide
</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
Modified: directory/studio/trunk/ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/pom.xml (original)
+++ directory/studio/trunk/ldifeditor/pom.xml Fri Aug 13 09:55:38 2010
@@ -113,13 +113,8 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldifeditor.LdifEditorActivator</Bundle-Activator>
- <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
- org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
+ <Require-Bundle>
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
org.apache.directory.studio.common.core,
org.apache.directory.studio.common.ui,
org.apache.directory.studio.connection.core,
@@ -127,23 +122,19 @@
org.apache.directory.studio.ldapbrowser.core,
org.apache.directory.studio.ldapbrowser.common,
org.apache.directory.studio.ldifparser,
- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
- org.eclipse.core.runtime,
org.eclipse.core.expressions,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
org.eclipse.core.filesystem,
- org.eclipse.search,
+ org.eclipse.jface.text,
org.eclipse.ui,
org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.views,
- org.eclipse.ui.forms,
- org.eclipse.jface.text,
org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ org.eclipse.ui.forms,
+ org.eclipse.ui.views,
+ 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>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/ldifparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifparser/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/ldifparser/pom.xml (original)
+++ directory/studio/trunk/ldifparser/pom.xml Fri Aug 13 09:55:38 2010
@@ -94,17 +94,10 @@
<instructions>
<Bundle-SymbolicName>${groupId}.${artifactId};singleton:=true</Bundle-SymbolicName>
<Bundle-Localization>plugin</Bundle-Localization>
- <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
+ <Require-Bundle>
org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
- org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}"
+ </Require-Bundle>
<Export-Package>org.apache.directory.studio.ldifparser.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
@@ -126,18 +119,13 @@
<dependencies>
<!-- Apache Directory Studio library plugins dependencies -->
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.commons.codec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
<scope>provided</scope>
</dependency>
Modified: directory/studio/trunk/org.slf4j.log4j12/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.slf4j.log4j12/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/org.slf4j.log4j12/pom.xml (original)
+++ directory/studio/trunk/org.slf4j.log4j12/pom.xml Fri Aug 13 09:55:38 2010
@@ -131,6 +131,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.logging.log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/pom.xml (original)
+++ directory/studio/trunk/schemaeditor/pom.xml Fri Aug 13 09:55:38 2010
@@ -113,12 +113,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.schemaeditor.Activator</Bundle-Activator>
- <Require-Bundle>org.eclipse.core.runtime,
- org.eclipse.core.expressions,
- org.eclipse.jface.text,
- org.eclipse.search,
- org.eclipse.ui,
- org.eclipse.ui.forms,
+ <Require-Bundle>
org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
@@ -128,7 +123,13 @@
org.apache.directory.studio.connection.core,
org.apache.directory.studio.connection.ui,
org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.core.runtime,
+ org.eclipse.core.expressions,
+ org.eclipse.jface.text,
+ org.eclipse.search,
+ org.eclipse.ui,
+ org.eclipse.ui.forms
</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
Modified: directory/studio/trunk/valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/pom.xml?rev=985148&r1=985147&r2=985148&view=diff
==============================================================================
--- directory/studio/trunk/valueeditors/pom.xml (original)
+++ directory/studio/trunk/valueeditors/pom.xml Fri Aug 13 09:55:38 2010
@@ -112,8 +112,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.valueeditors.ValueEditorsActivator</Bundle-Activator>
- <Require-Bundle>org.eclipse.ui,
- org.eclipse.core.runtime,
+ <Require-Bundle>
org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
@@ -121,7 +120,9 @@
org.apache.directory.studio.connection.core,
org.apache.directory.studio.connection.ui,
org.apache.directory.studio.ldapbrowser.core,
- org.apache.directory.studio.ldapbrowser.common
+ org.apache.directory.studio.ldapbrowser.common,
+ org.eclipse.core.runtime,
+ org.eclipse.ui
</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>