8:57 p.m.
Author: theute
Date: 2011-03-31 14:57:52 -0400 (Thu, 31 Mar 2011)
New Revision: 6153
Modified:
portal/trunk/component/web/security/pom.xml
portal/trunk/gadgets/core/pom.xml
portal/trunk/gadgets/eXoGadgets/pom.xml
portal/trunk/gadgets/server/pom.xml
portal/trunk/packaging/dependencies/pom.xml
portal/trunk/packaging/jboss-as5/pkg/pom.xml
portal/trunk/packaging/jboss-as6/pkg/pom.xml
portal/trunk/packaging/jetty/pkg/pom.xml
portal/trunk/packaging/tomcat/pkg/pom.xml
portal/trunk/pom.xml
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java
portal/trunk/webui/portal/pom.xml
portal/trunk/wsrp-integration/extension-component/pom.xml
portal/trunk/wsrp-integration/extension-ear-as5/pom.xml
Log:
GTNPORTAL-1846: Update components and update POM files
Modified: portal/trunk/component/web/security/pom.xml
===================================================================
--- portal/trunk/component/web/security/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/component/web/security/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -39,6 +39,12 @@
<dependency>
<groupId>org.exoplatform.core</groupId>
<artifactId>exo.core.component.organization.api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
@@ -62,6 +68,40 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-tomcat</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>jpl-pattern</groupId>
+ <artifactId>jpl-pattern</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jpl-util</groupId>
+ <artifactId>jpl-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jacc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jaas</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
Modified: portal/trunk/gadgets/core/pom.xml
===================================================================
--- portal/trunk/gadgets/core/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/gadgets/core/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -85,6 +85,12 @@
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
Modified: portal/trunk/gadgets/eXoGadgets/pom.xml
===================================================================
--- portal/trunk/gadgets/eXoGadgets/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/gadgets/eXoGadgets/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -52,6 +52,12 @@
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: portal/trunk/gadgets/server/pom.xml
===================================================================
--- portal/trunk/gadgets/server/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/gadgets/server/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -58,10 +58,24 @@
<artifactId>shindig-features</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.oauth.core</groupId>
+ <artifactId>oauth-provider</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.oauth</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- external dependencies -->
@@ -80,18 +94,20 @@
<artifactId>json_simple</artifactId>
<scope>provided</scope>
</dependency>
+ <!--
<dependency>
<groupId>net.oauth</groupId>
<artifactId>core</artifactId>
<scope>provided</scope>
</dependency>
+ -->
<dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<scope>provided</scope>
</dependency>
Modified: portal/trunk/packaging/dependencies/pom.xml
===================================================================
--- portal/trunk/packaging/dependencies/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/packaging/dependencies/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -185,8 +185,8 @@
<version>2.0.235</version>
</dependency>
<dependency>
- <groupId>html-parser</groupId>
- <artifactId>html-parser</artifactId>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
<version>1.6</version>
</dependency>
<dependency>
@@ -309,4 +309,4 @@
</dependencyManagement>
-</project>
\ No newline at end of file
+</project>
Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -130,6 +130,12 @@
<dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.mc-int</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.exoplatform.kernel</groupId>
@@ -376,10 +382,30 @@
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.oauth.core</groupId>
+ <artifactId>oauth-provider</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.oauth</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- GateIn -->
@@ -534,11 +560,11 @@
<!-- Various -->
<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>
@@ -603,8 +629,8 @@
<artifactId>groovy-all</artifactId>
</dependency>
<dependency>
- <groupId>html-parser</groupId>
- <artifactId>html-parser</artifactId>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
<version>1.6</version>
</dependency>
<dependency>
Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -128,6 +128,12 @@
<dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.mc-int</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.exoplatform.kernel</groupId>
@@ -374,10 +380,30 @@
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.oauth.core</groupId>
+ <artifactId>oauth-provider</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.oauth</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- GateIn -->
@@ -529,11 +555,11 @@
<!-- Various -->
<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</groupId>
<artifactId>guice-jmx</artifactId>
</dependency>
<dependency>
@@ -598,8 +624,8 @@
<artifactId>groovy-all</artifactId>
</dependency>
<dependency>
- <groupId>html-parser</groupId>
- <artifactId>html-parser</artifactId>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
<version>1.6</version>
</dependency>
<dependency>
Modified: portal/trunk/packaging/jetty/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -542,11 +542,11 @@
<!-- Various -->
<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</groupId>
<artifactId>guice-jmx</artifactId>
</dependency>
<dependency>
@@ -918,4 +918,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: portal/trunk/packaging/tomcat/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -471,10 +471,12 @@
<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>
@@ -534,11 +536,11 @@
<!-- Various -->
<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>
@@ -602,8 +604,8 @@
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
- <groupId>html-parser</groupId>
- <artifactId>html-parser</artifactId>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
@@ -886,4 +888,4 @@
</modules>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.1-GA</version>
+ <version>1.1.0-Beta01</version>
</parent>
<groupId>org.exoplatform.portal</groupId>
@@ -46,10 +46,10 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-Beta02</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-Beta01</org.gatein.wci.version>
- <org.gatein.pc.version>2.3.0-Alpha01</org.gatein.pc.version>
+ <org.gatein.pc.version>2.3.0-Beta01</org.gatein.pc.version>
<org.picketlink.idm>1.1.8.CR01</org.picketlink.idm>
- <org.gatein.wsrp.version>2.1.0-Alpha02</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.0.5-GA</org.gatein.mop.version>
+ <org.gatein.wsrp.version>2.1.0-Beta01</org.gatein.wsrp.version>
+ <org.gatein.mop.version>1.0.6-Beta01</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version>
@@ -88,6 +88,16 @@
<dependencyManagement>
<dependencies>
+ <!-- Needed becuase of a Maven bug. Components depend on gatein-dep and for
some
+ reasons with Maven 2.2.1 it can't find that dependency anymore
+ -->
+ <dependency>
+ <groupId>org.gatein</groupId>
+ <artifactId>gatein-dep</artifactId>
+ <version>1.0.3-Beta01</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- eXo JCR stack -->
<dependency>
@@ -836,12 +846,12 @@
<version>1.0-rc2</version>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>2.0</version>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-jmx</artifactId>
<version>2.0</version>
</dependency>
@@ -885,6 +895,12 @@
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
<version>${org.shindig.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
@@ -1158,64 +1174,21 @@
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
- <repository>
- <id>oauth</id>
- <url>http://oauth.googlecode.com/svn/code/maven</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>exo-int</id>
- <url>http://maven2.exoplatform.org/rest/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
</repositories>
-
-
- <pluginRepositories>
- <pluginRepository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
-
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
+ <pluginRepositories>
<pluginRepository>
- <id>java.net</id>
- <url>http://download.java.net/maven/2</url>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
<releases>
- <enabled>true</enabled>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
</releases>
<snapshots>
- <enabled>false</enabled>
- </snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
</pluginRepository>
-
</pluginRepositories>
</project>
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java
===================================================================
---
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2011-03-31
17:37:03 UTC (rev 6152)
+++
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2011-03-31
18:57:52 UTC (rev 6153)
@@ -33,7 +33,7 @@
* Created by The eXo Platform SAS
* Author : Huu-Dung Kieu
* kieuhdung(a)gmail.com
- * 22 d�c. 08
+ * 22 dec. 08
*/
public class GroupManagement
{
Modified: portal/trunk/webui/portal/pom.xml
===================================================================
--- portal/trunk/webui/portal/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/webui/portal/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -81,6 +81,12 @@
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
<type>jar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: portal/trunk/wsrp-integration/extension-component/pom.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-component/pom.xml 2011-03-31 17:37:03 UTC (rev
6152)
+++ portal/trunk/wsrp-integration/extension-component/pom.xml 2011-03-31 18:57:52 UTC (rev
6153)
@@ -47,6 +47,12 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-consumer</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.wsrp</groupId>
@@ -114,6 +120,12 @@
<artifactId>jbossws-native-core</artifactId>
<version>3.1.2.GA</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>wscommons-policy</groupId>
+ <artifactId>policy</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- tests -->
@@ -133,4 +145,4 @@
</resources>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: portal/trunk/wsrp-integration/extension-ear-as5/pom.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-ear-as5/pom.xml 2011-03-31 17:37:03 UTC (rev
6152)
+++ portal/trunk/wsrp-integration/extension-ear-as5/pom.xml 2011-03-31 18:57:52 UTC (rev
6153)
@@ -72,6 +72,12 @@
<dependency>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-consumer</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.wsrp</groupId>