You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2013/01/10 10:57:55 UTC
svn commit: r1431243 - in /stanbol/trunk:
launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml parent/pom.xml
Author: rwesten
Date: Thu Jan 10 09:57:54 2013
New Revision: 1431243
URL: http://svn.apache.org/viewvc?rev=1431243&view=rev
Log:
STANBOL-878: added jackson to parent pom and to the stanbol-commons bundlelist
Modified:
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/trunk/parent/pom.xml
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=1431243&r1=1431242&r2=1431243&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Thu Jan 10 09:57:54 2013
@@ -139,11 +139,6 @@
<artifactId>httpclient-osgi</artifactId>
<version>4.2.1</version>
</bundle>
- <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> Stax is included in JDK 1.6+
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
@@ -164,8 +159,28 @@
<artifactId>joda-time</artifactId>
<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>
+ <version>1.3.1</version>
+ </bundle>
+ <bundle> <!-- used for stream parsing/serialization -->
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.9.11</version>
+ </bundle>
+ <bundle> <!-- JSON Tree model and JSON - Object mappings -->
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.9.11</version>
+ </bundle>
</startLevel>
-
<!-- Jersey -->
<startLevel level="24">
<!-- NOTE: jersey-core bug, must start before jersey-server to avoid
@@ -215,11 +230,6 @@
<artifactId>mimepull</artifactId>
<version>1.4</version>
</bundle>
- <bundle> <!-- used also for all the other JSON parsing/writing in Stanbol -->
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3.1</version>
- </bundle>
</startLevel>
<!-- Clerezza storage and sparql infrastructure -->
Modified: stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1431243&r1=1431242&r2=1431243&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Thu Jan 10 09:57:54 2013
@@ -829,12 +829,24 @@
<version>${freemarker-version}</version>
</dependency>
+ <!-- JSON libraries -->
<!-- Jettison -->
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.3</version>
</dependency>
+ <!-- Jackson -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.9.11</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.9.11</version>
+ </dependency>
<!-- Jena -->
<dependency>