Author: julien_viet Date: 2011-04-27 13:12:56 -0400 (Wed, 27 Apr 2011) New Revision: 6378 Modified: components/shindig/trunk/java/common/pom.xml components/shindig/trunk/java/gadgets/pom.xml components/shindig/trunk/java/samples/pom.xml components/shindig/trunk/java/server/pom.xml components/shindig/trunk/java/social-api/pom.xml components/shindig/trunk/pom.xml Log: GTNPORTAL-1883 : Update Shindig to use gatein-dep pom parent 1.1.0-Beta02 Modified: components/shindig/trunk/java/common/pom.xml =================================================================== --- components/shindig/trunk/java/common/pom.xml 2011-04-27 17:08:58 UTC (rev 6377) +++ components/shindig/trunk/java/common/pom.xml 2011-04-27 17:12:56 UTC (rev 6378) @@ -77,11 +77,11 @@ <dependencies> <!-- external dependencies --> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>com.google.inject.extensions</groupId> <artifactId>guice-jmx</artifactId> </dependency> <dependency> Modified: components/shindig/trunk/java/gadgets/pom.xml =================================================================== --- components/shindig/trunk/java/gadgets/pom.xml 2011-04-27 17:08:58 UTC (rev 6377) +++ components/shindig/trunk/java/gadgets/pom.xml 2011-04-27 17:12:56 UTC (rev 6378) @@ -126,7 +126,7 @@ so we have a single place to change the version --> <dependency> - <groupId>org.jdom</groupId> + <groupId>jdom</groupId> <artifactId>jdom</artifactId> </dependency> <dependency> @@ -154,11 +154,11 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>com.google.inject.extensions</groupId> <artifactId>guice-jmx</artifactId> </dependency> <dependency> Modified: components/shindig/trunk/java/samples/pom.xml =================================================================== --- components/shindig/trunk/java/samples/pom.xml 2011-04-27 17:08:58 UTC (rev 6377) +++ components/shindig/trunk/java/samples/pom.xml 2011-04-27 17:12:56 UTC (rev 6378) @@ -88,11 +88,11 @@ </dependency> <!-- external depenencies --> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>com.google.inject.extensions</groupId> <artifactId>guice-jmx</artifactId> </dependency> <dependency> Modified: components/shindig/trunk/java/server/pom.xml =================================================================== --- components/shindig/trunk/java/server/pom.xml 2011-04-27 17:08:58 UTC (rev 6377) +++ components/shindig/trunk/java/server/pom.xml 2011-04-27 17:12:56 UTC (rev 6378) @@ -144,11 +144,11 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>com.google.inject.extensions</groupId> <artifactId>guice-jmx</artifactId> </dependency> <dependency> Modified: components/shindig/trunk/java/social-api/pom.xml =================================================================== --- components/shindig/trunk/java/social-api/pom.xml 2011-04-27 17:08:58 UTC (rev 6377) +++ components/shindig/trunk/java/social-api/pom.xml 2011-04-27 17:12:56 UTC (rev 6378) @@ -83,11 +83,11 @@ <type>jar</type> </dependency> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.google.code.guice</groupId> + <groupId>com.google.inject.extensions</groupId> <artifactId>guice-jmx</artifactId> </dependency> <dependency> @@ -138,7 +138,7 @@ </dependency> <dependency> <groupId>xpp3</groupId> - <artifactId>xpp3_min</artifactId> + <artifactId>xpp3</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> Modified: components/shindig/trunk/pom.xml =================================================================== --- components/shindig/trunk/pom.xml 2011-04-27 17:08:58 UTC (rev 6377) +++ components/shindig/trunk/pom.xml 2011-04-27 17:12:56 UTC (rev 6378) @@ -1230,6 +1230,16 @@ <dependencyManagement> <dependencies> + + <!-- GateIn dependencies --> + <dependency> + <groupId>org.gatein</groupId> + <artifactId>gatein-dep</artifactId> + <version>1.1.0-Beta02</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <!-- project dependencies --> <dependency> <groupId>org.gatein.shindig</groupId> @@ -1265,59 +1275,6 @@ <!-- external dependencies --> <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-jmx</artifactId> - <version>2.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.guava</groupId> - <artifactId>guava</artifactId> - <version>r09</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20070829</version> - </dependency> - <dependency> - <groupId>caja</groupId> - <artifactId>caja</artifactId> - <version>r3375</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>caja</groupId> - <artifactId>json_simple</artifactId> - <version>r1</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>net.oauth.core</groupId> <artifactId>oauth</artifactId> <version>20090531</version> @@ -1342,100 +1299,33 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - <scope>compile</scope> - </dependency> - <dependency> <artifactId>commons-betwixt</artifactId> <groupId>commons-betwixt</groupId> <version>0.8</version> </dependency> <dependency> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - <version>3.2.1</version> - </dependency> - <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> <version>6.1.15</version> </dependency> <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>0.9</version> - </dependency> - <dependency> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - <version>3.8</version> - </dependency> - <dependency> <groupId>net.sourceforge.htmlunit</groupId> <artifactId>htmlunit</artifactId> <version>2.5</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - </dependency> - <dependency> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <version>1.6R7</version> - </dependency> - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-stax-api_1.0_spec</artifactId> <version>1.0.1</version> </dependency> <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - <version>1.6.0</version> - </dependency> - <dependency> <groupId>findbugs</groupId> <artifactId>annotations</artifactId> <version>1.0.0</version> <scope>provided</scope> </dependency> <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.3.1</version> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3_min</artifactId> - <version>1.1.4c</version> - </dependency> - <dependency> - <groupId>net.sourceforge.nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>1.9.12</version> - </dependency> - <dependency> <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xmlParserAPIs</artifactId> <version>2.6.2</version> </dependency> @@ -1445,21 +1335,6 @@ <version>1.0.7</version> </dependency> <dependency> - <groupId>org.apache.sanselan</groupId> - <artifactId>sanselan</artifactId> - <version>0.97-incubator</version> - </dependency> - <dependency> - <groupId>de.odysseus.juel</groupId> - <artifactId>juel-api</artifactId> - <version>2.1.2</version> - </dependency> - <dependency> - <groupId>de.odysseus.juel</groupId> - <artifactId>juel-impl</artifactId> - <version>2.1.2</version> - </dependency> - <dependency> <groupId>net.sf.ezmorph</groupId> <artifactId>ezmorph</artifactId> <version>1.0.4</version> @@ -1469,16 +1344,7 @@ <artifactId>xml-apis</artifactId> <version>1.3.04</version> </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>org.jsecurity</groupId> - <artifactId>jsecurity</artifactId> - <version>0.9.0</version> - </dependency> + <!-- TODO - switch to jakarta taglibs when the get a jstl 1.2 version out See https://issues.apache.org/bugzilla/show_bug.cgi?id=45197 --> <dependency>