directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r593589 - in /directory/sandbox/felixk: studio-connection-core/pom.xml studio-ldapbrowser-core/pom.xml studio-rcp/pom.xml studio-schemaeditor/pom.xml
Date Fri, 09 Nov 2007 16:46:00 GMT
Author: felixk
Date: Fri Nov  9 08:45:59 2007
New Revision: 593589

URL: http://svn.apache.org/viewvc?rev=593589&view=rev
Log:
Simplify selection of copied dependencies into jar.
All dependencies (scope provided) are included. This should be the same dependencies also
appearing ing the .classpath and in the MANIFEST.MF bundle-classpath

Modified:
    directory/sandbox/felixk/studio-connection-core/pom.xml
    directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml
    directory/sandbox/felixk/studio-rcp/pom.xml
    directory/sandbox/felixk/studio-schemaeditor/pom.xml

Modified: directory/sandbox/felixk/studio-connection-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-connection-core/pom.xml?rev=593589&r1=593588&r2=593589&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-connection-core/pom.xml (original)
+++ directory/sandbox/felixk/studio-connection-core/pom.xml Fri Nov  9 08:45:59 2007
@@ -69,18 +69,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>commons-io</groupId>
-                                    <artifactId>commons-io</artifactId>
-                                    <type>jar</type>
-                                </artifactItem>
-                            </artifactItems>
+                            <excludeScope>provided</excludeScope>
                         </configuration>
                     </execution>
                 </executions>

Modified: directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml?rev=593589&r1=593588&r2=593589&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml Fri Nov  9 08:45:59 2007
@@ -71,30 +71,16 @@
                         <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>commons-io</groupId>
-                                    <artifactId>commons-io</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>commons-codec</groupId>
-                                    <artifactId>commons-codec</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.poi</groupId>
-                                    <artifactId>poi</artifactId>
-                                </artifactItem>
-                            </artifactItems>
+                            <excludeScope>provided</excludeScope>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

Modified: directory/sandbox/felixk/studio-rcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-rcp/pom.xml?rev=593589&r1=593588&r2=593589&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-rcp/pom.xml (original)
+++ directory/sandbox/felixk/studio-rcp/pom.xml Fri Nov  9 08:45:59 2007
@@ -87,17 +87,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>org.slf4j</groupId>
-                                    <artifactId>nlog4j</artifactId>
-                                </artifactItem>
-                            </artifactItems>
+                            <excludeScope>provided</excludeScope>
                         </configuration>
                     </execution>
                 </executions>

Modified: directory/sandbox/felixk/studio-schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-schemaeditor/pom.xml?rev=593589&r1=593588&r2=593589&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-schemaeditor/pom.xml (original)
+++ directory/sandbox/felixk/studio-schemaeditor/pom.xml Fri Nov  9 08:45:59 2007
@@ -66,7 +66,6 @@
                     </projectnatures>
                 </configuration>
             </plugin>
-            <!-- Need to export any dependencies?
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -75,50 +74,16 @@
                         <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>commons-collections</groupId>
-                                    <artifactId>commons-collections</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>commons-lang</groupId>
-                                    <artifactId>commons-lang</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>antlr</groupId>
-                                    <artifactId>antlr</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>junit</groupId>
-                                    <artifactId>junit</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.directory.shared</groupId>
-                                    <artifactId>shared-converter</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.directory.server</groupId>
-                                    <artifactId>apacheds-core-plugin</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>xerces</groupId>
-                                    <artifactId>xercesImpl</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>checkstyle</groupId>
-                                    <artifactId>checkstyle</artifactId>
-                                </artifactItem>
-                            </artifactItems>
+                            <excludeScope>provided</excludeScope>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-             -->
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>



Mime
View raw message