Author: rwesten
Date: Wed May 20 09:58:13 2015
New Revision: 1680508
URL: http://svn.apache.org/r1680508
Log:
STANBOL-1419: Updates Sling Launchpad to 5.0.0-2.6.0; updated the way how the
Felix Http API is treated (in preperation of providing a WAR launcher)
Modified:
stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
stanbol/trunk/launchers/full/pom.xml
stanbol/trunk/parent/pom.xml
Modified:
stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml?rev=1680508&r1=1680507&r2=1680508&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
(original)
+++ stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
Wed May 20 09:58:13 2015
@@ -114,14 +114,20 @@
<!-- HTTP service and Http related Utilities -->
<!--
- NOTE: in case of a JAR launcher the <jarWebSupport> bundle (by default the
- felix.http.jetty bundle) is expected to use a startLevel of 3
+ NOTE: This only include packages needed for WAR and JAR launchers. The
+ <jarWebsupport> if the JAR launcher will add additional bundles and
the
+ Launchpad Maven plugin will include the http.bridge bundle.
-->
- <startLevel level="4">
+ <startLevel level="1">
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.api</artifactId>
+ <version>${felix-http-version}</version>
+ </bundle>
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>2.3.2</version>
+ <version>${felix-http-version}</version>
</bundle>
</startLevel>
Modified: stanbol/trunk/launchers/full/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full/pom.xml?rev=1680508&r1=1680507&r2=1680508&view=diff
==============================================================================
--- stanbol/trunk/launchers/full/pom.xml (original)
+++ stanbol/trunk/launchers/full/pom.xml Wed May 20 09:58:13 2015
@@ -81,23 +81,16 @@
<bundles>
<bundle>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <!-- explicit version is required (STANBOL-1402) -->
- <version>${felix-jetty-version}</version>
- <startLevel>3</startLevel>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
<!-- explicit version is required (STANBOL-1402) -->
- <version>${felix-http-api-version}</version>
- <startLevel>3</startLevel>
+ <version>${felix-servlet-api-version}</version>
+ <startLevel>1</startLevel>
</bundle>
<bundle>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
<!-- explicit version is required (STANBOL-1402) -->
- <version>${felix-sevlet-api-version}</version>
+ <version>${felix-jetty-version}</version>
<startLevel>3</startLevel>
</bundle>
</bundles>
@@ -236,24 +229,6 @@
<scope>provided</scope>
</dependency>
- <!-- Stanbol CMS Adapter Bundle List
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.launchers.bundlelists.cmsadapter</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <type>partialbundlelist</type>
- <scope>provided</scope>
- </dependency> -->
-
- <!-- Stanbol Contenthub Bundle List
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.launchers.bundlelists.contenthub</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <type>partialbundlelist</type>
- <scope>provided</scope>
- </dependency> -->
-
<!-- Stanbol Data Bundle List -->
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1680508&r1=1680507&r2=1680508&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Wed May 20 09:58:13 2015
@@ -79,9 +79,9 @@
<hk2-version>2.3.0</hk2-version>
<!-- OSGi http service versions for jar launchers (see also STANBOL-1402)
-->
- <felix-http-api-version>2.3.2</felix-http-api-version>
+ <felix-http-version>2.3.2</felix-http-version>
<felix-jetty-version>3.0.2</felix-jetty-version>
- <felix-sevlet-api-version>1.1.0</felix-sevlet-api-version>
+ <felix-servlet-api-version>1.1.0</felix-servlet-api-version>
<!-- logging and test dep. versions -->
<slf4j-version>1.7.12</slf4j-version>
@@ -608,7 +608,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.api</artifactId>
- <version>${felix-http-api-version}</version>
+ <version>${felix-http-version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -618,7 +618,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>2.3.2</version>
+ <version>${felix-http-version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -1527,13 +1527,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.base</artifactId>
- <version>4.6.1-2.5.8</version>
+ <version>5.0.0-2.6.0</version>
<classifier>app</classifier>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.base</artifactId>
- <version>4.6.1-2.5.8</version>
+ <version>5.0.0-2.6.0</version>
<classifier>webapp</classifier>
<type>war</type>
</dependency>
@@ -1555,7 +1555,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.6.2</version>
+ <version>3.6.4</version>
</dependency>
<!-- Testing Deps -->
