You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2013/08/16 10:57:29 UTC

svn commit: r1514625 - in /sling/whiteboard/bdelacretaz/oak-launchpad: pom.xml src/main/bundles/list.xml

Author: bdelacretaz
Date: Fri Aug 16 08:57:29 2013
New Revision: 1514625

URL: http://svn.apache.org/r1514625
Log:
SLING-3016 - build with includeDefaultBundles and provide full list.xml of bundles to make things clearer

Modified:
    sling/whiteboard/bdelacretaz/oak-launchpad/pom.xml
    sling/whiteboard/bdelacretaz/oak-launchpad/src/main/bundles/list.xml

Modified: sling/whiteboard/bdelacretaz/oak-launchpad/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/oak-launchpad/pom.xml?rev=1514625&r1=1514624&r2=1514625&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/oak-launchpad/pom.xml (original)
+++ sling/whiteboard/bdelacretaz/oak-launchpad/pom.xml Fri Aug 16 08:57:29 2013
@@ -25,6 +25,7 @@
             <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>maven-launchpad-plugin</artifactId>
+                <version>2.2.0</version>
                 <executions>
                     <execution>
                         <id>prepare-package</id>
@@ -32,7 +33,7 @@
                             <goal>prepare-package</goal>
                         </goals>
                         <configuration>
-                            <includeDefaultBundles>true</includeDefaultBundles>
+                            <includeDefaultBundles>false</includeDefaultBundles>
                             <!-- Standalone jar requires an OSGi http service 
                                 implementation -->
                             <jarWebSupport>

Modified: sling/whiteboard/bdelacretaz/oak-launchpad/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/oak-launchpad/src/main/bundles/list.xml?rev=1514625&r1=1514624&r2=1514625&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/oak-launchpad/src/main/bundles/list.xml (original)
+++ sling/whiteboard/bdelacretaz/oak-launchpad/src/main/bundles/list.xml Fri Aug 16 08:57:29 2013
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <bundles>
     <startLevel level="0">
-        <!-- Dependencies for Default Start Level -->
         <bundle>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -18,26 +17,11 @@
             <version>3.2.1</version>
         </bundle>
         <bundle>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.6</version>
-        </bundle>
-        <bundle>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
             <version>2.5</version>
         </bundle>
         <bundle>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math</artifactId>
-            <version>2.2</version>
-        </bundle>
-        <bundle>
-            <groupId>org.apache.geronimo.bundles</groupId> 
-            <artifactId>commons-httpclient</artifactId> 
-            <version>3.1_1</version> 
-        </bundle>
-        <bundle>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.osgi</artifactId>
             <version>2.2.0</version>
@@ -49,7 +33,8 @@
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.classloader</artifactId>
+            <artifactId>org.apache.sling.commons.classloader
+            </artifactId>
             <version>1.3.0</version>
         </bundle>
         <bundle>
@@ -64,25 +49,9 @@
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.discovery.api</artifactId>
-            <version>1.0.0</version>
-        </bundle>
-        <bundle>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.discovery.support</artifactId>
-            <version>1.0.0</version>
-        </bundle>
-        <bundle>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.discovery.impl</artifactId>
-            <version>1.0.0</version>
-        </bundle>
-        <bundle>
-            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.event</artifactId>
             <version>3.2.0</version>
         </bundle>
-
         <bundle>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
@@ -95,11 +64,6 @@
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.resourceresolver</artifactId>
-            <version>1.0.6</version>
-        </bundle>
-        <bundle>
-            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.auth.core</artifactId>
             <version>1.1.2</version>
         </bundle>
@@ -165,7 +129,8 @@
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.bundleresource.impl</artifactId>
+            <artifactId>org.apache.sling.bundleresource.impl
+            </artifactId>
             <version>2.1.2</version>
         </bundle>
         <bundle>
@@ -173,15 +138,11 @@
             <artifactId>org.apache.sling.fsresource</artifactId>
             <version>1.1.2</version>
         </bundle>
-
-        <!-- Launchpad initial content -->
         <bundle>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.launchpad.content</artifactId>
             <version>2.0.6</version>
         </bundle>
-
-        <!-- scripting -->
         <bundle>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.api</artifactId>
@@ -194,7 +155,8 @@
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.scripting.javascript</artifactId>
+            <artifactId>org.apache.sling.scripting.javascript
+            </artifactId>
             <version>2.0.12</version>
         </bundle>
         <bundle>
@@ -204,78 +166,130 @@
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.scripting.jsp.taglib</artifactId>
+            <artifactId>org.apache.sling.scripting.jsp.taglib
+            </artifactId>
             <version>2.1.8</version>
         </bundle>
         <bundle>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2_1</version>
-        </bundle>
-        <bundle>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <version>1.8.2</version>
         </bundle>
-
-        <!-- felix httpservice whiteboard -->
         <bundle>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.whiteboard</artifactId>
             <version>2.2.0</version>
         </bundle>
-        
+        <bundle>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx.api</artifactId>
+            <version>0.3</version>
+        </bundle>
+        <bundle>
+            <groupId>org.apache.aries</groupId>
+            <artifactId>org.apache.aries.util</artifactId>
+            <version>0.3</version>
+        </bundle>
+        <bundle>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx.core</artifactId>
+            <version>0.3</version>
+        </bundle>
+        <bundle>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx.whiteboard</artifactId>
+            <version>0.3</version>
+        </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.launchpad.installer</artifactId>
+            <artifactId>org.apache.sling.launchpad.installer
+            </artifactId>
             <version>1.2.0</version>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.api</artifactId>
+            <artifactId>org.apache.sling.installer.core</artifactId>
+            <version>3.4.6</version>
+        </bundle>
+        <bundle>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.installer.provider.file
+            </artifactId>
+            <version>1.0.2</version>
+        </bundle>
+        <bundle>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.installer.provider.jcr
+            </artifactId>
+            <version>3.1.6</version>
+        </bundle>
+        <bundle>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.6</version>
+        </bundle>
+        <bundle>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math</artifactId>
+            <version>2.2</version>
+        </bundle>
+        <bundle>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1_1</version>
+        </bundle>
+        <bundle>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.discovery.api</artifactId>
             <version>1.0.0</version>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.core</artifactId>
-            <version>3.4.6</version>
+            <artifactId>org.apache.sling.discovery.support</artifactId>
+            <version>1.0.0</version>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.console</artifactId>
+            <artifactId>org.apache.sling.discovery.impl</artifactId>
             <version>1.0.0</version>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.factory.configuration</artifactId>
-            <version>1.0.10</version>
+            <artifactId>org.apache.sling.resourceresolver</artifactId>
+            <version>1.0.6</version>
+        </bundle>
+        <bundle>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2_1</version>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.provider.file</artifactId>
-            <version>1.0.2</version>
+            <artifactId>org.apache.sling.installer.api</artifactId>
+            <version>1.0.0</version>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.provider.jcr</artifactId>
-            <version>3.1.6</version>
+            <artifactId>org.apache.sling.installer.console</artifactId>
+            <version>1.0.0</version>
         </bundle>
-    </startLevel>
-    <startLevel level="1">
         <bundle>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.6.4</version>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.installer.factory.configuration
+            </artifactId>
+            <version>1.0.10</version>
         </bundle>
+    </startLevel>
+    <startLevel level="1">
         <bundle>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.log</artifactId>
             <version>3.0.0</version>
         </bundle>
         <bundle>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.logservice</artifactId>
-            <version>1.0.2</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.4</version>
         </bundle>
         <bundle>
             <groupId>org.slf4j</groupId>
@@ -289,12 +303,18 @@
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.commons.logservice</artifactId>
+            <version>1.0.2</version>
+        </bundle>
+        <bundle>
+            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.fragment.xml</artifactId>
             <version>1.0.2</version>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.fragment.transaction</artifactId>
+            <artifactId>org.apache.sling.fragment.transaction
+            </artifactId>
             <version>1.0.0</version>
         </bundle>
         <bundle>
@@ -307,21 +327,23 @@
             <artifactId>org.apache.sling.fragment.ws</artifactId>
             <version>1.0.2</version>
         </bundle>
+        <bundle>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.http.jetty</artifactId>
+            <version>2.2.0</version>
+        </bundle>
     </startLevel>
     <startLevel level="5">
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.extensions.webconsolebranding</artifactId>
+            <artifactId>org.apache.sling.extensions.webconsolebranding
+            </artifactId>
             <version>1.0.0</version>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.extensions.webconsolesecurityprovider</artifactId>
-            <version>1.0.0</version>
-        </bundle>
-        <bundle>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.inventory</artifactId>
+            <artifactId>org.apache.sling.extensions.webconsolesecurityprovider
+            </artifactId>
             <version>1.0.0</version>
         </bundle>
         <bundle>
@@ -330,28 +352,15 @@
             <version>4.2.0</version>
         </bundle>
         <bundle>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>json</artifactId>
-            <version>20090211_1</version>
-        </bundle>
-        <bundle>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.webconsole.plugins.ds</artifactId>
-            <version>1.0.0</version>
-        </bundle>
-        <bundle>
             <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.webconsole.plugins.packageadmin</artifactId>
-            <version>1.0.0</version>
-        </bundle>
-        <bundle>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.webconsole.plugins.event</artifactId>
+            <artifactId>org.apache.felix.webconsole.plugins.event
+            </artifactId>
             <version>1.0.2</version>
         </bundle>
         <bundle>
             <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.webconsole.plugins.memoryusage</artifactId>
+            <artifactId>org.apache.felix.webconsole.plugins.memoryusage
+            </artifactId>
             <version>1.0.4</version>
         </bundle>
         <bundle>
@@ -366,7 +375,8 @@
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.extensions.threaddump</artifactId>
+            <artifactId>org.apache.sling.extensions.threaddump
+            </artifactId>
             <version>0.2.2</version>
         </bundle>
         <bundle>
@@ -376,31 +386,31 @@
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.extensions.explorer</artifactId>
+            <artifactId>org.apache.sling.extensions.explorer
+            </artifactId>
             <version>1.0.2</version>
         </bundle>
         <bundle>
-            <groupId>org.apache.aries.jmx</groupId>
-            <artifactId>org.apache.aries.jmx.api</artifactId>
-            <version>0.3</version>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.inventory</artifactId>
+            <version>1.0.0</version>
         </bundle>
         <bundle>
-            <groupId>org.apache.aries</groupId>
-            <artifactId>org.apache.aries.util</artifactId>
-            <version>0.3</version>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>json</artifactId>
+            <version>20090211_1</version>
         </bundle>
         <bundle>
-            <groupId>org.apache.aries.jmx</groupId>
-            <artifactId>org.apache.aries.jmx.core</artifactId>
-            <version>0.3</version>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.webconsole.plugins.ds</artifactId>
+            <version>1.0.0</version>
         </bundle>
         <bundle>
-            <groupId>org.apache.aries.jmx</groupId>
-            <artifactId>org.apache.aries.jmx.whiteboard</artifactId>
-            <version>0.3</version>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.webconsole.plugins.packageadmin</artifactId>
+            <version>1.0.0</version>
         </bundle>
     </startLevel>
-
     <startLevel level="10">
         <bundle>
             <groupId>org.apache.felix</groupId>
@@ -427,18 +437,12 @@
             <artifactId>tika-core</artifactId>
             <version>1.2</version>
         </bundle>
-        <bundle>
-            <groupId>org.apache.tika</groupId>
-            <artifactId>tika-bundle</artifactId>
-            <version>1.2</version>
-        </bundle>
     </startLevel>
-
     <startLevel level="15">
         <bundle>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.jcr-wrapper</artifactId>
-            <version>2.0.0</version>
+            <groupId>javax.jcr</groupId>
+            <artifactId>jcr</artifactId>
+            <version>2.0</version>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
@@ -461,6 +465,11 @@
             <version>10.5.3.0_1</version>
         </bundle>
         <bundle>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-bundle</artifactId>
+            <version>1.2</version>
+        </bundle>
+        <bundle>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.jackrabbit.server</artifactId>
             <version>2.1.2</version>
@@ -492,12 +501,12 @@
         </bundle>
         <bundle>
             <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-webdav</artifactId>
+            <artifactId>jackrabbit-jcr-rmi</artifactId>
             <version>2.4.2</version>
         </bundle>
         <bundle>
             <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-jcr-rmi</artifactId>
+            <artifactId>jackrabbit-webdav</artifactId>
             <version>2.4.2</version>
         </bundle>
         <bundle>
@@ -510,5 +519,10 @@
             <artifactId>org.apache.sling.jcr.davex</artifactId>
             <version>1.1.0</version>
         </bundle>
+        <bundle>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.jcr.jcr-wrapper</artifactId>
+            <version>2.0.0</version>
+        </bundle>
     </startLevel>
-</bundles>
+</bundles>
\ No newline at end of file