Author: rwesten
Date: Mon Jun 23 11:49:49 2014
New Revision: 1604763
URL: http://svn.apache.org/r1604763
Log:
STANBOL-1356: updated to Felix HTTP 2.3.0 bundles for trunk
Modified:
stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
stanbol/trunk/launchers/full-war/pom.xml
stanbol/trunk/launchers/full/pom.xml
stanbol/trunk/launchers/mini/pom.xml
stanbol/trunk/launchers/stable/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=1604763&r1=1604762&r2=1604763&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
(original)
+++ stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
Mon Jun 23 11:49:49 2014
@@ -121,7 +121,7 @@
<bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>2.2.2</version>
+ <version>2.3.0</version>
</bundle>
</startLevel>
Modified: stanbol/trunk/launchers/full-war/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full-war/pom.xml?rev=1604763&r1=1604762&r2=1604763&view=diff
==============================================================================
--- stanbol/trunk/launchers/full-war/pom.xml (original)
+++ stanbol/trunk/launchers/full-war/pom.xml Mon Jun 23 11:49:49 2014
@@ -63,12 +63,11 @@
</goals>
<configuration>
<includeDefaultBundles>false</includeDefaultBundles>
- <!-- Standalone jar requires an OSGi http service implementation
-->
- <jarWebSupport>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.2.0</version>
- </jarWebSupport>
+ <!-- jarWebSupport> - not needed for a WAR launcher -
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <startLevel>3</startLevel>
+ </jarWebSupport -->
</configuration>
</execution>
</executions>
@@ -79,10 +78,11 @@
<configuration>
<archive>
<manifest>
- <!-- make the generated jar runnable -->
- <addClasspath>true</addClasspath>
- <mainClass>org.apache.sling.launchpad.app.Main</mainClass>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <!-- not needed for a WAR launcher
+ <addClasspath>true</addClasspath>
+ <mainClass>org.apache.sling.launchpad.app.Main</mainClass>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ -->
</manifest>
</archive>
</configuration>
Modified: stanbol/trunk/launchers/full/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full/pom.xml?rev=1604763&r1=1604762&r2=1604763&view=diff
==============================================================================
--- stanbol/trunk/launchers/full/pom.xml (original)
+++ stanbol/trunk/launchers/full/pom.xml Mon Jun 23 11:49:49 2014
@@ -78,11 +78,23 @@
<includeDefaultBundles>false</includeDefaultBundles>
<!-- Standalone jar requires an OSGi http service implementation
-->
<jarWebSupport>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <!-- depends on OSGI frameowrk (startLevel=2) and is required
- by felix.http.whiteboard (startLevel=4) -->
- <startLevel>3</startLevel>
+ <bundles>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <startLevel>3</startLevel>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.api</artifactId>
+ <startLevel>3</startLevel>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <startLevel>3</startLevel>
+ </bundle>
+ </bundles>
</jarWebSupport>
</configuration>
</execution>
Modified: stanbol/trunk/launchers/mini/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini/pom.xml?rev=1604763&r1=1604762&r2=1604763&view=diff
==============================================================================
--- stanbol/trunk/launchers/mini/pom.xml (original)
+++ stanbol/trunk/launchers/mini/pom.xml Mon Jun 23 11:49:49 2014
@@ -80,11 +80,23 @@
<includeDefaultBundles>false</includeDefaultBundles>
<!-- Standalone jar requires an OSGi http service implementation
-->
<jarWebSupport>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <!-- depends on OSGI framework (startLevel=2) and is required
- by felix.http.whiteboard (startLevel=4) -->
- <startLevel>3</startLevel>
+ <bundles>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <startLevel>3</startLevel>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.api</artifactId>
+ <startLevel>3</startLevel>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <startLevel>3</startLevel>
+ </bundle>
+ </bundles>
</jarWebSupport>
</configuration>
</execution>
Modified: stanbol/trunk/launchers/stable/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable/pom.xml?rev=1604763&r1=1604762&r2=1604763&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable/pom.xml (original)
+++ stanbol/trunk/launchers/stable/pom.xml Mon Jun 23 11:49:49 2014
@@ -78,11 +78,23 @@
<includeDefaultBundles>false</includeDefaultBundles>
<!-- Standalone jar requires an OSGi http service implementation
-->
<jarWebSupport>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <!-- depends on OSGI frameowrk (startLevel=2) and is required
- by felix.http.whiteboard (startLevel=4) -->
- <startLevel>3</startLevel>
+ <bundles>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <startLevel>3</startLevel>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.api</artifactId>
+ <startLevel>3</startLevel>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <startLevel>3</startLevel>
+ </bundle>
+ </bundles>
</jarWebSupport>
</configuration>
</execution>
Modified: stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1604763&r1=1604762&r2=1604763&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Mon Jun 23 11:49:49 2014
@@ -575,19 +575,26 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>1.4.0</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.2.2</version>
- <scope>test</scope>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>2.2.1</version>
- <scope>test</scope>
+ <version>2.3.0</version>
</dependency>
