Author: vsiveton
Date: Tue Mar 10 10:20:08 2009
New Revision: 752033
URL: http://svn.apache.org/viewvc?rev=752033&view=rev
Log:
o merged from r751769 and r752032 (added undeclared dependencies given by mvn
dependency:analyze and added aopalliance dependency which is used by guice)
Modified:
incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml
incubator/shindig/branches/1.0.x-incubating/pom.xml
Modified: incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml?rev=752033&r1=752032&r2=752033&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml Tue Mar 10
10:20:08 2009
@@ -75,6 +75,10 @@
<artifactId>guice</artifactId>
</dependency>
<dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
</dependency>
@@ -110,5 +114,12 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
+
+ <!-- test -->
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml?rev=752033&r1=752032&r2=752033&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml Tue Mar 10
10:20:08 2009
@@ -145,6 +145,10 @@
<artifactId>guice</artifactId>
</dependency>
<dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<scope>compile</scope>
@@ -175,5 +179,17 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml?rev=752033&r1=752032&r2=752033&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml Tue Mar 10
10:20:08 2009
@@ -74,6 +74,10 @@
<artifactId>guice</artifactId>
</dependency>
<dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
Modified: incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml?rev=752033&r1=752032&r2=752033&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml Tue Mar 10
10:20:08 2009
@@ -116,6 +116,10 @@
<!-- project dependencies -->
<dependency>
<groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
</dependency>
<dependency>
@@ -129,6 +133,18 @@
<!-- external dependencies -->
<dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<scope>test</scope>
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml?rev=752033&r1=752032&r2=752033&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml
(original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml Tue Mar
10 10:20:08 2009
@@ -82,15 +82,14 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
</dependency>
<dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
</dependency>
@@ -107,19 +106,8 @@
<groupId>commons-collections</groupId>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>net.oauth</groupId>
<artifactId>core</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
</dependency>
<!-- may only be needed for JDK < 1.6 -->
<dependency>
@@ -139,9 +127,50 @@
<artifactId>xpp3</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ezmorph</groupId>
+ <artifactId>ezmorph</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+
+ <!-- test -->
+ <dependency>
<groupId>woodstox</groupId>
<artifactId>wstx</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shindig/branches/1.0.x-incubating/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/pom.xml?rev=752033&r1=752032&r2=752033&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/pom.xml Tue Mar 10 10:20:08 2009
@@ -1130,6 +1130,12 @@
<artifactId>guice</artifactId>
<version>1.0</version>
</dependency>
+ <!-- dependency not declared in guice pom -->
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ </dependency>
<dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
@@ -1272,10 +1278,30 @@
<version>2.9.1</version>
</dependency>
<dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.04</version>
+ </dependency>
+ <dependency>
<groupId>woodstox</groupId>
<artifactId>wstx</artifactId>
<version>1.0.7</version>
</dependency>
+ <dependency>
+ <groupId>net.sf.ezmorph</groupId>
+ <artifactId>ezmorph</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
