Author: rwesten
Date: Tue Oct 22 08:00:01 2013
New Revision: 1534528
URL: http://svn.apache.org/r1534528
Log:
STANBOL-1094: merged changes related to STANBOL-1182; for the full launcher I
also re-activated the solr.langiage-extra bundlelists
Modified:
stanbol/trunk/launchers/full/pom.xml
stanbol/trunk/launchers/stable/pom.xml
stanbol/trunk/parent/pom.xml
Modified: stanbol/trunk/launchers/full/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full/pom.xml?rev=1534528&r1=1534527&r2=1534528&view=diff
==============================================================================
--- stanbol/trunk/launchers/full/pom.xml (original)
+++ stanbol/trunk/launchers/full/pom.xml Tue Oct 22 08:00:01 2013
@@ -80,7 +80,9 @@
<jarWebSupport>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.2.0</version>
+ <!-- depends on OSGI frameowrk (startLevel=2) and is required
+ by felix.http.whiteboard (startLevel=4) -->
+ <startLevel>3</startLevel>
</jarWebSupport>
</configuration>
</execution>
@@ -279,14 +281,14 @@
</dependency>
<!-- Language Extras -->
- <!-- Basic Cinese language support (STANBOL-855
+ <!-- Basic Cinese language support (STANBOL-855) -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.smartcn</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
<scope>provided</scope>
- </dependency> -->
+ </dependency>
<!-- TODO Paoding does not yet support Solr 4 -->
<!-- dependency>
<groupId>org.apache.stanbol</groupId>
@@ -295,14 +297,14 @@
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency -->
- <!-- Japanese Language Support
+ <!-- Japanese Language Support -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.kuromoji</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
<scope>provided</scope>
- </dependency> -->
+ </dependency>
</dependencies>
</project>
Modified: stanbol/trunk/launchers/stable/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable/pom.xml?rev=1534528&r1=1534527&r2=1534528&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable/pom.xml (original)
+++ stanbol/trunk/launchers/stable/pom.xml Tue Oct 22 08:00:01 2013
@@ -80,7 +80,9 @@
<jarWebSupport>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.2.0</version>
+ <!-- depends on OSGI frameowrk (startLevel=2) and is required
+ by felix.http.whiteboard (startLevel=4) -->
+ <startLevel>3</startLevel>
</jarWebSupport>
</configuration>
</execution>
Modified: stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1534528&r1=1534527&r2=1534528&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Tue Oct 22 08:00:01 2013
@@ -575,13 +575,13 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.2.0</version>
+ <version>2.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>2.2.0</version>
+ <version>2.2.1</version>
<scope>test</scope>
</dependency>
