directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r688775 - in /directory/studio/trunk: aciitemeditor/ apacheds-configuration/ apacheds/ connection-core/ connection-core/META-INF/ connection-ui/ jars/ jars/META-INF/ ldapbrowser-core/ ldapbrowser-core/META-INF/ ldapbrowser-ui/ ldif-parser/ ...
Date Mon, 25 Aug 2008 16:24:51 GMT
Author: pamarcelot
Date: Mon Aug 25 09:24:49 2008
New Revision: 688775

URL: http://svn.apache.org/viewvc?rev=688775&view=rev
Log:
Fix for DIRSTUDIO-374 (Clean duplicated dependencies in plugins).

Modified:
    directory/studio/trunk/aciitemeditor/pom.xml
    directory/studio/trunk/apacheds-configuration/pom.xml
    directory/studio/trunk/apacheds/pom.xml
    directory/studio/trunk/connection-core/META-INF/MANIFEST.MF
    directory/studio/trunk/connection-core/pom.xml
    directory/studio/trunk/connection-ui/pom.xml
    directory/studio/trunk/jars/META-INF/MANIFEST.MF
    directory/studio/trunk/jars/pom.xml
    directory/studio/trunk/ldapbrowser-core/META-INF/MANIFEST.MF
    directory/studio/trunk/ldapbrowser-core/pom.xml
    directory/studio/trunk/ldapbrowser-ui/pom.xml
    directory/studio/trunk/ldif-parser/META-INF/MANIFEST.MF
    directory/studio/trunk/ldif-parser/pom.xml
    directory/studio/trunk/ldifeditor/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=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/aciitemeditor/pom.xml (original)
+++ directory/studio/trunk/aciitemeditor/pom.xml Mon Aug 25 09:24:49 2008
@@ -105,9 +105,10 @@
   </build>
 
   <dependencies>
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>jars</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -122,14 +123,26 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
+      <artifactId>connection.ui</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
       <artifactId>ldapbrowser.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
+      <artifactId>ldapbrowser.common</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
       <artifactId>valueeditors</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+	<!-- Eclipse plugins dependencies -->
     <dependency>
       <groupId>org.eclipse.core</groupId>
       <artifactId>commands</artifactId>

Modified: directory/studio/trunk/apacheds-configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds-configuration/pom.xml?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/apacheds-configuration/pom.xml (original)
+++ directory/studio/trunk/apacheds-configuration/pom.xml Mon Aug 25 09:24:49 2008
@@ -103,6 +103,14 @@
   </build>
 
   <dependencies>
+  	<!-- Apache Directory Studio plugins dependencies -->
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>jars</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+	<!-- Eclipse plugins dependencies -->
     <dependency>
       <groupId>org.eclipse.swt.gtk.linux</groupId>
       <artifactId>x86</artifactId>
@@ -168,21 +176,6 @@
       <artifactId>osgi</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 
 </project>

Modified: directory/studio/trunk/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/pom.xml?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/pom.xml (original)
+++ directory/studio/trunk/apacheds/pom.xml Mon Aug 25 09:24:49 2008
@@ -92,6 +92,7 @@
         </configuration>
       </plugin>
       
+      <!-- Copying Apache Directory Server bundled dependencies -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -297,9 +298,10 @@
     </plugins>
   </build>
   
+  <!-- Special dependecyManagement tag used for bundled
+       Apache Directory Server dependencies only -->
    <dependencyManagement>
     <dependencies>
-        <!-- Apache Directory Server dependencies -->
         <dependency>
           <groupId>antlr</groupId>
           <artifactId>antlr</artifactId>
@@ -578,7 +580,30 @@
   </dependencyManagement>
 
   <dependencies>
-    <!-- Eclipse dependencies -->
+  	<!-- Libraries dependencies -->
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+    </dependency>
+    
+  	<!-- Apache Directory Studio plugins dependencies -->
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>jars</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>apacheds.configuration</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>connection.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+	<!-- Eclipse plugins dependencies -->
     <dependency>
       <groupId>org.eclipse.swt.gtk.linux</groupId>
       <artifactId>x86</artifactId>
@@ -665,26 +690,5 @@
       <artifactId>ide</artifactId>
       <scope>provided</scope>
     </dependency>
-    <!-- Apache Directory Studio dependencies -->
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>apacheds.configuration</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Jar dependencies -->
-    <dependency>
-      <groupId>org.apache.mina</groupId>
-      <artifactId>mina-core</artifactId>
-    </dependency>
   </dependencies>
 </project>

Modified: directory/studio/trunk/connection-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/META-INF/MANIFEST.MF?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/connection-core/META-INF/MANIFEST.MF Mon Aug 25 09:24:49 2008
@@ -15,5 +15,4 @@
  org.apache.directory.studio.connection.core.io,
  org.apache.directory.studio.connection.core.io.jndi,
  org.apache.directory.studio.connection.core.jobs
-Bundle-ClassPath: .,
- lib/commons-io-1.3.1.jar
+Bundle-ClassPath: .

Modified: directory/studio/trunk/connection-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/pom.xml?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/pom.xml (original)
+++ directory/studio/trunk/connection-core/pom.xml Mon Aug 25 09:24:49 2008
@@ -98,9 +98,10 @@
   </build>
 
   <dependencies>
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>jars</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -108,6 +109,8 @@
       <artifactId>ldifparser</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+	<!-- Eclipse plugins dependencies -->
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>osgi</artifactId>
@@ -129,10 +132,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.eclipse.core</groupId>
       <artifactId>runtime</artifactId>
       <scope>provided</scope>
@@ -142,11 +141,7 @@
       <artifactId>preferences</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
+    
   </dependencies>
 
 </project>

Modified: directory/studio/trunk/connection-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/pom.xml?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/pom.xml (original)
+++ directory/studio/trunk/connection-ui/pom.xml Mon Aug 25 09:24:49 2008
@@ -105,11 +105,19 @@
   </build>
 
   <dependencies>
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>jars</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>connection.core</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+	<!-- Eclipse plugins dependencies -->
     <dependency>
       <groupId>org.eclipse.swt.gtk.linux</groupId>
       <artifactId>x86</artifactId>
@@ -170,11 +178,6 @@
       <artifactId>editors</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 
 </project>

Modified: directory/studio/trunk/jars/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/jars/META-INF/MANIFEST.MF?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/jars/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/jars/META-INF/MANIFEST.MF Mon Aug 25 09:24:49 2008
@@ -138,6 +138,7 @@
 Eclipse-BuddyPolicy: registered
 Bundle-ClassPath: .,
  lib/antlr-2.7.7.jar,
+ lib/commons-codec-1.3.jar,
  lib/commons-collections-3.2.jar,
  lib/commons-io-1.3.1.jar,
  lib/commons-lang-2.3.jar,

Modified: directory/studio/trunk/jars/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/jars/pom.xml?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/jars/pom.xml (original)
+++ directory/studio/trunk/jars/pom.xml Mon Aug 25 09:24:49 2008
@@ -87,11 +87,16 @@
   </build>
 
   <dependencies>
+  	<!-- Libraries dependencies -->
     <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
     </dependency>
     <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>

Modified: directory/studio/trunk/ldapbrowser-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/META-INF/MANIFEST.MF?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/ldapbrowser-core/META-INF/MANIFEST.MF Mon Aug 25 09:24:49 2008
@@ -24,6 +24,4 @@
  org.apache.directory.studio.ldapbrowser.core.propertypageproviders,
  org.apache.directory.studio.ldapbrowser.core.utils
 Bundle-ClassPath: .,
- lib/commons-codec-1.3.jar,
- lib/commons-io-1.3.1.jar,
  lib/poi-3.0.1-FINAL.jar

Modified: directory/studio/trunk/ldapbrowser-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/pom.xml?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser-core/pom.xml Mon Aug 25 09:24:49 2008
@@ -91,25 +91,40 @@
   </build>
 
   <dependencies>
+  	<!-- Libraries dependencies -->
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
+      <groupId>org.apache.poi</groupId>
+      <artifactId>poi</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
+  
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>jars</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>ldifparser</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>ldifparser</artifactId>
+      <artifactId>connection.core</artifactId>
       <scope>provided</scope>
     </dependency>
-
+    
+	<!-- Eclipse plugins dependencies -->
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>osgi</artifactId>
@@ -145,45 +160,12 @@
       <artifactId>preferences</artifactId>
       <scope>provided</scope>
     </dependency>
-
-    <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>studio-dsml-parser</artifactId>
-      <scope>provided</scope>
-    </dependency>
+    
+  	<!-- JUnit for test only -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

Modified: directory/studio/trunk/ldapbrowser-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/pom.xml?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser-ui/pom.xml Mon Aug 25 09:24:49 2008
@@ -112,34 +112,35 @@
   </build>
 
   <dependencies>
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>ldifparser</artifactId>
+      <artifactId>jars</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>ldapbrowser.common</artifactId>
+      <artifactId>ldifparser</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>connection.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>ldapbrowser.core</artifactId>
+      <artifactId>connection.ui</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.ui</artifactId>
+      <artifactId>ldapbrowser.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.core</artifactId>
+      <artifactId>ldapbrowser.common</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -147,6 +148,8 @@
       <artifactId>ldifeditor</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+	<!-- Eclipse plugins dependencies -->
     <dependency>
       <groupId>org.eclipse.core</groupId>
       <artifactId>commands</artifactId>

Modified: directory/studio/trunk/ldif-parser/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldif-parser/META-INF/MANIFEST.MF?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/ldif-parser/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/ldif-parser/META-INF/MANIFEST.MF Mon Aug 25 09:24:49 2008
@@ -11,5 +11,5 @@
  org.apache.directory.studio.ldifparser.model.container,
  org.apache.directory.studio.ldifparser.model.lines,
  org.apache.directory.studio.ldifparser.parser
-Bundle-ClassPath: .,
- lib/commons-codec-1.3.jar
+Require-Bundle: org.apache.directory.studio.jars
+Bundle-ClassPath: .

Modified: directory/studio/trunk/ldif-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldif-parser/pom.xml?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/ldif-parser/pom.xml (original)
+++ directory/studio/trunk/ldif-parser/pom.xml Mon Aug 25 09:24:49 2008
@@ -88,15 +88,19 @@
   </build>
 
   <dependencies>
+  	<!-- Apache Directory Studio plugins dependencies -->
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>jars</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+  	<!-- JUnit for test only -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
   </dependencies>
 
 </project>

Modified: directory/studio/trunk/ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/pom.xml?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/pom.xml (original)
+++ directory/studio/trunk/ldifeditor/pom.xml Mon Aug 25 09:24:49 2008
@@ -109,19 +109,15 @@
   </build>
 
   <dependencies>
-    <dependency>
+  	<!-- Apache Directory Studio plugins dependencies -->
+  	<dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>ldifparser</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
+      <artifactId>jars</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
+  	<dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.ui</artifactId>
+      <artifactId>ldifparser</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -131,7 +127,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>ldapbrowser.common</artifactId>
+      <artifactId>connection.ui</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -141,9 +137,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>valueeditors</artifactId>
+      <artifactId>ldapbrowser.common</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+	<!-- Eclipse plugins dependencies -->
     <dependency>
       <groupId>org.eclipse.swt.gtk.linux</groupId>
       <artifactId>x86</artifactId>

Modified: directory/studio/trunk/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/pom.xml?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/pom.xml (original)
+++ directory/studio/trunk/schemaeditor/pom.xml Mon Aug 25 09:24:49 2008
@@ -97,26 +97,44 @@
   </build>
 
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+  	<!-- Libraries dependencies -->
+  	<dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-converter</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>antlr</groupId>
+          <artifactId>antlr</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-ldap</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
+    
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>connection.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>connection.ui</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>jars</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+	<!-- Eclipse plugins dependencies -->
     <dependency>
       <groupId>org.eclipse.core</groupId>
       <artifactId>commands</artifactId>
@@ -193,42 +211,16 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.ui</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>search</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+  	<!-- JUnit for test only -->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-converter</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>antlr</groupId>
-          <artifactId>antlr</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.directory.shared</groupId>
-          <artifactId>shared-ldap</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

Modified: directory/studio/trunk/valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/pom.xml?rev=688775&r1=688774&r2=688775&view=diff
==============================================================================
--- directory/studio/trunk/valueeditors/pom.xml (original)
+++ directory/studio/trunk/valueeditors/pom.xml Mon Aug 25 09:24:49 2008
@@ -107,39 +107,42 @@
   </build>
 
   <dependencies>
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
-      <groupId>org.eclipse.swt.gtk.linux</groupId>
-      <artifactId>x86</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>jars</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>osgi</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>connection.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>connection.ui</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>ldapbrowser.common</artifactId>
+      <artifactId>ldapbrowser.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.ui</artifactId>
+      <artifactId>ldapbrowser.common</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+	<!-- Eclipse plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.core</artifactId>
+      <groupId>org.eclipse.swt.gtk.linux</groupId>
+      <artifactId>x86</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>ldapbrowser.core</artifactId>
+      <groupId>org.eclipse</groupId>
+      <artifactId>osgi</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>



Mime
View raw message