From 3fc6d7214d6e7171e992a7f0136ba221e6633d5e Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Tue, 14 Apr 2015 10:56:15 +0000
Subject: [PATCH] Upgrade to GWT 2.7.0 completed

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/ishealth-monitor-widget@114019 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath           |  8 +-------
 distro/changelog.xml |  3 +++
 pom.xml              | 24 ++++++++----------------
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/.classpath b/.classpath
index a9685cf..89f880e 100644
--- a/.classpath
+++ b/.classpath
@@ -17,11 +17,5 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 97f0c0f..1ad51a0 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,7 @@
 <ReleaseNotes>
+<Changeset component="org.gcube.portlets.admin.ishealthmonitor.1-2-0" date="2015-04-13">
+<Change>Upgrade to GWT 2.7.0 completed</Change>
+</Changeset>
 <Changeset component="org.gcube.portlets.admin.ishealthmonitor.1-0-0" date="2013-01-13">
 <Change>First Release</Change>
 </Changeset>
diff --git a/pom.xml b/pom.xml
index 714d48b..9914a2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>ishealth-monitor-widget</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<name>gCube IS Health Monitor Widget</name>
 	<description>
 		gCube IS Health Monitor Widget.
@@ -22,11 +22,11 @@
 	</scm>
 	<properties>
 		<!-- Convenience property to set the GWT version -->
-		<gwtVersion>2.5.1</gwtVersion>
+		<gwtVersion>2.7.0</gwtVersion>
 		<distroDirectory>distro</distroDirectory>
 		<!-- GWT needs at least java 1.6 -->
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.7</maven.compiler.source>
+		<maven.compiler.target>1.7</maven.compiler.target>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -47,22 +47,14 @@
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-user</artifactId>
-			<!-- "provided" so that we don't deploy -->
-			<scope>provided</scope>
-		</dependency>
-		<!-- This dependency is needed to use GWT UI BInder without old Xerces 
-			version of gCore complaining -->
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-			<version>2.9.1</version>
+			<version>${gwtVersion}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.sencha.gxt</groupId>
-			<artifactId>gxt</artifactId>
-			<version>2.2.5</version>
-			<scope>provided</scope>
+			<artifactId>gxt2.2.5-gwt2.X</artifactId>
+			<version>2.7.0</version>
+			<scope>compile</scope>
 		</dependency>
 			<dependency>
 			<groupId>org.gcube.core</groupId>