Author: jukka
Date: Wed Feb 19 13:39:40 2014
New Revision: 1569738
URL: http://svn.apache.org/r1569738
Log:
OAK-1434: Cleanup dependencies of oak-core
JSON-Simple is now available as an OSGi bundle so there's no more need to embed
it
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1569738&r1=1569737&r2=1569738&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Wed Feb 19 13:39:40 2014
@@ -100,9 +100,6 @@
<DynamicImport-Package>
org.apache.felix.jaas.boot
</DynamicImport-Package>
- <Embed-Dependency>
- json-simple;inline=true
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -215,6 +212,11 @@
<artifactId>commons-beanutils</artifactId>
<version>1.9.1</version>
</dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1.1</version>
+ </dependency>
<!-- Optional dependencies for different persistence backends -->
<dependency>
@@ -223,14 +225,6 @@
<optional>true</optional>
</dependency>
- <!-- Embedded (provided) dependency to json-simple -->
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Optional dependency for jclouds s3 to enable s3 cloud store -->
<dependency>
<groupId>org.apache.jclouds.provider</groupId>
Modified: jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml?rev=1569738&r1=1569737&r2=1569738&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml Wed Feb 19 13:39:40 2014
@@ -34,6 +34,7 @@
<include>commons-codec:commons-codec</include>
<include>commons-collections:commons-collections</include>
<include>commons-io:commons-io</include>
+ <include>com.googlecode.json-simple:json-simple</include>
<include>org.apache.jackrabbit:jackrabbit-api</include>
<include>org.apache.jackrabbit:jackrabbit-jcr-commons</include>
<include>org.apache.jackrabbit:oak-commons</include>
