Author: rwesten
Date: Fri Apr 19 10:16:06 2013
New Revision: 1469770
URL: http://svn.apache.org/r1469770
Log:
STANBOL-925: removed WoodStox dependency alltogether as it is no longer
required after the upgrade to Solr 4; STANBOL-1044: json.org is only a
transitive dependency of the Apache Felix Webconsole and not directly used by
Apache Stanbol. To make this more clear the dependency was moved from the
stanbolcommons bundlelist to the osgiframework bundlelist. Also added an
according comment
Modified:
stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.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=1469770&r1=1469769&r2=1469770&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
(original)
+++ stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
Fri Apr 19 10:16:06 2013
@@ -123,6 +123,11 @@
<!-- Felix web console and plugins -->
<startLevel level="21">
+ <bundle> <!-- Required by the Felix Webconsole -->
+ <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</artifactId>
Modified:
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1469770&r1=1469769&r2=1469770&view=diff
==============================================================================
---
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
(original)
+++
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
Fri Apr 19 10:16:06 2013
@@ -163,11 +163,11 @@
<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
<version>2.1.0</version>
</bundle -->
- <bundle> <!-- woodstox Stax impl as bundle provided by
servicemix.apache.org -->
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
- <version>3.2.9_3</version>
- </bundle>
+ <!-- bundle> - no longer used by Stanbol -
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>4.2.0</version>
+ </bundle -->
<bundle> <!-- jarkata regexp as bundle provided by servicemix.apache.org
-->
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.regexp</artifactId>
@@ -179,11 +179,6 @@
<version>1.6.2</version>
</bundle>
<!-- JSON libs -->
- <bundle> <!-- org.json as bundle provided by geronimo.apache.org-->
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>json</artifactId>
- <version>20090211_1</version>
- </bundle>
<bundle> <!-- used for simple JSON parsing/writing in Stanbol -->
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
@@ -205,6 +200,7 @@
<version>1.9.12</version>
</bundle>
<!-- Velocity -->
+ <!-- only used by Enhancer Benchmarking
(org.apache.stanbol.enhancer.benchmark) -->
<bundle>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
