Author: fmeschbe
Date: Thu Jun 12 07:32:38 2008
New Revision: 667106

URL: http://svn.apache.org/viewvc?rev=667106&view=rev
Log:
SLING-527 Prevent inclusion of commons/testing library in the war file

Modified:
    incubator/sling/trunk/launchpad/webapp/pom.xml

Modified: incubator/sling/trunk/launchpad/webapp/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/pom.xml?rev=667106&r1=667105&r2=667106&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/webapp/pom.xml Thu Jun 12 07:32:38 2008
@@ -162,6 +162,9 @@
                                    same is try for the base bundle -->
                               
org.apache.sling.launchpad.app,org.apache.sling.launchpad.base
                             </excludeArtifactIds>
+                            <includeScope>
+                                provided
+                            </includeScope>
                         </configuration>
                     </execution>
                 </executions>
@@ -446,30 +449,29 @@
         </dependency>
 
         <dependency>
+            <groupId>org.eclipse.equinox.http</groupId>
+            <artifactId>servlet</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.testing</artifactId>
             <version>2.0.1-incubator-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.json</artifactId>
             <version>2.0.1-incubator-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.equinox.http</groupId>
-            <artifactId>servlet</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
- 
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.servlets.post</artifactId>
@@ -484,7 +486,6 @@
             <scope>test</scope>
             <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>


Reply via email to