From 92968ecce68ea077c54bfb936d9752b6702d734b Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 5 Jun 2014 15:13:31 +0000
Subject: [PATCH] fixed pom, updated version for gCube 3.2.0

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/share-updates@96805 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                  |  4 ++--
 .settings/com.google.gdt.eclipse.core.prefs |  2 +-
 .settings/org.eclipse.wst.common.component  |  3 ---
 distro/changelog.xml                        | 25 +++++++++++++++------
 pom.xml                                     | 17 +++-----------
 5 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/.classpath b/.classpath
index 76541d5..7b09df9 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/share-updates-1.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/share-updates-1.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -31,5 +31,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/share-updates-1.4.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/share-updates-1.5.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index d846d59..50af6e7 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/Users/massi/Documents/workspace/share-updates/target/share-updates-1.4.0-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/share-updates/target/share-updates-1.5.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 986910a..335abd2 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -7,9 +7,6 @@
         <dependent-module archiveName="pickuser-widget-0.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/pickuser-widget/pickuser-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="fileupload-progress-bar-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/fileupload-progress-bar/fileupload-progress-bar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="share-updates"/>
   </wb-module>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index d90f824..54788bf 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets.user.shareupdates.1-5-0"
+		date="2014-06-06">
+		<Change>Adapted pom to the new portal bundle gcore free</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets.user.shareupdates.1-4-0"
 		date="2014-05-22">
 		<Change>Fixed bug when posting in single vre</Change>
@@ -6,24 +10,31 @@
 	<Changeset component="org.gcube.portlets.user.shareupdates.1-3-0"
 		date="2014-05-09">
 		<Change>Added possibility to alert the users of a VRE when sharing an
-			update</Change>
+			update
+		</Change>
 		<Change>Refined the way to guess content and images when parsing HTML
 		</Change>
 		<Change>Improved images recognition when parsing html pages having no
-			image indication from openGraph</Change>
+			image indication from openGraph
+		</Change>
 		<Change>Added user agent property to http requests to avoid web
-			servers 'complaining' HTTP 403 errors</Change>
+			servers 'complaining' HTTP 403 errors
+		</Change>
 		<Change>Replaced all the line breaks and all the double spaces with
-			the html version to preserve new lines in posts</Change>
+			the html version to preserve new lines in posts
+		</Change>
 		<Change>Fixed bug when changing user avatar and minor restyle</Change>
 		<Change>Several improvements in url checkings</Change>
 		<Change>resolved problem with AdBlock plugin </Change>
 		<Change>Fixed mention user dialog y-position when textbox is higher
-			than usual due to new lines</Change>
+			than usual due to new lines
+		</Change>
 		<Change>Mention users list now returns only the list of the available
-			users in the current organization</Change>
+			users in the current organization
+		</Change>
 		<Change>Fixed posts when multiple tabs are open, now the status is
-			kept on the client</Change>
+			kept on the client
+		</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets.user.shareupdates.1-1-3"
 		date="2014-02-10">
diff --git a/pom.xml b/pom.xml
index 29c31c2..851c18b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>share-updates</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 
 	<name>gCube Share Updates Portlet</name>
 	<description>
@@ -48,12 +48,11 @@
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>
-		<!-- This dependency is needed and is need on TOP to use GWT UI BInder 
-			without old Xerces version of gCore complaining -->
 		<dependency>
 			<groupId>xerces</groupId>
 			<artifactId>xercesImpl</artifactId>
 			<version>2.9.1</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.gwt</groupId>
@@ -68,12 +67,10 @@
 		<dependency>
 			<groupId>org.gcube.common.portal</groupId>
 			<artifactId>portal-manager</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>social-networking-library</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -94,7 +91,7 @@
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
@@ -110,13 +107,11 @@
 		<dependency>
 			<groupId>org.gcube.contentmanagement</groupId>
 			<artifactId>storage-manager-core</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.contentmanagement</groupId>
 			<artifactId>storage-manager-wrapper</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -136,7 +131,6 @@
 		<dependency>
 			<groupId>org.apache.tika</groupId>
 			<artifactId>tika-core</artifactId>
-			<version>1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>net.coobird</groupId>
@@ -146,13 +140,11 @@
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<version>1.2.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -178,7 +170,6 @@
 		<dependency>
 			<groupId>com.google</groupId>
 			<artifactId>gwt-jsonmaker</artifactId>
-			<version>1.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.htmlparser</groupId>
@@ -203,12 +194,10 @@
 		<dependency>
 			<groupId>commons-validator</groupId>
 			<artifactId>commons-validator</artifactId>
-			<version>1.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.liferay.portal</groupId>
 			<artifactId>portal-service</artifactId>
-			<version>6.0.6</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>