directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r983914 - in /directory/studio/trunk: ./ org.antlr.antlr/ org.apache.directory.shared.asn1/ org.apache.directory.shared.dsmlparser/ org.apache.directory.shared.ldap/ org.apache.directory.shared.ldapconstants/ org.apache.httpcomponents.httpc...
Date Tue, 10 Aug 2010 10:18:18 GMT
Author: pamarcelot
Date: Tue Aug 10 10:18:18 2010
New Revision: 983914

URL: http://svn.apache.org/viewvc?rev=983914&view=rev
Log:
Updated pom.xml files to match dependencies between plugins.

Modified:
    directory/studio/trunk/org.antlr.antlr/pom.xml
    directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml
    directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml
    directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml
    directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml
    directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml
    directory/studio/trunk/org.slf4j.log4j12/pom.xml
    directory/studio/trunk/org.xpp3.xpp3/pom.xml
    directory/studio/trunk/pom.xml

Modified: directory/studio/trunk/org.antlr.antlr/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.antlr.antlr/pom.xml?rev=983914&r1=983913&r2=983914&view=diff
==============================================================================
--- directory/studio/trunk/org.antlr.antlr/pom.xml (original)
+++ directory/studio/trunk/org.antlr.antlr/pom.xml Tue Aug 10 10:18:18 2010
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.antlr.antlr</artifactId>
-  <version>${org.antlr.antlr.version}</version>
+  <version>${org.antlr.version}</version>
   
   <name>AntLR Parser Generator (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml?rev=983914&r1=983913&r2=983914&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml Tue Aug 10 10:18:18 2010
@@ -70,6 +70,7 @@
           <instructions>            
             <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
             <Bundle-Localization>plugin</Bundle-Localization>
+            <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
@@ -120,4 +121,12 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.slf4j.api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  
 </project>

Modified: directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml?rev=983914&r1=983913&r2=983914&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml Tue Aug 10 10:18:18
2010
@@ -70,6 +70,14 @@
           <instructions>            
             <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
             <Bundle-Localization>plugin</Bundle-Localization>
+            <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.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.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
@@ -120,4 +128,42 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <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.directory.shared.asn1</artifactId>
+      <scope>provided</scope>
+    </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.ldapconstants</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.dom4j.dom4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.xpp3.xpp3</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  
 </project>

Modified: directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml?rev=983914&r1=983913&r2=983914&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml Tue Aug 10 10:18:18 2010
@@ -70,6 +70,11 @@
           <instructions>            
             <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
             <Bundle-Localization>plugin</Bundle-Localization>
+            <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.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.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
@@ -120,4 +125,32 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <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.directory.shared.asn1</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.slf4j.api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  
 </project>

Modified: directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml?rev=983914&r1=983913&r2=983914&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml Tue Aug 10 10:18:18
2010
@@ -70,6 +70,7 @@
           <instructions>            
             <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
             <Bundle-Localization>plugin</Bundle-Localization>
+            <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
@@ -120,4 +121,12 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.slf4j.api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  
 </project>

Modified: directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml?rev=983914&r1=983913&r2=983914&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml (original)
+++ directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml Tue Aug 10 10:18:18
2010
@@ -70,6 +70,9 @@
           <instructions>            
             <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
             <Bundle-Localization>plugin</Bundle-Localization>
+            <Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
+ org.apache.commons.logging;bundle-version="${org.apache.commons.logging.version}",
+ org.apache.httpcomponents.httpcore;bundle-version="${org.apache.httpcomponents.version}"</Require-Bundle>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
@@ -120,4 +123,22 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.commons.codec</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.commons.logging</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.httpcomponents.httpcore</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  
 </project>

Modified: directory/studio/trunk/org.slf4j.log4j12/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.slf4j.log4j12/pom.xml?rev=983914&r1=983913&r2=983914&view=diff
==============================================================================
--- directory/studio/trunk/org.slf4j.log4j12/pom.xml (original)
+++ directory/studio/trunk/org.slf4j.log4j12/pom.xml Tue Aug 10 10:18:18 2010
@@ -70,6 +70,8 @@
           <instructions>            
             <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
             <Bundle-Localization>plugin</Bundle-Localization>
+            <Require-Bundle>org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
@@ -120,4 +122,17 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.logging.log4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.slf4j.api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  
 </project>

Modified: directory/studio/trunk/org.xpp3.xpp3/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.xpp3.xpp3/pom.xml?rev=983914&r1=983913&r2=983914&view=diff
==============================================================================
--- directory/studio/trunk/org.xpp3.xpp3/pom.xml (original)
+++ directory/studio/trunk/org.xpp3.xpp3/pom.xml Tue Aug 10 10:18:18 2010
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.xpp3.xpp3</artifactId>
-  <version>${org.xpp3.version}</version>
+  <version>${org.xpp3.validversion}</version>
   
   <name>XPP3 (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=983914&r1=983913&r2=983914&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Tue Aug 10 10:18:18 2010
@@ -67,9 +67,9 @@
     <distMgmtSiteUrl>scpexe://people.apache.org/www/directory.apache.org/studio/gen-docs/${version}</distMgmtSiteUrl>
     
     <!-- Set versions for depending projects -->
-    <org.antlr.antlr.version>2.7.7</org.antlr.antlr.version>
+    <org.antlr.version>2.7.7</org.antlr.version>
     <org.apache.commons.codec.version>1.3</org.apache.commons.codec.version>
-    <org.apache.commons.collections.version>3.2</org.apache.commons.collections.version>
+    <org.apache.commons.collections.version>3.2.1</org.apache.commons.collections.version>
     <org.apache.commons.io.version>1.3.1</org.apache.commons.io.version>
     <org.apache.commons.lang.version>2.3</org.apache.commons.lang.version>
     <org.apache.commons.logging.version>1.1.1</org.apache.commons.logging.version>
@@ -81,6 +81,7 @@
     <org.dom4j.version>1.6.1</org.dom4j.version>
     <org.slf4j.version>1.5.6</org.slf4j.version>
     <org.xpp3.version>1.1.3.4.O</org.xpp3.version>
+    <org.xpp3.validversion>1.1.340</org.xpp3.validversion>
     <skin.version>1.0.1</skin.version>
   </properties>
 
@@ -221,11 +222,103 @@
       <!-- Apache Directory Studio -->
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.antlr.antlr</artifactId>
+        <version>${org.antlr.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.commons.codec</artifactId>
+        <version>${org.apache.commons.codec.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.commons.collections</artifactId>
+        <version>${org.apache.commons.collections.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.commons.io</artifactId>
+        <version>${org.apache.commons.io.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.commons.lang</artifactId>
+        <version>${org.apache.commons.lang.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.commons.logging</artifactId>
+        <version>${org.apache.commons.logging.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.directory.shared.asn1</artifactId>
+        <version>${org.apache.directory.shared.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.directory.shared.dsmlparser</artifactId>
+        <version>${org.apache.directory.shared.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.directory.shared.ldap</artifactId>
+        <version>${org.apache.directory.shared.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
+        <version>${org.apache.directory.shared.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.httpcomponents.httpclient</artifactId>
+        <version>${org.apache.httpcomponents.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.httpcomponents.httpcore</artifactId>
+        <version>${org.apache.httpcomponents.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.logging.log4j</artifactId>
+        <version>${org.apache.logging.log4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
         <artifactId>org.apache.mina.core</artifactId>
         <version>${org.apache.mina.core.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.bouncycastle.bcprovjdk15</artifactId>
+        <version>${org.bouncycastle.bcprovjdk15.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.dom4j.dom4j</artifactId>
+        <version>${org.dom4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.slf4j.api</artifactId>
+        <version>${org.slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.slf4j.log4j12</artifactId>
+        <version>${org.slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.xpp3.xpp3</artifactId>
+        <version>${org.xpp3.validversion}</version>
+      </dependency>
+      
+      
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
         <artifactId>aciitemeditor</artifactId>
         <version>${pom.version}</version>
       </dependency>
@@ -1133,7 +1226,7 @@
       <dependency>
         <groupId>antlr</groupId>
         <artifactId>antlr</artifactId>
-        <version>${org.antlr.antlr.version}</version>
+        <version>${org.antlr.version}</version>
       </dependency>
       <dependency>
         <groupId>docbook</groupId>



Mime
View raw message