incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r633490 - /incubator/sling/trunk/launchpad/app/pom.xml
Date Tue, 04 Mar 2008 14:36:46 GMT
Author: fmeschbe
Date: Tue Mar  4 06:36:45 2008
New Revision: 633490

URL: http://svn.apache.org/viewvc?rev=633490&view=rev
Log:
SLING-189 Add jcr/base module and set all dependencies optional to not inject spurious
transitive dependencies (which lead to commons-logging being used for integration tests)

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

Modified: incubator/sling/trunk/launchpad/app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=633490&r1=633489&r2=633490&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/pom.xml (original)
+++ incubator/sling/trunk/launchpad/app/pom.xml Tue Mar  4 06:36:45 2008
@@ -181,6 +181,7 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.osgi.log</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         
         <!-- the web based OSGi framework console -->
@@ -188,33 +189,40 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.osgi.console.web</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.json</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
 
         <!-- Apache Felix framework bundles -->
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.bundlerepository</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.eventadmin</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.metatype</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <!-- HttpService implementation: embedded Jetty -->
@@ -222,6 +230,7 @@
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-service</artifactId>
             <version>0.2.3</version>
+            <optional>true</optional>
         </dependency>
 
         <!--
@@ -232,16 +241,19 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.core</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.adapter</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -249,6 +261,7 @@
                 org.apache.sling.servlet.resolver
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -256,6 +269,7 @@
                 org.apache.sling.servlets.default
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -263,13 +277,16 @@
                 org.apache.sling.ujax
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
+<!--
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>
                 org.apache.sling.event
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -277,11 +294,20 @@
                 org.apache.sling.scheduler
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.threads</artifactId>
+            <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+-->
+        <dependency>
+            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.osgi.commons</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -289,6 +315,7 @@
                 org.apache.sling.commons.mime
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         
         <!-- JCR oriented bundles -->
@@ -296,6 +323,13 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.api</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.jcr.base</artifactId>
+            <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -303,26 +337,31 @@
                 org.apache.sling.jcr.resource
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.ocm</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.jackrabbit.server</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-commons</artifactId>
             <version>1.5-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.webdav</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -330,6 +369,7 @@
                 org.apache.sling.jcr.classloader
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         
         <!-- scripting -->
@@ -339,6 +379,7 @@
                 org.apache.sling.scripting.api
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -346,6 +387,7 @@
                 org.apache.sling.scripting.resolver
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -353,6 +395,7 @@
                 org.apache.sling.scripting.javascript
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -360,6 +403,7 @@
                 org.apache.sling.scripting.jsp
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -367,6 +411,7 @@
                 org.apache.sling.scripting.jsp.taglib
             </artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
 
         <!--
@@ -375,6 +420,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.felix.commons</groupId>
@@ -382,6 +428,7 @@
                 org.apache.felix.commons.commons-fileupload
             </artifactId>
             <version>1.1.1-0001-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.felix.commons</groupId>
@@ -389,6 +436,7 @@
                 org.apache.felix.commons.commons-collections
             </artifactId>
             <version>3.2.0-0001-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.felix.commons</groupId>
@@ -396,6 +444,7 @@
                 org.apache.felix.commons.commons-beanutils
             </artifactId>
             <version>1.7.0-0001-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.felix.commons</groupId>
@@ -403,6 +452,7 @@
                 org.apache.felix.commons.commons-codec
             </artifactId>
             <version>1.3.0-0001-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.felix.commons</groupId>
@@ -410,6 +460,7 @@
                 org.apache.felix.commons.cglib-full
             </artifactId>
             <version>2.0.2-0001-SNAPSHOT</version>
+            <optional>true</optional>
         </dependency>
 
     </dependencies>



Mime
View raw message