Author: doll
Date: Tue May 6 04:18:15 2008
New Revision: 653746
URL: http://svn.apache.org/viewvc?rev=653746&view=rev
Log:
SHINDIG-235
Patch from David Primmer. Updated abdera dependencies.
Modified:
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/pom.xml
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=653746&r1=653745&r2=653746&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Tue May 6 04:18:15 2008
@@ -79,6 +79,10 @@
<artifactId>abdera-server</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-client</artifactId>
+ </dependency>
+ <dependency>
<artifactId>commons-betwixt</artifactId>
<version>0.8</version>
<groupId>commons-betwixt</groupId>
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=653746&r1=653745&r2=653746&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Tue May 6 04:18:15 2008
@@ -31,42 +31,42 @@
<packaging>pom</packaging>
<name>Apache Shindig Project</name>
-
+
<description>
Shindig is a JavaScript container and implementations of the
backend APIs and proxy required for hosting OpenSocial
applications.
</description>
-
-
+
+
<prerequisites>
<maven>2.0.6</maven>
</prerequisites>
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/</developerConnection>
<url>http://svn.apache.org/viewvc/incubator/shindig/trunk/</url>
</scm>
-
+
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/jira/browse/SHINDIG</url>
</issueManagement>
-
+
<distributionManagement>
<site>
<id>apache.website</id>
<url>scp://people.apache.org/www/incubator.apache.org/shindig</url>
</site>
</distributionManagement>
-
-
+
+
<!--
====================================================================== -->
<!-- M A I L I N G L I S T S
-->
<!--
====================================================================== -->
-
+
<mailingLists>
<mailingList>
<name>Shindig Dev List</name>
@@ -76,12 +76,12 @@
<archive>http://mail-archives.apache.org/mod_mbox/incubator-shindig-dev/</archive>
</mailingList>
</mailingLists>
-
-
+
+
<!--
====================================================================== -->
<!-- P E O P L E
-->
<!--
====================================================================== -->
-
+
<!-- Developers listed by PMC Chair, PMC, Committers, Contributers, all
alphabetical-->
<developers>
<developer>
@@ -249,12 +249,12 @@
<!--Committers-->
<!--End Committers-->
</developers>
-
+
<!--
====================================================================== -->
<!-- P R O F I L E S
-->
<!--
====================================================================== -->
-
-
+
+
<profiles>
<!-- default profile that builds everything -->
<profile>
@@ -265,9 +265,9 @@
<modules>
<module>java</module>
</modules>
-
+
</profile>
-
+
<!-- profile to build java/gadgets -->
<profile>
<id>gadgets</id>
@@ -275,7 +275,7 @@
<module>java/gadgets</module>
</modules>
</profile>
-
+
<!-- profile to build java/rest-api -->
<profile>
<id>social-api</id>
@@ -289,37 +289,37 @@
<module>java/common</module>
</modules>
</profile>
-
+
<profile>
<id>run</id>
<properties>
<runType>full</runType>
</properties>
<modules>
- </modules>
+ </modules>
<dependencies>
-
+
<!-- project dependencies -->
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>gadgets</artifactId>
<version>1-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>social-api</artifactId>
<version>1-SNAPSHOT</version>
</dependency>
-
-
+
+
<!-- external dependencies -->
-
+
</dependencies>
<build>
<defaultGoal>jetty:run-war</defaultGoal>
- <plugins>
+ <plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -347,11 +347,11 @@
<overrideWebXml>${basedir}/java/server/target/shindig-server-${pom.version}/WEB-INF/web.${runType}.xml</overrideWebXml>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
</profile>
-
+
<profile>
<id>reporting</id>
<reporting>
@@ -423,22 +423,22 @@
</plugins>
</build>
</profile>
-
+
</profiles>
-
+
<!--
====================================================================== -->
<!-- B U I L D
-->
<!--
====================================================================== -->
-
-
+
+
<build>
<defaultGoal>install</defaultGoal>
-
+
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>
<outputDirectory>target/classes</outputDirectory>
<testOutputDirectory>target/test-classes</testOutputDirectory>
-
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -497,7 +497,7 @@
</plugin>
-->
</plugins>
-
+
<pluginManagement>
<plugins>
<!-- We want to package up license resources in the JARs
produced -->
@@ -522,8 +522,8 @@
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.9</version>
</plugin>
-
-
+
+
<!-- set versions of common plugins for reproducibility,
ordered alphabetically -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -584,12 +584,12 @@
</plugins>
</pluginManagement>
</build>
-
+
<!--
====================================================================== -->
<!-- R E P O S I T O R I E S
-->
<!--
====================================================================== -->
-
-
+
+
<repositories>
<repository>
<id>caja</id>
@@ -599,7 +599,7 @@
<id>oauth</id>
<url>http://oauth.googlecode.com/svn/code/maven</url>
</repository>
-
+
<!-- For Abdera -->
<repository>
<id>apache-incubating</id>
@@ -609,15 +609,15 @@
<enabled>true</enabled>
</snapshots>
</repository>
-
+
</repositories>
-
-
+
+
<!--
====================================================================== -->
<!-- D E P E N D E N C I E S
-->
<!--
====================================================================== -->
-
-
+
+
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
@@ -643,9 +643,9 @@
<version>2.2.2</version>
<scope>test</scope>
</dependency>
-
+
</dependencies>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -657,8 +657,8 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
@@ -690,9 +690,14 @@
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-server</artifactId>
- <version>0.4.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-client</artifactId>
+ <version>0.5.0-incubating-SNAPSHOT</version>
</dependency>
-
+
</dependencies>
</dependencyManagement>
</project>
