[gatein-commits] gatein SVN: r6163 - in portal/trunk: packaging/jboss-as6/pkg and 1 other directories.

[do-not-reply at jboss.org]

Author: mstruk
Date: 2011-04-05 16:39:37 -0400 (Tue, 05 Apr 2011)
New Revision: 6163

Modified:
   portal/trunk/packaging/jboss-as6/pkg/pom.xml
   portal/trunk/packaging/jetty/pkg/pom.xml
   portal/trunk/pom.xml
Log:
GTNPORTAL-1846 Update components and update POM files
 - Fixes to get the build working without having to set up any repositories in settings.xml


Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/pom.xml	2011-04-05 07:36:14 UTC (rev 6162)
+++ portal/trunk/packaging/jboss-as6/pkg/pom.xml	2011-04-05 20:39:37 UTC (rev 6163)
@@ -491,10 +491,6 @@
          <groupId>org.exoplatform.portal</groupId>
          <artifactId>exo.portal.gadgets-core</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.exoplatform.portal</groupId>
-         <artifactId>gatein.portal.component.wsrp</artifactId>
-      </dependency>
 
       <!-- Provided -->
       <dependency>
@@ -559,7 +555,7 @@
          <artifactId>guice</artifactId>
       </dependency>
       <dependency>
-         <groupId>com.google.inject</groupId>
+         <groupId>com.google.inject.extensions</groupId>
          <artifactId>guice-jmx</artifactId>
       </dependency>
       <dependency>
@@ -818,6 +814,12 @@
          <groupId>org.gatein.wsrp</groupId>
          <artifactId>wsrp-consumer</artifactId>
          <version>${org.gatein.wsrp.version}</version>
+         <exclusions>
+            <exclusion>
+               <groupId>apache-httpclient</groupId>
+               <artifactId>commons-httpclient</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.gatein.wsrp</groupId>

Modified: portal/trunk/packaging/jetty/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/pom.xml	2011-04-05 07:36:14 UTC (rev 6162)
+++ portal/trunk/packaging/jetty/pkg/pom.xml	2011-04-05 20:39:37 UTC (rev 6163)
@@ -479,10 +479,6 @@
       <groupId>org.exoplatform.portal</groupId>
       <artifactId>exo.portal.gadgets-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.exoplatform.portal</groupId>
-      <artifactId>gatein.portal.component.wsrp</artifactId>
-    </dependency>
 
     <!-- Provided -->
     <dependency>

Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml	2011-04-05 07:36:14 UTC (rev 6162)
+++ portal/trunk/pom.xml	2011-04-05 20:39:37 UTC (rev 6163)
@@ -525,11 +525,6 @@
         </dependency>
         <dependency>
           <groupId>org.exoplatform.portal</groupId>
-          <artifactId>gatein.portal.component.wsrp</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>      
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
           <artifactId>exo.portal.server.jboss.plugin</artifactId>
           <version>3.2.0-Beta01-SNAPSHOT</version>
         </dependency>