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/10/17 17:04:20 UTC
svn commit: r1533101 - in /sling/trunk/launchpad/builder: pom.xml
src/main/bundles/list.xml
Author: bdelacretaz
Date: Thu Oct 17 15:04:20 2013
New Revision: 1533101
URL: http://svn.apache.org/r1533101
Log:
SLING-3155 - prepare for Oak/Jackrabbit switch, most bundles are now installed by the OSGi installer
Modified:
sling/trunk/launchpad/builder/pom.xml
sling/trunk/launchpad/builder/src/main/bundles/list.xml
Modified: sling/trunk/launchpad/builder/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/pom.xml?rev=1533101&r1=1533100&r2=1533101&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/pom.xml (original)
+++ sling/trunk/launchpad/builder/pom.xml Thu Oct 17 15:04:20 2013
@@ -65,6 +65,9 @@
Context path of the Sling web application
-->
<jetty.sling.context>/</jetty.sling.context>
+
+ <!-- trick maven-launchpad-plugin into not copying any configs -->
+ <empty.config.directory>${project.build.directory}/NOCONFIGS</empty.config.directory>
</properties>
@@ -91,8 +94,14 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2.0</version>
<extensions>true</extensions>
+ <configuration>
+ <includeDefaultBundles>false</includeDefaultBundles>
+ <bundlesDirectory>install</bundlesDirectory>
+ <bootDirectory>bundles</bootDirectory>
+ <configDirectory>${empty.config.directory}</configDirectory>
+ </configuration>
<executions>
<execution>
<id>prepare-package-war</id>
@@ -110,12 +119,6 @@
</configuration>
</execution>
<execution>
- <id>attach-bundle-list</id>
- <goals>
- <goal>attach-bundle-list</goal>
- </goals>
- </execution>
- <execution>
<id>create-bundle-jar</id>
<goals>
<goal>create-bundle-jar</goal>
@@ -133,6 +136,24 @@
</plugin>
<plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${empty.config.directory}"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1533101&r1=1533100&r2=1533101&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Thu Oct 17 15:04:20 2013
@@ -1,7 +1,86 @@
<?xml version="1.0"?>
<bundles>
+ <startLevel level="boot">
+ <!-- bootstrap bundles, must allow the installer core to start -->
+ <bundle>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.4</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.log</artifactId>
+ <version>3.0.3-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.logservice</artifactId>
+ <version>1.0.2</version>
+ </bundle>
+ <bundle>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.6.4</version>
+ </bundle>
+ <bundle>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>1.6.4</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings</artifactId>
+ <version>1.3.0</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>
+ <version>1.0.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.javax.activation</artifactId>
+ <version>0.1.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.fragment.ws</artifactId>
+ <version>1.0.2</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.installer</artifactId>
+ <version>1.2.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.installer.core</artifactId>
+ <version>3.4.7-SNAPSHOT</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.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.6.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>1.3.2</version>
+ </bundle>
+ </startLevel>
+
<startLevel level="0">
- <!-- Dependencies for Default Start Level -->
+ <!-- Default Start Level -->
<bundle>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -90,11 +169,6 @@
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.settings</artifactId>
- <version>1.3.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.serviceusermapper</artifactId>
<version>0.0.1-SNAPSHOT</version>
</bundle>
@@ -232,16 +306,6 @@
<bundle>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.installer</artifactId>
- <version>1.2.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.4.7-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.console</artifactId>
<version>1.0.0</version>
</bundle>
@@ -252,62 +316,10 @@
</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>
</startLevel>
- <startLevel level="1">
- <bundle>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.log</artifactId>
- <version>3.0.3-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.logservice</artifactId>
- <version>1.0.2</version>
- </bundle>
- <bundle>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.4</version>
- </bundle>
- <bundle>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>1.6.4</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>
- <version>1.0.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.javax.activation</artifactId>
- <version>0.1.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.fragment.ws</artifactId>
- <version>1.0.2</version>
- </bundle>
- </startLevel>
<startLevel level="5">
<bundle>
<groupId>org.apache.sling</groupId>
@@ -409,21 +421,11 @@
<startLevel level="10">
<bundle>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.eventadmin</artifactId>
- <version>1.3.2</version>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>1.6.0</version>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.6.0</version>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
<version>1.0.8</version>
</bundle>