Index: branches/org.gvsig.desktop-2018a/pom.xml
===================================================================
--- branches/org.gvsig.desktop-2018a/pom.xml	(revision 43828)
+++ branches/org.gvsig.desktop-2018a/pom.xml	(revision 43829)
@@ -6,7 +6,7 @@
     <artifactId>org.gvsig.desktop</artifactId>
     <packaging>pom</packaging>
 
-    <version>2.0.221-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
 
     <name>${project.artifactId}</name>
     <description>
@@ -127,13 +127,13 @@
 
     <dependencyManagement>
         <dependencies>
-	    <dependency>
+            <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.tools</artifactId>
                 <version>${gvsig.tools.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
-	    </dependency>
+            </dependency>
 
             <!-- Non gvSIG projects -->
             <!-- NOTE: the list of dependencies is ordered alphabetically -->
@@ -207,9 +207,9 @@
                 <version>2.0</version>
             </dependency>
             <dependency>
-              <groupId>com.fifesoft</groupId>
-              <artifactId>autocomplete</artifactId>
-              <version>2.5.7</version>
+                <groupId>com.fifesoft</groupId>
+                <artifactId>autocomplete</artifactId>
+                <version>2.5.7</version>
             </dependency>
 
             <dependency>
@@ -344,12 +344,12 @@
                 <artifactId>commons-cli</artifactId>
                 <version>1.4</version>
             </dependency>
-<!--            <dependency>
+            <!--            <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
                 <version>2.4</version>
             </dependency>-->
-<!--            <dependency>
+            <!--            <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
                 <version>3.1</version>
@@ -386,7 +386,7 @@
                 <artifactId>cql-java</artifactId>
                 <version>1.0</version>
             </dependency>
-<!--            <dependency>
+            <!--            <dependency>
                 <groupId>easymock</groupId>
                 <artifactId>easymock</artifactId>
                 <version>1.2_Java1.3</version>
@@ -401,12 +401,12 @@
                 <artifactId>flanagan</artifactId>
                 <version>20090616</version>
             </dependency>
-<!--            <dependency>
+            <!--            <dependency>
                 <groupId>net.sf</groupId>
                 <artifactId>flib-jcalendar</artifactId>
                 <version>unknown</version>
             </dependency>-->
-<!--            <dependency>
+            <!--            <dependency>
                     <groupId>com.jeta</groupId>
                     <artifactId>formsrt</artifactId>
                     <version>2.1.0_M3-1</version>
@@ -574,6 +574,11 @@
                 <version>unknown</version>
             </dependency>
             <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>20180130</version>
+            </dependency>
+            <dependency>
                 <groupId>javax.units</groupId>
                 <artifactId>jsr108</artifactId>
                 <version>0.01</version>
@@ -618,7 +623,7 @@
                 <artifactId>jzkit2-origin</artifactId>
                 <version>2.0.0</version>
             </dependency>
-<!--            <dependency>
+            <!--            <dependency>
                 <groupId>net.sf.kxml</groupId>
                 <artifactId>kxml2</artifactId>
                 <version>2.2.2</version>
@@ -633,7 +638,7 @@
                 <artifactId>log4jdbc</artifactId>
                 <version>1.2</version>
             </dependency>
-<!--            <dependency>
+            <!--            <dependency>
                 <groupId>com.jgoodies</groupId>
                 <artifactId>jgoodies-common</artifactId>
                 <version>1.4.0</version>
@@ -713,7 +718,7 @@
                 <artifactId>sil</artifactId>
                 <version>0.43b-am1</version>
             </dependency>
-<!--            <dependency>
+            <!--            <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
                 <version>1.5.5</version>
@@ -764,9 +769,9 @@
                 <version>1.3.3</version>
             </dependency>
             <dependency>
-              <groupId>org.swinglabs</groupId>
-              <artifactId>swing-layout</artifactId>
-              <version>1.0.3</version>
+                <groupId>org.swinglabs</groupId>
+                <artifactId>swing-layout</artifactId>
+                <version>1.0.3</version>
             </dependency>
             <dependency>
                 <groupId>tablelayout</groupId>
@@ -836,7 +841,7 @@
                 <artifactId>org.gvsig.jdk.v1_4</artifactId>
                 <version>1.0.0</version>
             </dependency>
-<!--            <dependency>
+            <!--            <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.tools.lib</artifactId>
                 <version>${gvsig.tools.version}</version>
@@ -858,7 +863,7 @@
                 <artifactId>org.gvsig.tools.swing.impl</artifactId>
                 <version>${gvsig.tools.version}</version>
             </dependency>-->
-<!--
+            <!--
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.tools.dynform.api</artifactId>
@@ -921,72 +926,72 @@
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.about.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.about.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.metadata.lib.basic.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.metadata.lib.basic.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.metadata.swing.basic.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.metadata.swing.basic.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.projection.cresques.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.projection.cresques.ui</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.andami</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.app</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.ui</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.control</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.mapcontext.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.mapcontext.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <!--
@@ -1000,93 +1005,94 @@
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.dal.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.dal.spi</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.dal.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.dal.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.dal.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
-            </dependency>            <dependency>
+            </dependency>            
+            <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.dal.db.lib</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.dal.db.jdbc</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.dal.db.h2</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.dal.file.lib</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.dal.file.dbf</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.dal.file.csv</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.dal.file.shp</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
-              <groupId>org.gvsig</groupId>
-              <artifactId>org.gvsig.fmap.dal.swing.api</artifactId>
-              <version>2.0.221-SNAPSHOT</version>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.fmap.dal.swing.api</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
-                <dependency>
-              <groupId>org.gvsig</groupId>
-              <artifactId>org.gvsig.fmap.dal.swing.impl</artifactId>
-               <version>2.0.221-SNAPSHOT</version>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.fmap.dal.swing.impl</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.newlayer.lib.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.newlayer.lib.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.newlayer.lib.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
@@ -1096,171 +1102,171 @@
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.newlayer.prov.file</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.newlayer.prov.shape</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
 
-           <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.lib.buffer.api</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-           </dependency>
-           <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.lib.buffer.spi</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-           </dependency>
-           <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.lib.buffer.impl</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-           </dependency>
-           <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.lib.legend.api</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-           </dependency>
-           <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.lib.legend.spi</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-           </dependency>
-           <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.lib.legend.impl</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-           </dependency>
-          <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.fmap.mapcontext.swing.api</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-          </dependency>
-          <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.fmap.mapcontext.swing.impl</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-          </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.lib.buffer.api</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.lib.buffer.spi</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.lib.buffer.impl</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.lib.legend.api</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.lib.legend.spi</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.lib.legend.impl</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.fmap.mapcontext.swing.api</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.fmap.mapcontext.swing.impl</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
 
-           <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.fmap.dal.tilecache.raster</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-           </dependency>
-           <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.legend.tilecache</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-           </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.fmap.dal.tilecache.raster</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.legend.tilecache</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
 
-          <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.tools.lib.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
-          </dependency>
-          <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.tools.lib.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
-          </dependency>
-          <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.tools.swing.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
-          </dependency>
-          <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.tools.swing.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
-          </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.tools.lib.api</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.tools.lib.impl</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.tools.swing.api</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.tools.swing.impl</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
 
 
 
-             <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.swing.buffer.api</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-          </dependency>
-          <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.swing.buffer.impl</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-          </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.swing.buffer.api</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.swing.buffer.impl</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
 
-          <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.legend.swing.api</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-          </dependency>
-          <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.legend.swing.impl</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-          </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.legend.swing.api</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.legend.swing.impl</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
 
-          <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.legend.lib.api</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-          </dependency>
-          <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.legend.lib.impl</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-          </dependency>
-          <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.legend.lib.spi</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-          </dependency>
-           <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.fmap.dal.file.png</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-           </dependency>
-           <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.legend.png</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-           </dependency>
-           <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.fmap.dal.file.jpg</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-           </dependency>
-           <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.raster.legend.jpg</artifactId>
-            <version>2.0.221-SNAPSHOT</version>
-           </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.legend.lib.api</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.legend.lib.impl</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.legend.lib.spi</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.fmap.dal.file.png</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.legend.png</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.fmap.dal.file.jpg</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gvsig</groupId>
+                <artifactId>org.gvsig.raster.legend.jpg</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.symbology.lib.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.symbology.lib.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.symbology.swing.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.symbology.swing.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.geometry.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <!--
             <dependency>
@@ -1277,116 +1283,116 @@
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.geometry.jts</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.fmap.geometry.operation.jts</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
 
 
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.tools.evaluator.sqljep</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.compat.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.compat.se</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.remoteclient</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.i18n</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.utils</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.annotation.lib.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.annotation.lib.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.annotation.swing.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.annotation.swing.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.expressionevaluator.lib.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.expressionevaluator.lib.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.temporarystorage.lib.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.temporarystorage.lib.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.exportto.lib.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.exportto.lib.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.exportto.lib.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.exportto.swing.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.exportto.swing.spi</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.exportto.swing.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
@@ -1396,17 +1402,17 @@
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.exportto.swing.prov.file</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.exportto.swing.prov.jdbc</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.exportto.swing.prov.shape</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
@@ -1416,96 +1422,96 @@
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.exportto.swing.prov.dbf</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.installer.swing.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.installer.swing.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.installer.lib.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.installer.lib.spi</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.installer.lib.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.installer.prov.plugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.geodb.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.app.document.table.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.daltransform.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.daltransform.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.daltransform.app.join</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.daltransform.app.eventtheme</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.annotation.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.centerviewpoint.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.coreplugin.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.datalocator.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
@@ -1515,7 +1521,7 @@
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.exportto.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
@@ -1525,7 +1531,7 @@
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.installer.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <!--
                       <dependency>
@@ -1537,22 +1543,22 @@
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.i18n.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.selectiontools.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.geometrymeasurement.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.newlayer.app.mainplugin</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <!--
             <dependency>
@@ -1564,22 +1570,22 @@
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.timesupport.lib.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.timesupport.lib.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.timesupport.swing.api</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.gvsig</groupId>
                 <artifactId>org.gvsig.timesupport.swing.impl</artifactId>
-                <version>2.0.221-SNAPSHOT</version>
+                <version>3.0.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -1724,7 +1730,7 @@
                                 <value>http://download.oracle.com/javase/7/docs/api/</value>
                             </property>
                         </javaApiLinks>
-			<additionalparam>-quiet -Xmaxerrs 10000</additionalparam>
+                        <additionalparam>-quiet -Xmaxerrs 10000</additionalparam>
                     </configuration>
                 </plugin>
 
@@ -2309,35 +2315,35 @@
                 </executions>
             </plugin>
 
-<!--
+            <!--
+                        <plugin>
+                            <groupId>org.codehaus.mojo</groupId>
+                            <artifactId>animal-sniffer-maven-plugin</artifactId>
+                            <executions>
+                                <execution>
+                                    <id>check-java-api</id>
+                                    <phase>package</phase>
+                                    <goals>
+                                        <goal>check</goal>
+                                    </goals>
+                                    <configuration>
+                                        <skip>false</skip>
+                                        <signature>
+                                            <groupId>org.codehaus.mojo.signature</groupId>
+                                            <artifactId>java18</artifactId>
+                                            <version>1.0</version>
+                                        </signature>
+                                        <ignores>
+                                            <ignore>net.sourceforge.cobertura.coveragedata.TouchCollector</ignore>
+                                            <ignore>java.nio.ByteBuffer</ignore>
+                                            <ignore>java.nio.MappedByteBuffer</ignore>
+                                        </ignores>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+            -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>check-java-api</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <skip>false</skip>
-                            <signature>
-                                <groupId>org.codehaus.mojo.signature</groupId>
-                                <artifactId>java18</artifactId>
-                                <version>1.0</version>
-                            </signature>
-                            <ignores>
-                                <ignore>net.sourceforge.cobertura.coveragedata.TouchCollector</ignore>
-                                <ignore>java.nio.ByteBuffer</ignore>
-                                <ignore>java.nio.MappedByteBuffer</ignore>
-                            </ignores>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
--->
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <executions>
