You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ja...@apache.org on 2012/01/31 14:14:17 UTC
svn commit: r1238491 - /incubator/rave/trunk/rave-shindig/pom.xml
Author: jasha
Date: Tue Jan 31 13:14:16 2012
New Revision: 1238491
URL: http://svn.apache.org/viewvc?rev=1238491&view=rev
Log:
RAVE-453 use the (lenient) JSON parser from Shindig instead of rave-core that allows comments in JSON (although there is no such concept as comments in JSON)
Modified:
incubator/rave/trunk/rave-shindig/pom.xml
Modified: incubator/rave/trunk/rave-shindig/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/pom.xml?rev=1238491&r1=1238490&r2=1238491&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/pom.xml (original)
+++ incubator/rave/trunk/rave-shindig/pom.xml Tue Jan 31 13:14:16 2012
@@ -41,12 +41,21 @@
<dependency>
<groupId>org.apache.rave</groupId>
<artifactId>rave-core</artifactId>
- <!-- Shindig common adds jsp & el jars to the war that cause conflicts in Tomcat -->
<exclusions>
+ <!-- Shindig common adds jsp & el jars to the war that cause conflicts in Tomcat -->
<exclusion>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
</exclusion>
+ <!--
+ Shindig contains JSON files with "comments" as if they were JavaScript files.
+ The JSON parser that ships with rave-core isn't as lenient as older versions and throws an exception
+ on comments.
+ -->
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -156,11 +165,11 @@
<build>
<defaultGoal>install</defaultGoal>
<testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -177,9 +186,6 @@
<overlay>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-server</artifactId>
- <excludes>
- <exclude>WEB-INF/lib/json-20070829.jar</exclude>
- </excludes>
</overlay>
</overlays>
</configuration>