Author: mfranklin
Date: Mon Jan 28 22:05:52 2013
New Revision: 1439663
URL: http://svn.apache.org/viewvc?rev=1439663&view=rev
Log:
Added shindig-dependencies RAVE-525
Modified:
rave/trunk/pom.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml
Modified: rave/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1439663&r1=1439662&r2=1439663&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Mon Jan 28 22:05:52 2013
@@ -175,6 +175,18 @@
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-server-resources</artifactId>
+ <version>${apache.shindig.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-server-dependencies</artifactId>
+ <version>${apache.shindig.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
<version>${apache.shindig.version}</version>
</dependency>
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml?rev=1439663&r1=1439662&r2=1439663&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-dependencies/pom.xml
Mon Jan 28 22:05:52 2013
@@ -19,7 +19,8 @@
$Id$
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -34,4 +35,49 @@
<description>Apache Rave Shindig Dependencies</description>
<packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-server-dependencies</artifactId>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-opensocial-core</artifactId>
+ <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>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-server</artifactId>
+ <type>war</type>
+ </dependency>
+
+ <!-- log4j logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
</project>
