directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r593586 - in /directory/sandbox/felixk/studio-jars: META-INF/MANIFEST.MF pom.xml
Date Fri, 09 Nov 2007 16:33:06 GMT
Author: felixk
Date: Fri Nov  9 08:33:05 2007
New Revision: 593586

URL: http://svn.apache.org/viewvc?rev=593586&view=rev
Log:
fix dependencies

Modified:
    directory/sandbox/felixk/studio-jars/META-INF/MANIFEST.MF
    directory/sandbox/felixk/studio-jars/pom.xml

Modified: directory/sandbox/felixk/studio-jars/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-jars/META-INF/MANIFEST.MF?rev=593586&r1=593585&r2=593586&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-jars/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/felixk/studio-jars/META-INF/MANIFEST.MF Fri Nov  9 08:33:05 2007
@@ -123,12 +123,9 @@
 Bundle-ClassPath: .,
  antlr-2.7.7.jar,
  commons-collections-3.2.jar,
- commons-lang-2.1.jar,
  dom4j-1.6.1.jar,
  shared-asn1-0.9.7-SNAPSHOT.jar,
  shared-ldap-0.9.7-SNAPSHOT.jar,
- shared-ldap-constants-0.9.7-SNAPSHOT.jar,
  org.apache.directory.studio.dsml.parser-0.4.jar,
  nlog4j-1.2.25.jar,
- xml-apis-1.0.b2.jar,
  xpp3-1.1.3.4.O.jar

Modified: directory/sandbox/felixk/studio-jars/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-jars/pom.xml?rev=593586&r1=593585&r2=593586&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-jars/pom.xml (original)
+++ directory/sandbox/felixk/studio-jars/pom.xml Fri Nov  9 08:33:05 2007
@@ -60,45 +60,12 @@
                         <id>copy</id>
                         <phase>compile</phase>
                         <goals>
-                            <goal>copy</goal>
+                            <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
                             <overWrite>true</overWrite>
                             <outputDirectory>target/classes</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>dom4j</groupId>
-                                    <artifactId>dom4j</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>commons-collections</groupId>
-                                    <artifactId>commons-collections</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>antlr</groupId>
-                                    <artifactId>antlr</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.directory.studio</groupId>
-                                    <artifactId>${pom.groupId}.dsml.parser</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.slf4j</groupId>
-                                    <artifactId>nlog4j</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>xpp3</groupId>
-                                    <artifactId>xpp3</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.directory.shared</groupId>
-                                    <artifactId>shared-asn1</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.directory.shared</groupId>
-                                    <artifactId>shared-ldap</artifactId>
-                                </artifactItem>
-                            </artifactItems>
+                            <excludeScope>provided</excludeScope>
                         </configuration>
                     </execution>
                 </executions>
@@ -129,6 +96,12 @@
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -137,10 +110,30 @@
         <dependency>
             <groupId>org.apache.directory.shared</groupId>
             <artifactId>shared-asn1</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.directory.shared</groupId>
             <artifactId>shared-ldap</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-lang</groupId>
+                    <artifactId>commons-lang</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.directory.shared</groupId>
+                    <artifactId>shared-ldap-constants</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.directory.studio</groupId>



Mime
View raw message