Strabon

changeset 1519:94599fbf9c01

Revert revert! - Retreat from pom war. :(
author Panayiotis Smeros <psmeros@di.uoa.gr>
date Thu Apr 30 12:57:52 2015 +0300 (2015-04-30)
parents 166971ffb60b
children 6521e8989dc9
files endpoint/pom.xml evaluation/pom.xml generaldb/pom.xml monetdb/pom.xml pom.xml postgis/pom.xml resultio-spatial/api/pom.xml resultio-spatial/pom.xml resultio-spatial/sparqlgeojson/pom.xml resultio-spatial/sparqlhtml/pom.xml resultio-spatial/sparqlkml/pom.xml resultio-spatial/sparqlxml/pom.xml resultio-spatial/text/pom.xml runtime/pom.xml testsuite/pom.xml
line diff
     1.1 --- a/endpoint/pom.xml	Thu Apr 30 02:44:22 2015 +0300
     1.2 +++ b/endpoint/pom.xml	Thu Apr 30 12:57:52 2015 +0300
     1.3 @@ -1,5 +1,4 @@
     1.4 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     1.5 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     1.6 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     1.7  	<modelVersion>4.0.0</modelVersion>
     1.8  
     1.9  	<parent>
    1.10 @@ -19,8 +18,12 @@
    1.11  	</properties>
    1.12  
    1.13  	<dependencies>
    1.14 +		<dependency>
    1.15 +			<groupId>javax</groupId>
    1.16 +			<artifactId>javaee-web-api</artifactId>
    1.17 +			<scope>provided</scope>
    1.18 +		</dependency>
    1.19  
    1.20 -		<!-- Core Dependencies -->
    1.21  		<dependency>
    1.22  			<groupId>eu.earthobservatory</groupId>
    1.23  			<artifactId>strabon-vocabulary</artifactId>
    1.24 @@ -31,31 +34,51 @@
    1.25  			<artifactId>strabon-runtime</artifactId>
    1.26  			<type>jar</type>
    1.27  			<scope>compile</scope>
    1.28 +			<exclusions>
    1.29 +				<exclusion>
    1.30 +					<artifactId>servlet-api-2.5</artifactId>
    1.31 +					<groupId>org.mortbay.jetty</groupId>
    1.32 +				</exclusion>
    1.33 +				<exclusion>
    1.34 +					<artifactId>jsp-api-2.1</artifactId>
    1.35 +					<groupId>org.mortbay.jetty</groupId>
    1.36 +				</exclusion>
    1.37 +			</exclusions>
    1.38  		</dependency>
    1.39 -		<!-- Core Dependencies -->
    1.40 + 		
    1.41 +		<!-- GeoTools -->
    1.42 +		<dependency>
    1.43 +			<groupId>org.geotools.xsd</groupId>
    1.44 +			<artifactId>gt-xsd-kml</artifactId>
    1.45 +		</dependency>
    1.46  
    1.47 -		<!-- Java -->
    1.48  		<dependency>
    1.49 -			<groupId>javax</groupId>
    1.50 -			<artifactId>javaee-web-api</artifactId>
    1.51 -			<scope>provided</scope>
    1.52 +			<groupId>org.geotools</groupId>
    1.53 +			<artifactId>gt-xml</artifactId>
    1.54  		</dependency>
    1.55 -		<!-- Java -->
    1.56  
    1.57 -		<!-- Apache Commons -->
    1.58  		<dependency>
    1.59 -			<groupId>commons-fileupload</groupId>
    1.60 -			<artifactId>commons-fileupload</artifactId>
    1.61 +			<groupId>org.geotools</groupId>
    1.62 +			<artifactId>gt-epsg-hsql</artifactId>
    1.63  		</dependency>
    1.64  		<dependency>
    1.65 -			<groupId>commons-io</groupId>
    1.66 -			<artifactId>commons-io</artifactId>
    1.67 +			<groupId>org.geotools</groupId>
    1.68 +			<artifactId>gt-shapefile</artifactId>
    1.69  		</dependency>
    1.70 +
    1.71 +		<!-- Testing: JUnit -->
    1.72  		<dependency>
    1.73 -			<groupId>commons-codec</groupId>
    1.74 -			<artifactId>commons-codec</artifactId>
    1.75 +			<groupId>junit</groupId>
    1.76 +			<artifactId>junit</artifactId>
    1.77 +			<scope>test</scope>
    1.78  		</dependency>
    1.79 -		<!-- Apache Commons -->
    1.80 +
    1.81 +		<!-- JDBC Drivers -->
    1.82 +
    1.83 +		<dependency>
    1.84 +			<groupId>postgresql</groupId>
    1.85 +			<artifactId>postgresql</artifactId>
    1.86 +		</dependency>
    1.87  
    1.88  		<!-- Spring framework -->
    1.89  		<dependency>
    1.90 @@ -78,19 +101,11 @@
    1.91  				</exclusion>
    1.92  			</exclusions>
    1.93  		</dependency>
    1.94 -		<!-- Spring framework -->
    1.95 -
    1.96 -		<!-- JDBC Drivers -->
    1.97 -		<dependency>
    1.98 -			<groupId>postgresql</groupId>
    1.99 -			<artifactId>postgresql</artifactId>
   1.100 -		</dependency>
   1.101  
   1.102  		<dependency>
   1.103 -			<groupId>monetdb</groupId>
   1.104 -			<artifactId>jdbcclient</artifactId>
   1.105 +			<groupId>commons-validator</groupId>
   1.106 +			<artifactId>commons-validator</artifactId>
   1.107  		</dependency>
   1.108 -		<!-- JDBC Drivers -->
   1.109  	</dependencies>
   1.110  
   1.111  	<build>
   1.112 @@ -193,13 +208,32 @@
   1.113  						</archive> -->
   1.114  				</configuration>
   1.115  			</plugin>
   1.116 -			<!-- <plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> 
   1.117 -				<version>1.0.0</version> <configuration> <lifecycleMappingMetadata> <pluginExecutions> 
   1.118 -				<pluginExecution> <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> 
   1.119 -				<artifactId>maven-dependency-plugin</artifactId> <versionRange>[2.1,)</versionRange> 
   1.120 -				<goals> <goal>copy-dependencies</goal> </goals> </pluginExecutionFilter> 
   1.121 -				<action> <ignore /> </action> </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> 
   1.122 -				</configuration> </plugin> -->
   1.123 +			<!--
   1.124 +			<plugin>
   1.125 +				<groupId>org.eclipse.m2e</groupId>
   1.126 +				<artifactId>lifecycle-mapping</artifactId>
   1.127 +				<version>1.0.0</version>
   1.128 +				<configuration>
   1.129 +					<lifecycleMappingMetadata>
   1.130 +						<pluginExecutions>
   1.131 +							<pluginExecution>
   1.132 +								<pluginExecutionFilter>
   1.133 +									<groupId>org.apache.maven.plugins</groupId>
   1.134 +									<artifactId>maven-dependency-plugin</artifactId>
   1.135 +									<versionRange>[2.1,)</versionRange>
   1.136 +									<goals>
   1.137 +										<goal>copy-dependencies</goal>
   1.138 +									</goals>
   1.139 +								</pluginExecutionFilter>
   1.140 +								<action>
   1.141 +									<ignore />
   1.142 +								</action>
   1.143 +							</pluginExecution>
   1.144 +						</pluginExecutions>
   1.145 +						</lifecycleMappingMetadata>
   1.146 +				</configuration>
   1.147 +			</plugin>
   1.148 +			-->
   1.149  			<plugin>
   1.150  				<groupId>org.apache.maven.plugins</groupId>
   1.151  				<artifactId>maven-dependency-plugin</artifactId>
     2.1 --- a/evaluation/pom.xml	Thu Apr 30 02:44:22 2015 +0300
     2.2 +++ b/evaluation/pom.xml	Thu Apr 30 12:57:52 2015 +0300
     2.3 @@ -15,7 +15,7 @@
     2.4  	<packaging>jar</packaging>
     2.5  
     2.6  	<dependencies>
     2.7 -		<!-- Core Dependencies -->	
     2.8 +	
     2.9  		<dependency>
    2.10  			<groupId>eu.earthobservatory</groupId>
    2.11  			<artifactId>strabon-vocabulary</artifactId>
    2.12 @@ -35,16 +35,17 @@
    2.13  			<groupId>org.openrdf.sesame</groupId>
    2.14  			<artifactId>sesame-model</artifactId>
    2.15  		</dependency>
    2.16 -		<!-- Core Dependencies -->
    2.17  
    2.18 -		<!-- Logger -->
    2.19  		<dependency>
    2.20  			<groupId>org.slf4j</groupId>
    2.21  			<artifactId>slf4j-log4j12</artifactId>
    2.22  		</dependency>
    2.23 -		<!-- Logger -->
    2.24 -				
    2.25 -		<!-- Geotools -->
    2.26 +
    2.27 +		<dependency>
    2.28 +			<groupId>junit</groupId>
    2.29 +			<artifactId>junit</artifactId>
    2.30 +		</dependency>
    2.31 +
    2.32  		<dependency>
    2.33  			<groupId>org.geotools</groupId>
    2.34  			<artifactId>gt-opengis</artifactId>
    2.35 @@ -64,10 +65,15 @@
    2.36  			<artifactId>gt-xml</artifactId>
    2.37  		</dependency>
    2.38  		<dependency>
    2.39 -			<groupId>org.jvnet.ogc</groupId>
    2.40 -			<artifactId>ogc-tools-gml-jts</artifactId>
    2.41 -		</dependency>
    2.42 -		<!-- Geotools -->
    2.43 +	<groupId>org.jvnet.ogc</groupId>
    2.44 +	<artifactId>ogc-tools-gml-jts</artifactId>
    2.45 +</dependency>
    2.46 +<dependency>
    2.47 +	<groupId>com.sun.xml.bind</groupId>
    2.48 +	<artifactId>jaxb-impl</artifactId>
    2.49 +</dependency>
    2.50  	</dependencies>
    2.51 +	<modules>
    2.52 +	</modules>
    2.53  </project>
    2.54  
     3.1 --- a/generaldb/pom.xml	Thu Apr 30 02:44:22 2015 +0300
     3.2 +++ b/generaldb/pom.xml	Thu Apr 30 12:57:52 2015 +0300
     3.3 @@ -1,37 +1,58 @@
     3.4  <?xml version="1.0"?>
     3.5 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     3.6 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     3.7 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     3.8  
     3.9 -	<modelVersion>4.0.0</modelVersion>
    3.10 + 	<modelVersion>4.0.0</modelVersion>
    3.11  
    3.12  	<parent>
    3.13  		<groupId>eu.earthobservatory</groupId>
    3.14  		<artifactId>strabon</artifactId>
    3.15  		<version>3.3.2-SNAPSHOT</version>
    3.16  	</parent>
    3.17 -
    3.18 +  
    3.19  	<groupId>org.openrdf.sesame</groupId>
    3.20  	<artifactId>sesame-sail-generaldb</artifactId>
    3.21  	<name>OpenRDF Sesame: GeneralDBStore </name>
    3.22  	<description>GeneralDB Store Support</description>
    3.23  	<packaging>jar</packaging>
    3.24 +  
    3.25 +	<url>http://maven.apache.org</url>
    3.26  
    3.27  	<dependencies>
    3.28 -		<!-- Core Dependencies -->
    3.29  		<dependency>
    3.30  			<groupId>org.openrdf.sesame</groupId>
    3.31  			<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
    3.32  		</dependency>
    3.33 -		<!-- Core Dependencies -->
    3.34  
    3.35 -		<!-- Sesame dependencies -->
    3.36  		<dependency>
    3.37  			<groupId>org.openrdf.sesame</groupId>
    3.38  			<artifactId>sesame-sail-rdbms</artifactId>
    3.39  		</dependency>
    3.40 -		<!-- Sesame dependencies -->
    3.41  
    3.42 -		<!-- Aduna Commons -->
    3.43 +		<dependency>
    3.44 +			<groupId>org.openrdf.sesame</groupId>
    3.45 +			<artifactId>sesame-sail-api</artifactId>
    3.46 +		</dependency>
    3.47 +
    3.48 +		<dependency>
    3.49 +			<groupId>org.openrdf.sesame</groupId>
    3.50 +			<artifactId>sesame-queryalgebra-evaluation</artifactId>
    3.51 +		</dependency>
    3.52 +
    3.53 +		<dependency>
    3.54 +			<groupId>org.openrdf.sesame</groupId>
    3.55 +			<artifactId>sesame-queryalgebra-model</artifactId>
    3.56 +		</dependency>
    3.57 +
    3.58 +		<dependency>
    3.59 +			<groupId>org.openrdf.sesame</groupId>
    3.60 +			<artifactId>sesame-query</artifactId>
    3.61 +		</dependency>
    3.62 +
    3.63 +		<dependency>
    3.64 +			<groupId>org.openrdf.sesame</groupId>
    3.65 +			<artifactId>sesame-model</artifactId>
    3.66 +		</dependency>
    3.67 +
    3.68  		<dependency>
    3.69  			<groupId>info.aduna.commons</groupId>
    3.70  			<artifactId>aduna-commons-collections</artifactId>
    3.71 @@ -46,19 +67,43 @@
    3.72  			<groupId>info.aduna.commons</groupId>
    3.73  			<artifactId>aduna-commons-concurrent</artifactId>
    3.74  		</dependency>
    3.75 -		<!-- Aduna Commons -->
    3.76  
    3.77 -		<!-- JDBC Drivers -->
    3.78 +		<dependency>
    3.79 +			<groupId>commons-dbcp</groupId>
    3.80 +			<artifactId>commons-dbcp</artifactId>
    3.81 +		</dependency>
    3.82 +
    3.83  		<dependency>
    3.84  			<groupId>postgresql</groupId>
    3.85  			<artifactId>postgresql</artifactId>
    3.86  			<scope>provided</scope>
    3.87  		</dependency>
    3.88 -
    3.89 +		
    3.90  		<dependency>
    3.91  			<groupId>monetdb</groupId>
    3.92  			<artifactId>jdbcclient</artifactId>
    3.93 +			<scope>provided</scope>
    3.94  		</dependency>
    3.95 -		<!-- JDBC Drivers -->
    3.96 +		
    3.97 + 		
    3.98 +		<dependency>
    3.99 +			<groupId>junit</groupId>
   3.100 +			<artifactId>junit</artifactId>
   3.101 +			<scope>test</scope>
   3.102 +		</dependency>
   3.103 +
   3.104 +		<!--	    
   3.105 +		<dependency>
   3.106 +			<groupId>net.sf</groupId>
   3.107 +			<artifactId>log4jdbc4</artifactId>
   3.108 +		</dependency>
   3.109 +		-->
   3.110 +
   3.111 +		<dependency>
   3.112 +			<groupId>commons-codec</groupId>
   3.113 +			<artifactId>commons-codec</artifactId>
   3.114 +			<version>1.4</version>
   3.115 +		</dependency>
   3.116 +            
   3.117  	</dependencies>
   3.118  </project>
     4.1 --- a/monetdb/pom.xml	Thu Apr 30 02:44:22 2015 +0300
     4.2 +++ b/monetdb/pom.xml	Thu Apr 30 12:57:52 2015 +0300
     4.3 @@ -1,27 +1,86 @@
     4.4  <?xml version="1.0"?>
     4.5 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     4.6 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     4.7 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     4.8  
     4.9 -	<modelVersion>4.0.0</modelVersion>
    4.10 + 	<modelVersion>4.0.0</modelVersion>
    4.11  
    4.12  	<parent>
    4.13  		<groupId>eu.earthobservatory</groupId>
    4.14  		<artifactId>strabon</artifactId>
    4.15  		<version>3.3.2-SNAPSHOT</version>
    4.16  	</parent>
    4.17 -
    4.18 +  
    4.19  	<groupId>org.openrdf.sesame</groupId>
    4.20  	<artifactId>sesame-sail-monetdb</artifactId>
    4.21  	<name>OpenRDF Sesame: MonetDBStore </name>
    4.22  	<description>MonetDB Store Support</description>
    4.23  	<packaging>jar</packaging>
    4.24 +  
    4.25 +	<url>http://maven.apache.org</url>  
    4.26  
    4.27  	<dependencies>
    4.28 -		<!-- Core Dependencies -->
    4.29 +		<dependency>
    4.30 +			<groupId>org.openrdf.sesame</groupId>
    4.31 +			<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
    4.32 +		</dependency>
    4.33  		<dependency>
    4.34  			<groupId>org.openrdf.sesame</groupId>
    4.35  			<artifactId>sesame-sail-generaldb</artifactId>
    4.36  		</dependency>
    4.37 -		<!-- Core Dependencies -->
    4.38 +		<dependency>
    4.39 +			<groupId>org.openrdf.sesame</groupId>
    4.40 +			<artifactId>sesame-sail-rdbms</artifactId>
    4.41 +		</dependency>
    4.42 +		<dependency>
    4.43 +			<groupId>org.openrdf.sesame</groupId>
    4.44 +			<artifactId>sesame-sail-api</artifactId>
    4.45 +		</dependency>
    4.46 +
    4.47 +		<dependency>
    4.48 +			<groupId>org.openrdf.sesame</groupId>
    4.49 +			<artifactId>sesame-queryalgebra-evaluation</artifactId>
    4.50 +		</dependency>
    4.51 +		<dependency>
    4.52 +			<groupId>org.openrdf.sesame</groupId>
    4.53 +			<artifactId>sesame-queryalgebra-model</artifactId>
    4.54 +		</dependency>
    4.55 +		<dependency>
    4.56 +			<groupId>org.openrdf.sesame</groupId>
    4.57 +			<artifactId>sesame-query</artifactId>
    4.58 +		</dependency>
    4.59 +
    4.60 +		<dependency>
    4.61 +			<groupId>org.openrdf.sesame</groupId>
    4.62 +			<artifactId>sesame-model</artifactId>
    4.63 +		</dependency>
    4.64 +
    4.65 +		<dependency>
    4.66 +			<groupId>info.aduna.commons</groupId>
    4.67 +			<artifactId>aduna-commons-collections</artifactId>
    4.68 +		</dependency>
    4.69 +		<dependency>
    4.70 +			<groupId>info.aduna.commons</groupId>
    4.71 +			<artifactId>aduna-commons-iteration</artifactId>
    4.72 +		</dependency>
    4.73 +		<dependency>
    4.74 +			<groupId>info.aduna.commons</groupId>
    4.75 +			<artifactId>aduna-commons-concurrent</artifactId>
    4.76 +		</dependency>
    4.77 +
    4.78 +		<dependency>
    4.79 +			<groupId>commons-dbcp</groupId>
    4.80 +			<artifactId>commons-dbcp</artifactId>
    4.81 +		</dependency>
    4.82 +
    4.83 +		<dependency>
    4.84 +			<groupId>junit</groupId>
    4.85 +			<artifactId>junit</artifactId>
    4.86 +			<scope>test</scope>
    4.87 +		</dependency>
    4.88 +	    
    4.89 +		<dependency>
    4.90 +			<groupId>monetdb</groupId>
    4.91 +			<artifactId>jdbcclient</artifactId>
    4.92 +		</dependency>
    4.93 +
    4.94  	</dependencies>
    4.95  </project>
     5.1 --- a/pom.xml	Thu Apr 30 02:44:22 2015 +0300
     5.2 +++ b/pom.xml	Thu Apr 30 12:57:52 2015 +0300
     5.3 @@ -1,5 +1,4 @@
     5.4 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     5.5 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     5.6 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     5.7  
     5.8  	<modelVersion>4.0.0</modelVersion>
     5.9  
    5.10 @@ -18,20 +17,20 @@
    5.11  	<description>Strabon is a storage and query evaluation module for stRDF/stSPARQL.</description>
    5.12  	<url>http://www.strabon.di.uoa.gr/</url>
    5.13  	<inceptionYear>2008</inceptionYear>
    5.14 -
    5.15 +	
    5.16  	<organization>
    5.17  		<name>Strabon Team - Team Pyravlos</name>
    5.18  		<url>http://www.strabon.di.uoa.gr/</url>
    5.19  	</organization>
    5.20 -
    5.21 +	
    5.22  	<licenses>
    5.23  		<license>
    5.24 -			<name>Mozilla Public License, v. 2.0</name>
    5.25 -			<url>http://www.strabon.di.uoa.gr/license</url>
    5.26 -			<distribution>repo</distribution>
    5.27 +		<name>Mozilla Public License, v. 2.0</name>
    5.28 +		<url>http://www.strabon.di.uoa.gr/license</url>
    5.29 +		<distribution>repo</distribution>
    5.30  		</license>
    5.31  	</licenses>
    5.32 -
    5.33 +	
    5.34  	<developers>
    5.35  		<developer>
    5.36  			<id>manolee</id>
    5.37 @@ -110,8 +109,7 @@
    5.38  		<developer>
    5.39  			<id>roi</id>
    5.40  			<name>Kallirroi Dogani</name>
    5.41 -			<email>kallirroi@di.uoa.gr</email>
    5.42 -			<url>http://www.di.uoa.gr/~charnik</url>
    5.43 +			<email>kallirroi@di.uoa.gr</email><url>http://www.di.uoa.gr/~charnik</url>
    5.44  			<organization>Management of Data, Information and Knowledge Group, Dept. of Informatics and Telecommunications, School of Sciences, National and Kapodistrian University of Athens</organization>
    5.45  			<organizationUrl>http://www.madgik.di.uoa.gr/</organizationUrl>
    5.46  			<timezone>+2</timezone>
    5.47 @@ -142,10 +140,10 @@
    5.48  	</modules>
    5.49  
    5.50  	<properties>
    5.51 -		<eu.earthobservatory.version>3.3.2-SNAPSHOT</eu.earthobservatory.version>
    5.52 +        <eu.earthobservatory.version>3.3.2-SNAPSHOT</eu.earthobservatory.version>
    5.53  		<sesame.version>2.6.3</sesame.version>
    5.54  		<aduna.appbase.version>3.5.0</aduna.appbase.version>
    5.55 -		<!--slf4j.version>1.5.8</slf4j.version -->
    5.56 +		<!--slf4j.version>1.5.8</slf4j.version-->
    5.57  		<slf4j.version>1.6.4</slf4j.version>
    5.58  		<spring.version>2.5.6</spring.version>
    5.59  		<jts.version>1.11</jts.version>
    5.60 @@ -159,13 +157,15 @@
    5.61  
    5.62  	<dependencyManagement>
    5.63  		<dependencies>
    5.64 -			<!-- Strabon dependencies -->
    5.65 +			<!-- Strabon dependencies -->			
    5.66  			<dependency>
    5.67  				<groupId>org.openrdf.sesame</groupId>
    5.68  				<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
    5.69  				<version>${eu.earthobservatory.version}</version>
    5.70  			</dependency>
    5.71  
    5.72 +
    5.73 +		<!-- queryresultio-spatial dependencies-->
    5.74  			<dependency>
    5.75  				<groupId>org.openrdf.sesame</groupId>
    5.76  				<artifactId>sesame-queryresultio-spatial-api</artifactId>
    5.77 @@ -196,6 +196,35 @@
    5.78  				<artifactId>sesame-queryresultio-spatial-text</artifactId>
    5.79  				<version>${eu.earthobservatory.version}</version>
    5.80  			</dependency>
    5.81 +		<!-- queryresultio-spatial dependencies-->
    5.82 +
    5.83 +		<!-- sesame queryresultio dependencies -->
    5.84 +			<dependency>
    5.85 +				<groupId>org.openrdf.sesame</groupId>
    5.86 +				<artifactId>sesame-queryresultio-api</artifactId>
    5.87 +				<version>${sesame.version}</version>
    5.88 +			</dependency>
    5.89 +			<dependency>
    5.90 +				<groupId>org.openrdf.sesame</groupId>
    5.91 +				<artifactId>sesame-queryresultio-sparqlxml</artifactId>
    5.92 +				<version>${sesame.version}</version>
    5.93 +			</dependency>
    5.94 +			<dependency>
    5.95 +				<groupId>org.openrdf.sesame</groupId>
    5.96 +				<artifactId>sesame-queryresultio-text</artifactId>
    5.97 +				<version>${sesame.version}</version>
    5.98 +			</dependency>
    5.99 +			<dependency>
   5.100 +				<groupId>org.openrdf.sesame</groupId>
   5.101 +				<artifactId>sesame-queryresultio-binary</artifactId>
   5.102 +				<version>${sesame.version}</version>
   5.103 +			</dependency>
   5.104 +			<dependency>
   5.105 +				<groupId>org.openrdf.sesame</groupId>
   5.106 +				<artifactId>sesame-queryresultio-sparqljson</artifactId>
   5.107 +				<version>${sesame.version}</version>
   5.108 +			</dependency>
   5.109 +		<!-- sesame queryresultio dependencies -->
   5.110  
   5.111  			<dependency>
   5.112  				<groupId>org.openrdf.sesame</groupId>
   5.113 @@ -211,84 +240,47 @@
   5.114  
   5.115  			<dependency>
   5.116  				<groupId>org.openrdf.sesame</groupId>
   5.117 -				<artifactId>sesame-sail-postgis</artifactId>
   5.118 +				<artifactId>strabon-runtime</artifactId>
   5.119  				<version>${eu.earthobservatory.version}</version>
   5.120  			</dependency>
   5.121  
   5.122  			<dependency>
   5.123 -				<groupId>eu.earthobservatory</groupId>
   5.124 +				<groupId>org.openrdf.sesame</groupId>
   5.125  				<artifactId>strabon-endpoint</artifactId>
   5.126  				<version>${eu.earthobservatory.version}</version>
   5.127  			</dependency>
   5.128 -
   5.129 +			
   5.130  			<dependency>
   5.131 -				<groupId>eu.earthobservatory</groupId>
   5.132 +				<groupId>org.openrdf.sesame</groupId>
   5.133  				<artifactId>strabon-endpoint-client</artifactId>
   5.134  				<version>${eu.earthobservatory.version}</version>
   5.135  			</dependency>
   5.136  
   5.137  			<dependency>
   5.138  				<groupId>eu.earthobservatory</groupId>
   5.139 -				<artifactId>strabon-endpoint-exec</artifactId>
   5.140 -				<version>${eu.earthobservatory.version}</version>
   5.141 -			</dependency>
   5.142 -
   5.143 -			<dependency>
   5.144 -				<groupId>eu.earthobservatory</groupId>
   5.145 -				<artifactId>strabon-runtime</artifactId>
   5.146 -				<version>${eu.earthobservatory.version}</version>
   5.147 -			</dependency>
   5.148 -
   5.149 -			<dependency>
   5.150 -				<groupId>eu.earthobservatory</groupId>
   5.151  				<artifactId>strabon-vocabulary</artifactId>
   5.152  				<version>${eu.earthobservatory.version}</version>
   5.153  			</dependency>
   5.154 -
   5.155 +			
   5.156  			<dependency>
   5.157  				<groupId>eu.earthobservatory</groupId>
   5.158  				<artifactId>strabon-testsuite</artifactId>
   5.159  				<version>${eu.earthobservatory.version}</version>
   5.160  			</dependency>
   5.161 -			<!-- Strabon dependencies -->
   5.162 -
   5.163 -			<!-- Sesame dependencies -->
   5.164 -			<dependency>
   5.165 -				<groupId>org.openrdf.sesame</groupId>
   5.166 -				<artifactId>sesame-queryresultio-api</artifactId>
   5.167 -				<version>${sesame.version}</version>
   5.168 -			</dependency>
   5.169  
   5.170  			<dependency>
   5.171  				<groupId>org.openrdf.sesame</groupId>
   5.172 -				<artifactId>sesame-queryresultio-sparqlxml</artifactId>
   5.173 -				<version>${sesame.version}</version>
   5.174 +				<artifactId>sesame-sail-postgis</artifactId>
   5.175 +				<version>${eu.earthobservatory.version}</version>
   5.176  			</dependency>
   5.177  
   5.178 -			<dependency>
   5.179 -				<groupId>org.openrdf.sesame</groupId>
   5.180 -				<artifactId>sesame-queryresultio-text</artifactId>
   5.181 -				<version>${sesame.version}</version>
   5.182 -			</dependency>
   5.183 -
   5.184 -			<dependency>
   5.185 -				<groupId>org.openrdf.sesame</groupId>
   5.186 -				<artifactId>sesame-queryresultio-binary</artifactId>
   5.187 -				<version>${sesame.version}</version>
   5.188 -			</dependency>
   5.189 -
   5.190 -			<dependency>
   5.191 -				<groupId>org.openrdf.sesame</groupId>
   5.192 -				<artifactId>sesame-queryresultio-sparqljson</artifactId>
   5.193 -				<version>${sesame.version}</version>
   5.194 -			</dependency>
   5.195 -
   5.196 +			<!-- Sesame dependencies -->
   5.197  			<dependency>
   5.198  				<groupId>org.openrdf.sesame</groupId>
   5.199  				<artifactId>sesame-sail-memory</artifactId>
   5.200  				<version>${sesame.version}</version>
   5.201  			</dependency>
   5.202 -
   5.203 +			
   5.204  			<dependency>
   5.205  				<groupId>org.openrdf.sesame</groupId>
   5.206  				<artifactId>sesame-repository-sail</artifactId>
   5.207 @@ -360,12 +352,51 @@
   5.208  				<artifactId>sesame-repository-sparql</artifactId>
   5.209  				<version>${sesame.version}</version>
   5.210  			</dependency>
   5.211 +
   5.212 +			<!-- Aduna Commons -->
   5.213 +			<dependency>
   5.214 +				<groupId>info.aduna.appbase</groupId>
   5.215 +				<artifactId>aduna-appbase</artifactId>
   5.216 +				<version>${aduna.appbase.version}</version>
   5.217 +				<type>pom</type>
   5.218 +			</dependency>
   5.219 +			
   5.220 +			<dependency>
   5.221 +				<groupId>info.aduna.commons</groupId>
   5.222 +				<artifactId>aduna-commons-collections</artifactId>
   5.223 +				<version>2.8.0</version>
   5.224 +			</dependency>
   5.225 +
   5.226 +			<dependency>
   5.227 +				<groupId>info.aduna.commons</groupId>
   5.228 +				<artifactId>aduna-commons-concurrent</artifactId>
   5.229 +				<version>2.7.0</version>
   5.230 +			</dependency>
   5.231 +
   5.232 +			<dependency>
   5.233 +				<groupId>info.aduna.commons</groupId>
   5.234 +				<artifactId>aduna-commons-i18n</artifactId>
   5.235 +				<version>1.4.0</version>
   5.236 +			</dependency>
   5.237 +
   5.238 +			<dependency>
   5.239 +				<groupId>info.aduna.commons</groupId>
   5.240 +				<artifactId>aduna-commons-iteration</artifactId>
   5.241 +				<version>2.10.0</version>
   5.242 +			</dependency>
   5.243 +
   5.244 +			<dependency>
   5.245 +				<groupId>info.aduna.commons</groupId>
   5.246 +				<artifactId>aduna-commons-net-http-server-embedded</artifactId>
   5.247 +				<version>2.5.0</version>
   5.248 +			</dependency>
   5.249 +
   5.250 +			<!-- RIO -->
   5.251  			<dependency>
   5.252  				<groupId>org.openrdf.sesame</groupId>
   5.253  				<artifactId>sesame-rio-api</artifactId>
   5.254  				<version>${sesame.version}</version>
   5.255  			</dependency>
   5.256 -
   5.257  			<dependency>
   5.258  				<groupId>org.openrdf.sesame</groupId>
   5.259  				<artifactId>sesame-rio-rdfxml</artifactId>
   5.260 @@ -407,46 +438,6 @@
   5.261  				<artifactId>sesame-rio-binary</artifactId>
   5.262  				<version>${sesame.version}</version>
   5.263  			</dependency>
   5.264 -			<!-- Sesame dependencies -->
   5.265 -
   5.266 -			<!-- Aduna Commons -->
   5.267 -			<dependency>
   5.268 -				<groupId>info.aduna.appbase</groupId>
   5.269 -				<artifactId>aduna-appbase</artifactId>
   5.270 -				<version>${aduna.appbase.version}</version>
   5.271 -				<type>pom</type>
   5.272 -			</dependency>
   5.273 -
   5.274 -			<dependency>
   5.275 -				<groupId>info.aduna.commons</groupId>
   5.276 -				<artifactId>aduna-commons-collections</artifactId>
   5.277 -				<version>2.8.0</version>
   5.278 -			</dependency>
   5.279 -
   5.280 -			<dependency>
   5.281 -				<groupId>info.aduna.commons</groupId>
   5.282 -				<artifactId>aduna-commons-concurrent</artifactId>
   5.283 -				<version>2.7.0</version>
   5.284 -			</dependency>
   5.285 -
   5.286 -			<dependency>
   5.287 -				<groupId>info.aduna.commons</groupId>
   5.288 -				<artifactId>aduna-commons-i18n</artifactId>
   5.289 -				<version>1.4.0</version>
   5.290 -			</dependency>
   5.291 -
   5.292 -			<dependency>
   5.293 -				<groupId>info.aduna.commons</groupId>
   5.294 -				<artifactId>aduna-commons-iteration</artifactId>
   5.295 -				<version>2.10.0</version>
   5.296 -			</dependency>
   5.297 -
   5.298 -			<dependency>
   5.299 -				<groupId>info.aduna.commons</groupId>
   5.300 -				<artifactId>aduna-commons-net-http-server-embedded</artifactId>
   5.301 -				<version>2.5.0</version>
   5.302 -			</dependency>
   5.303 -			<!-- Aduna Commons -->
   5.304  
   5.305  			<!-- GeoTools -->
   5.306  			<dependency>
   5.307 @@ -454,7 +445,7 @@
   5.308  				<artifactId>gt-geojson</artifactId>
   5.309  				<version>${geotools.version}</version>
   5.310  			</dependency>
   5.311 -
   5.312 +	
   5.313  			<dependency>
   5.314  				<groupId>org.geotools.xsd</groupId>
   5.315  				<artifactId>gt-xsd-kml</artifactId>
   5.316 @@ -496,9 +487,14 @@
   5.317  				<version>${geotools.version}</version>
   5.318  			</dependency>
   5.319  
   5.320 -			<!-- One epsg jar file suffices. Read this: http://docs.geotools.org/latest/userguide/faq.html#q-how-to-choose-an-epsg-authority 
   5.321 -				<dependency> <groupId>org.geotools</groupId> <artifactId>gt-epsg-wkt</artifactId> 
   5.322 -				<version>${geotools.version}</version> </dependency> -->
   5.323 +			<!--
   5.324 +			     One epsg jar file suffices. Read this: http://docs.geotools.org/latest/userguide/faq.html#q-how-to-choose-an-epsg-authority
   5.325 +			<dependency>
   5.326 +				<groupId>org.geotools</groupId>
   5.327 +				<artifactId>gt-epsg-wkt</artifactId>
   5.328 +				<version>${geotools.version}</version>
   5.329 +			</dependency>
   5.330 +			-->
   5.331  
   5.332  			<dependency>
   5.333  				<groupId>org.geotools</groupId>
   5.334 @@ -510,7 +506,7 @@
   5.335  				<groupId>org.geotools</groupId>
   5.336  				<artifactId>gt-data</artifactId>
   5.337  				<version>${geotools.version}</version>
   5.338 -			</dependency>
   5.339 +			</dependency>		
   5.340  
   5.341  			<dependency>
   5.342  				<groupId>org.geotools</groupId>
   5.343 @@ -524,19 +520,13 @@
   5.344  				<version>2.3-M1</version>
   5.345  			</dependency>
   5.346  
   5.347 +			<!-- JTS -->
   5.348  			<dependency>
   5.349  				<groupId>com.vividsolutions</groupId>
   5.350  				<artifactId>jts</artifactId>
   5.351  				<version>${jts.version}</version>
   5.352  				<type>jar</type>
   5.353  			</dependency>
   5.354 -			
   5.355 -			<dependency>
   5.356 -				<groupId>org.jvnet.ogc</groupId>
   5.357 -				<artifactId>ogc-tools-gml-jts</artifactId>
   5.358 -				<version>1.0.2</version>
   5.359 -			</dependency>			
   5.360 -			<!-- GeoTools -->
   5.361  
   5.362  			<!-- JDBC Drivers -->
   5.363  			<dependency>
   5.364 @@ -556,18 +546,22 @@
   5.365  				<artifactId>mysql-connector-java</artifactId>
   5.366  				<version>5.1.15</version>
   5.367  			</dependency>
   5.368 -			<!-- JDBC Drivers -->
   5.369  
   5.370 -			<!-- LOG4J -->
   5.371 -			<!-- <dependency> <groupId>net.sf</groupId> <artifactId>log4jdbc4</artifactId> 
   5.372 -				<version>1.2</version> </dependency> -->
   5.373 +			<!--
   5.374 +			<dependency>
   5.375 +				<groupId>net.sf</groupId>
   5.376 +				<artifactId>log4jdbc4</artifactId>
   5.377 +				<version>1.2</version>
   5.378 +			</dependency>
   5.379 +			-->
   5.380 +
   5.381 +			<!--  LOG4J -->
   5.382  			<dependency>
   5.383  				<groupId>org.slf4j</groupId>
   5.384  				<artifactId>slf4j-log4j12</artifactId>
   5.385  				<version>${slf4j.version}</version>
   5.386  			</dependency>
   5.387 -			<!-- LOG4J -->
   5.388 -
   5.389 +			
   5.390  			<!-- Apache Commons -->
   5.391  			<dependency>
   5.392  				<groupId>commons-cli</groupId>
   5.393 @@ -622,7 +616,6 @@
   5.394  				<artifactId>commons-validator</artifactId>
   5.395  				<version>1.3.1</version>
   5.396  			</dependency>
   5.397 -			<!-- Apache Commons -->
   5.398  
   5.399  			<!-- Spring framework -->
   5.400  			<dependency>
   5.401 @@ -648,29 +641,39 @@
   5.402  					</exclusion>
   5.403  				</exclusions>
   5.404  			</dependency>
   5.405 -			<!-- Spring framework -->
   5.406  
   5.407 -			<!-- Web -->
   5.408 +			<!-- Apache CXF framework -->
   5.409 +			<!--
   5.410  			<dependency>
   5.411 -				<groupId>javax</groupId>
   5.412 -				<artifactId>javaee-web-api</artifactId>
   5.413 -				<version>6.0</version>
   5.414 -				<scope>provided</scope>
   5.415 +				<groupId>org.apache.cxf</groupId>
   5.416 +				<artifactId>cxf-rt-frontend-jaxws</artifactId>
   5.417 +				<version>2.2.5</version>
   5.418  			</dependency>
   5.419 -			<!-- Web -->
   5.420 -			
   5.421 -			<!-- Apache CXF framework -->
   5.422 -			<!-- <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> 
   5.423 -				<version>2.2.5</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> 
   5.424 -				<artifactId>cxf-rt-transports-http</artifactId> <version>2.2.5</version> 
   5.425 -				</dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http-jetty</artifactId> 
   5.426 -				<version>2.2.5</version> </dependency> -->
   5.427 -			<!-- Apache CXF framework -->
   5.428  
   5.429 +			<dependency>
   5.430 +				<groupId>org.apache.cxf</groupId>
   5.431 +				<artifactId>cxf-rt-transports-http</artifactId>
   5.432 +				<version>2.2.5</version>
   5.433 +			</dependency>
   5.434 +
   5.435 +			<dependency>
   5.436 +				<groupId>org.apache.cxf</groupId>
   5.437 +				<artifactId>cxf-rt-transports-http-jetty</artifactId>
   5.438 +				<version>2.2.5</version>
   5.439 +			</dependency>
   5.440 +			-->
   5.441  			<!-- Compliance tests -->
   5.442 -			<!--<dependency> <groupId>edu.lehigh.swat.bench</groupId> <artifactId>uba</artifactId> 
   5.443 -				<version>1.7</version> </dependency> <dependency> <groupId>edu.lehigh.swat.bench</groupId> 
   5.444 -				<artifactId>ubt</artifactId> <version>1.1</version> </dependency> -->
   5.445 +			<dependency>
   5.446 +				<groupId>edu.lehigh.swat.bench</groupId>
   5.447 +				<artifactId>uba</artifactId>
   5.448 +				<version>1.7</version>
   5.449 +			</dependency>
   5.450 +
   5.451 +			<dependency>
   5.452 +				<groupId>edu.lehigh.swat.bench</groupId>
   5.453 +				<artifactId>ubt</artifactId>
   5.454 +				<version>1.1</version>
   5.455 +			</dependency>
   5.456  
   5.457  			<!-- Testing: JUnit -->
   5.458  			<dependency>
   5.459 @@ -679,6 +682,31 @@
   5.460  				<version>4.7</version>
   5.461  				<scope>test</scope>
   5.462  			</dependency>
   5.463 +
   5.464 +			<!-- Various -->
   5.465 +			<dependency>
   5.466 +				<groupId>cglib</groupId>
   5.467 +				<artifactId>cglib</artifactId>
   5.468 +				<version>2.2</version>
   5.469 +			</dependency>
   5.470 +
   5.471 +			<dependency>
   5.472 +				<groupId>org.jvnet.ogc</groupId>
   5.473 +				<artifactId>ogc-tools-gml-jts</artifactId>
   5.474 +				<version>1.0.2</version>
   5.475 +			</dependency>
   5.476 +			<dependency>
   5.477 +				<groupId>com.sun.xml.bind</groupId>
   5.478 +				<artifactId>jaxb-impl</artifactId>
   5.479 +				<version>2.1.1</version>
   5.480 +			</dependency>
   5.481 +
   5.482 +			<dependency>
   5.483 +				<groupId>javax</groupId>
   5.484 +				<artifactId>javaee-web-api</artifactId>
   5.485 +				<version>6.0</version>
   5.486 +				<scope>provided</scope>
   5.487 +			</dependency>
   5.488  		</dependencies>
   5.489  	</dependencyManagement>
   5.490  
   5.491 @@ -690,7 +718,7 @@
   5.492  					<artifactId>maven-assembly-plugin</artifactId>
   5.493  					<version>2.3</version>
   5.494  				</plugin>
   5.495 -
   5.496 +				
   5.497  				<!-- The following plugin is for being able to run tomcat6/7:run -->
   5.498  				<plugin>
   5.499  					<groupId>org.apache.tomcat.maven</groupId>
   5.500 @@ -725,22 +753,51 @@
   5.501  			</plugin>
   5.502  			<!-- The following plugin is to enable skipTest (see also properties) -->
   5.503  			<plugin>
   5.504 -				<groupId>org.apache.maven.plugins</groupId>
   5.505 -				<artifactId>maven-surefire-plugin</artifactId>
   5.506 -				<version>2.14</version>
   5.507 -				<configuration>
   5.508 -					<skipTests>${skipTests}</skipTests>
   5.509 -				</configuration>
   5.510 -			</plugin>
   5.511 +		        <groupId>org.apache.maven.plugins</groupId>
   5.512 +		        <artifactId>maven-surefire-plugin</artifactId>
   5.513 +		        <version>2.14</version>
   5.514 +		        <configuration>
   5.515 +		        <skipTests>${skipTests}</skipTests>
   5.516 +			    </configuration>
   5.517 +		    </plugin>
   5.518  
   5.519 -			<!-- <plugin> <artifactId>jdeb</artifactId> <groupId>org.vafer</groupId> 
   5.520 -				<version>1.3</version> <executions> <execution> <phase>package</phase> <goals> 
   5.521 -				<goal>jdeb</goal> </goals> <configuration> <dataSet> <data> <src>${project.build.directory}/${project.build.finalName}.jar</src> 
   5.522 -				<type>file</type> <mapper> <type>perm</type> <prefix>/usr/share/jdeb/lib</prefix> 
   5.523 -				</mapper> </data> <data> <src>${project.build.directory}/strabon-endpoint</src> 
   5.524 -				<type>file</type> <mapper> <type>perm</type> <prefix>/usr/local/bin</prefix> 
   5.525 -				<user>root</user> <group>root</group> <filemode>755</filemode> </mapper> 
   5.526 -				</data> </dataSet> </configuration> </execution> </executions> </plugin> -->
   5.527 +<!--			<plugin>
   5.528 +                                <artifactId>jdeb</artifactId>
   5.529 +                                <groupId>org.vafer</groupId>
   5.530 +                                <version>1.3</version>
   5.531 +                                <executions>
   5.532 +                                        <execution>
   5.533 +                                                <phase>package</phase>
   5.534 +                                                <goals>
   5.535 +                                                        <goal>jdeb</goal>
   5.536 +                                                </goals>
   5.537 +                                        <configuration>
   5.538 +                                                <dataSet>
   5.539 +                                                        <data>
   5.540 +                                                                <src>${project.build.directory}/${project.build.finalName}.jar</src>
   5.541 +                                                                <type>file</type>
   5.542 +                                                                <mapper>
   5.543 +                                                                        <type>perm</type>
   5.544 +                                                                        <prefix>/usr/share/jdeb/lib</prefix>
   5.545 +                                                                </mapper>
   5.546 +                                                        </data>
   5.547 +                                                        <data>
   5.548 +                                                                <src>${project.build.directory}/strabon-endpoint</src>
   5.549 +                                                                <type>file</type>
   5.550 +                                                                <mapper>
   5.551 +                                                                        <type>perm</type>
   5.552 +                                                                        <prefix>/usr/local/bin</prefix>
   5.553 +                                                                        <user>root</user>
   5.554 +                                                                        <group>root</group>
   5.555 +                                                                        <filemode>755</filemode>
   5.556 +                                                                </mapper>
   5.557 +                                                        </data>
   5.558 +                                                </dataSet>
   5.559 +                                        </configuration>
   5.560 +                                </execution>
   5.561 +                        </executions>
   5.562 +                        </plugin>
   5.563 +-->
   5.564  		</plugins>
   5.565  	</build>
   5.566  
   5.567 @@ -755,19 +812,38 @@
   5.568  					<encoding>utf8</encoding>
   5.569  				</configuration>
   5.570  			</plugin>
   5.571 -			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> 
   5.572 -				<reportSets> <reportSet> <id>uml</id> <configuration> <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> 
   5.573 -				<docletArtifact> <groupId>org.umlgraph</groupId> <artifactId>doclet</artifactId> 
   5.574 -				<version>5.1</version> </docletArtifact> <additionalparam>-views</additionalparam> 
   5.575 -				<destDir>target/uml</destDir> <show>private</show> </configuration> <reports> 
   5.576 -				<report>javadoc</report> </reports> </reportSet> </reportSets> </plugin> -->
   5.577 +			<!--
   5.578 +			<plugin>
   5.579 +				<groupId>org.apache.maven.plugins</groupId>
   5.580 +				<artifactId>maven-javadoc-plugin</artifactId>
   5.581 +				<reportSets>
   5.582 +					<reportSet>
   5.583 +						<id>uml</id>
   5.584 +						<configuration>
   5.585 +							<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
   5.586 +							<docletArtifact>
   5.587 +								<groupId>org.umlgraph</groupId>
   5.588 +								<artifactId>doclet</artifactId>
   5.589 +								<version>5.1</version>
   5.590 +							</docletArtifact>
   5.591 +							<additionalparam>-views</additionalparam>
   5.592 +							<destDir>target/uml</destDir>
   5.593 +							<show>private</show>
   5.594 +						</configuration>
   5.595 +						<reports>
   5.596 +						<report>javadoc</report>
   5.597 +						</reports>
   5.598 +					</reportSet>
   5.599 +				</reportSets>
   5.600 +			</plugin>
   5.601 +			-->
   5.602  		</plugins>
   5.603  	</reporting>
   5.604  
   5.605  
   5.606  	<!-- <pluginRepositories> <pluginRepository> <id>elca-services</id> <url>http://el4.elca-services.ch/el4j/maven2repository</url> 
   5.607  		<releases> <enabled>true</enabled> </releases> </pluginRepository> </pluginRepositories> -->
   5.608 -
   5.609 +	
   5.610  	<pluginRepositories>
   5.611  		<!-- The following repository is for being able to run tomcat7:run -->
   5.612  		<pluginRepository>
   5.613 @@ -788,15 +864,19 @@
   5.614  		<developerConnection>scm:hg:ssh://hg.strabon.di.uoa.gr//opt/hg/Strabon/</developerConnection>
   5.615  		<url>http://hg.strabon.di.uoa.gr/Strabon/</url>
   5.616  	</scm>
   5.617 -
   5.618 +	
   5.619  	<issueManagement>
   5.620  		<system>Trac</system>
   5.621  		<url>http://bug.strabon.di.uoa.gr/</url>
   5.622  	</issueManagement>
   5.623  
   5.624 -	<!-- TODO: update this <ciManagement> <system>Jekins - Continuous Integration 
   5.625 -		System</system> <url>http://test.strabon.di.uoa.gr/cis</url> </ciManagement> -->
   5.626 -
   5.627 +	<!-- TODO: update this
   5.628 +	<ciManagement>
   5.629 +		<system>Jekins - Continuous Integration System</system>
   5.630 +		<url>http://test.strabon.di.uoa.gr/cis</url>
   5.631 +	</ciManagement>
   5.632 +	-->
   5.633 +	
   5.634  	<mailingLists>
   5.635  		<mailingList>
   5.636  			<name>User List</name>
   5.637 @@ -815,10 +895,19 @@
   5.638  	</mailingLists>
   5.639  
   5.640  	<repositories>
   5.641 -		<!-- <repository> <releases> <enabled>true</enabled> </releases> <snapshots> 
   5.642 -			<enabled>false</enabled> </snapshots> <id>strabon.testing</id> <name>Strabon 
   5.643 -			- maven repository</name> <url>http://maven.strabon.di.uoa.gr/content/repositories/testing</url> 
   5.644 -			</repository> -->
   5.645 +		<!--
   5.646 +		<repository>
   5.647 +			<releases>
   5.648 +				<enabled>true</enabled>
   5.649 +			</releases>
   5.650 +			<snapshots>
   5.651 +				<enabled>false</enabled>
   5.652 +			</snapshots>
   5.653 +			<id>strabon.testing</id>
   5.654 +			<name>Strabon - maven repository</name>
   5.655 +			<url>http://maven.strabon.di.uoa.gr/content/repositories/testing</url>
   5.656 +		</repository>
   5.657 +		-->
   5.658  		<repository>
   5.659  			<releases>
   5.660  				<enabled>true</enabled>
   5.661 @@ -841,17 +930,17 @@
   5.662  			<name>Strabon - maven repository - snapshots</name>
   5.663  			<url>http://maven.strabon.di.uoa.gr/content/repositories/snapshots</url>
   5.664  		</repository>
   5.665 -		<repository>
   5.666 -			<releases>
   5.667 -				<enabled>true</enabled>
   5.668 -			</releases>
   5.669 -			<snapshots>
   5.670 -				<enabled>false</enabled>
   5.671 -			</snapshots>
   5.672 -			<id>strabon.sesame</id>
   5.673 -			<name>Strabon - maven repository - sesame artifacts (temporary)</name>
   5.674 -			<url>http://maven.strabon.di.uoa.gr/content/repositories/strabon.sesame/</url>
   5.675 -		</repository>
   5.676 +	        <repository>
   5.677 +	            <releases>
   5.678 +	                <enabled>true</enabled>
   5.679 +	            </releases>
   5.680 +	            <snapshots>
   5.681 +	                <enabled>false</enabled>
   5.682 +	            </snapshots>
   5.683 +	            <id>strabon.sesame</id>
   5.684 +	            <name>Strabon - maven repository - sesame artifacts (temporary)</name>
   5.685 +	            <url>http://maven.strabon.di.uoa.gr/content/repositories/strabon.sesame/</url>
   5.686 +	        </repository>
   5.687  		<repository>
   5.688  			<releases>
   5.689  				<enabled>false</enabled>
   5.690 @@ -882,20 +971,27 @@
   5.691  			<name>OpenGeo Maven Repository</name>
   5.692  			<url>http://download.osgeo.org/webdav/geotools/</url>
   5.693  		</repository>
   5.694 -		<!-- <repository> <snapshots> <enabled>false</enabled> </snapshots> <id>umlgraph</id> 
   5.695 -			<name>UMLGraph binaries provider</name> <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url> 
   5.696 -			</repository> -->
   5.697 +		<!--
   5.698  		<repository>
   5.699 -			<releases>
   5.700 -				<enabled>true</enabled>
   5.701 -			</releases>
   5.702  			<snapshots>
   5.703  				<enabled>false</enabled>
   5.704  			</snapshots>
   5.705 -			<id>aduna-mirror-ontotext</id>
   5.706 -			<name>Aduna Maven Repository - Ontotext Mirror</name>
   5.707 -			<url>http://maven.ontotext.com/content/repositories/aduna/</url>
   5.708 +			<id>umlgraph</id>
   5.709 +			<name>UMLGraph binaries provider</name>
   5.710 +			<url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
   5.711  		</repository>
   5.712 +		-->
   5.713 +                <repository>
   5.714 +                        <releases>
   5.715 +                                <enabled>true</enabled>
   5.716 +                        </releases>
   5.717 +                        <snapshots>
   5.718 +                                <enabled>false</enabled>
   5.719 +                        </snapshots>
   5.720 +                        <id>aduna-mirror-ontotext</id>
   5.721 +                        <name>Aduna Maven Repository - Ontotext Mirror</name>
   5.722 +                        <url>http://maven.ontotext.com/content/repositories/aduna/</url>
   5.723 +                </repository>
   5.724  	</repositories>
   5.725  
   5.726  	<distributionManagement>
     6.1 --- a/postgis/pom.xml	Thu Apr 30 02:44:22 2015 +0300
     6.2 +++ b/postgis/pom.xml	Thu Apr 30 12:57:52 2015 +0300
     6.3 @@ -1,27 +1,87 @@
     6.4  <?xml version="1.0"?>
     6.5 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     6.6 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     6.7 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     6.8  
     6.9 -	<modelVersion>4.0.0</modelVersion>
    6.10 + 	<modelVersion>4.0.0</modelVersion>
    6.11  
    6.12  	<parent>
    6.13  		<groupId>eu.earthobservatory</groupId>
    6.14  		<artifactId>strabon</artifactId>
    6.15  		<version>3.3.2-SNAPSHOT</version>
    6.16  	</parent>
    6.17 -
    6.18 +  
    6.19  	<groupId>org.openrdf.sesame</groupId>
    6.20  	<artifactId>sesame-sail-postgis</artifactId>
    6.21  	<name>OpenRDF Sesame: PostGISStore </name>
    6.22  	<description>PostGIS Store Support</description>
    6.23  	<packaging>jar</packaging>
    6.24 -
    6.25 +  
    6.26 +	<url>http://maven.apache.org</url>
    6.27 +  
    6.28  	<dependencies>
    6.29 -		<!-- Core Dependencies -->
    6.30 +		<dependency>
    6.31 +			<groupId>org.openrdf.sesame</groupId>
    6.32 +			<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
    6.33 +		</dependency>
    6.34  		<dependency>
    6.35  			<groupId>org.openrdf.sesame</groupId>
    6.36  			<artifactId>sesame-sail-generaldb</artifactId>
    6.37  		</dependency>
    6.38 -		<!-- Core Dependencies -->
    6.39 +		<dependency>
    6.40 +			<groupId>org.openrdf.sesame</groupId>
    6.41 +			<artifactId>sesame-sail-rdbms</artifactId>
    6.42 +		</dependency>
    6.43 +		<dependency>
    6.44 +			<groupId>org.openrdf.sesame</groupId>
    6.45 +			<artifactId>sesame-sail-api</artifactId>
    6.46 +		</dependency>
    6.47 +
    6.48 +		<dependency>
    6.49 +			<groupId>org.openrdf.sesame</groupId>
    6.50 +			<artifactId>sesame-queryalgebra-evaluation</artifactId>
    6.51 +		</dependency>
    6.52 +		<dependency>
    6.53 +			<groupId>org.openrdf.sesame</groupId>
    6.54 +			<artifactId>sesame-queryalgebra-model</artifactId>
    6.55 +		</dependency>
    6.56 +		<dependency>
    6.57 +			<groupId>org.openrdf.sesame</groupId>
    6.58 +			<artifactId>sesame-query</artifactId>
    6.59 +		</dependency>
    6.60 +
    6.61 +		<dependency>
    6.62 +			<groupId>org.openrdf.sesame</groupId>
    6.63 +			<artifactId>sesame-model</artifactId>
    6.64 +		</dependency>
    6.65 +
    6.66 +		<dependency>
    6.67 +			<groupId>info.aduna.commons</groupId>
    6.68 +			<artifactId>aduna-commons-collections</artifactId>
    6.69 +		</dependency>
    6.70 +		<dependency>
    6.71 +			<groupId>info.aduna.commons</groupId>
    6.72 +			<artifactId>aduna-commons-iteration</artifactId>
    6.73 +		</dependency>
    6.74 +		<dependency>
    6.75 +			<groupId>info.aduna.commons</groupId>
    6.76 +			<artifactId>aduna-commons-concurrent</artifactId>
    6.77 +		</dependency>
    6.78 +
    6.79 +		<dependency>
    6.80 +			<groupId>commons-dbcp</groupId>
    6.81 +			<artifactId>commons-dbcp</artifactId>
    6.82 +		</dependency>
    6.83 +
    6.84 +		<dependency>
    6.85 +			<groupId>postgresql</groupId>
    6.86 +			<artifactId>postgresql</artifactId>
    6.87 +			<scope>provided</scope>
    6.88 +		</dependency>
    6.89 +		
    6.90 + 		<dependency>
    6.91 +			<groupId>junit</groupId>
    6.92 +			<artifactId>junit</artifactId>
    6.93 +			<scope>test</scope>
    6.94 +		</dependency>
    6.95 +		
    6.96  	</dependencies>
    6.97  </project>
     7.1 --- a/resultio-spatial/api/pom.xml	Thu Apr 30 02:44:22 2015 +0300
     7.2 +++ b/resultio-spatial/api/pom.xml	Thu Apr 30 12:57:52 2015 +0300
     7.3 @@ -1,5 +1,4 @@
     7.4 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     7.5 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     7.6 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     7.7  
     7.8  	<modelVersion>4.0.0</modelVersion>
     7.9  
     8.1 --- a/resultio-spatial/pom.xml	Thu Apr 30 02:44:22 2015 +0300
     8.2 +++ b/resultio-spatial/pom.xml	Thu Apr 30 12:57:52 2015 +0300
     8.3 @@ -1,5 +1,4 @@
     8.4 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     8.5 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     8.6 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     8.7  
     8.8  	<modelVersion>4.0.0</modelVersion>
     8.9  
    8.10 @@ -23,26 +22,61 @@
    8.11  		<module>sparqlxml</module>
    8.12  		<module>text</module>
    8.13  	</modules>
    8.14 -
    8.15 -
    8.16 +	
    8.17 +	<!--
    8.18  	<dependencies>
    8.19 -		<!-- Core Dependencies -->
    8.20 -		<dependency> <!-- TO BE REMOVED -->
    8.21 -			<groupId>org.openrdf.sesame</groupId>
    8.22 -			<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
    8.23 -		</dependency>
    8.24 -
    8.25 -		<dependency> <!-- TO BE REMOVED ? -->
    8.26 +		<dependency>
    8.27  			<groupId>org.openrdf.sesame</groupId>
    8.28  			<artifactId>sesame-sail-generaldb</artifactId>
    8.29  		</dependency>
    8.30 -		<!-- Core Dependencies -->
    8.31 +		
    8.32 +		<dependency>
    8.33 +			<groupId>org.openrdf.sesame</groupId>
    8.34 +			<artifactId>sesame-queryresultio-sparqlxml</artifactId>
    8.35 +			<version>${sesame.version}</version>
    8.36 +		</dependency>
    8.37 +		
    8.38 +		<dependency>
    8.39 +			<groupId>org.openrdf.sesame</groupId>
    8.40 +			<artifactId>sesame-queryresultio-sparqljson</artifactId>
    8.41 +			<version>${sesame.version}</version>
    8.42 +		</dependency>
    8.43  
    8.44 -		<!-- Geotools -->
    8.45 +		<dependency>
    8.46 +			<groupId>org.openrdf.sesame</groupId>
    8.47 +			<artifactId>sesame-queryresultio-text</artifactId>
    8.48 +			<version>${sesame.version}</version>
    8.49 +		</dependency>
    8.50 +				
    8.51 +		<dependency>
    8.52 +			<groupId>org.openrdf.sesame</groupId>
    8.53 +			<artifactId>sesame-queryalgebra-model</artifactId>
    8.54 +		</dependency>
    8.55 +		
    8.56 +		<dependency>
    8.57 +			<groupId>org.openrdf.sesame</groupId>
    8.58 +			<artifactId>sesame-model</artifactId>
    8.59 +		</dependency>
    8.60 +		
    8.61 +		<dependency>
    8.62 +			<groupId>org.openrdf.sesame</groupId>
    8.63 +			<artifactId>sesame-query</artifactId>
    8.64 +		</dependency>
    8.65 +		
    8.66 +		<dependency>
    8.67 +			<groupId>org.openrdf.sesame</groupId>
    8.68 +			<artifactId>sesame-repository-sparql</artifactId>
    8.69 +		</dependency>
    8.70 +
    8.71  		<dependency>
    8.72  			<groupId>org.slf4j</groupId>
    8.73  			<artifactId>slf4j-log4j12</artifactId>
    8.74  		</dependency>
    8.75 +		
    8.76 +		<dependency>
    8.77 +			<groupId>junit</groupId>
    8.78 +			<artifactId>junit</artifactId>
    8.79 +		</dependency>
    8.80  
    8.81  		<dependency>
    8.82  			<groupId>org.geotools</groupId>
    8.83 @@ -50,6 +84,11 @@
    8.84  		</dependency>
    8.85  
    8.86  		<dependency>
    8.87 +			<groupId>org.geotools.xsd</groupId>
    8.88 +			<artifactId>gt-xsd-kml</artifactId>
    8.89 +		</dependency>
    8.90 +
    8.91 +		<dependency>
    8.92  			<groupId>org.geotools</groupId>
    8.93  			<artifactId>gt-xml</artifactId>
    8.94  		</dependency>
    8.95 @@ -68,20 +107,13 @@
    8.96  			<groupId>org.geotools</groupId>
    8.97  			<artifactId>gt-opengis</artifactId>
    8.98  		</dependency>
    8.99 -
   8.100 -		<dependency>
   8.101 -			<groupId>org.geotools.xsd</groupId>
   8.102 -			<artifactId>gt-xsd-kml</artifactId>
   8.103 -		</dependency>
   8.104 -
   8.105  		<dependency>
   8.106  			<groupId>com.vividsolutions</groupId>
   8.107  			<artifactId>jts</artifactId>
   8.108  			<type>jar</type>
   8.109  			<scope>compile</scope>
   8.110  		</dependency>
   8.111 -		<!-- Geotools -->
   8.112  	</dependencies>
   8.113 -
   8.114 +	-->
   8.115  </project>
   8.116  
     9.1 --- a/resultio-spatial/sparqlgeojson/pom.xml	Thu Apr 30 02:44:22 2015 +0300
     9.2 +++ b/resultio-spatial/sparqlgeojson/pom.xml	Thu Apr 30 12:57:52 2015 +0300
     9.3 @@ -1,5 +1,4 @@
     9.4 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     9.5 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     9.6 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     9.7  
     9.8  	<modelVersion>4.0.0</modelVersion>
     9.9  
    9.10 @@ -15,9 +14,63 @@
    9.11  	<description>Spatial Query result IO API</description>
    9.12  
    9.13  	<dependencies>
    9.14 +
    9.15 +		<dependency> <!-- TO BE REMOVED -->
    9.16 +			<groupId>org.openrdf.sesame</groupId>
    9.17 +			<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
    9.18 +		</dependency>
    9.19 +		<dependency> <!-- TO BE REMOVED ? -->
    9.20 +			<groupId>org.openrdf.sesame</groupId>
    9.21 +			<artifactId>sesame-sail-generaldb</artifactId>
    9.22 +		</dependency>
    9.23 +		
    9.24  		<dependency>
    9.25  			<groupId>org.openrdf.sesame</groupId>
    9.26  			<artifactId>sesame-queryresultio-spatial-api</artifactId>
    9.27  		</dependency>
    9.28 +
    9.29 +                <dependency>
    9.30 +                        <groupId>org.slf4j</groupId>
    9.31 +                        <artifactId>slf4j-log4j12</artifactId>
    9.32 +                </dependency>
    9.33 +                
    9.34 +                <dependency>
    9.35 +                        <groupId>junit</groupId>
    9.36 +                        <artifactId>junit</artifactId>
    9.37 +			<scope>test</scope>
    9.38 +                </dependency>
    9.39 +
    9.40 +                <dependency>
    9.41 +                        <groupId>org.geotools</groupId>
    9.42 +                        <artifactId>gt-geojson</artifactId>
    9.43 +                </dependency>
    9.44 +
    9.45 +
    9.46 +                <dependency>
    9.47 +                        <groupId>org.geotools</groupId>
    9.48 +                        <artifactId>gt-xml</artifactId>
    9.49 +                </dependency>
    9.50 +
    9.51 +                <dependency>
    9.52 +                        <groupId>org.geotools</groupId>
    9.53 +                        <artifactId>gt-epsg-hsql</artifactId>
    9.54 +                </dependency>
    9.55 +
    9.56 +                <dependency>
    9.57 +                        <groupId>org.geotools</groupId>
    9.58 +                        <artifactId>gt-shapefile</artifactId>
    9.59 +                </dependency>
    9.60 +
    9.61 +                <dependency>
    9.62 +                        <groupId>org.geotools</groupId>
    9.63 +                        <artifactId>gt-opengis</artifactId>
    9.64 +                </dependency>
    9.65 +                <dependency>
    9.66 +                        <groupId>com.vividsolutions</groupId>
    9.67 +                        <artifactId>jts</artifactId>
    9.68 +                        <type>jar</type>
    9.69 +                        <scope>compile</scope>
    9.70 +                </dependency>
    9.71 +
    9.72  	</dependencies>
    9.73  </project>
    10.1 --- a/resultio-spatial/sparqlhtml/pom.xml	Thu Apr 30 02:44:22 2015 +0300
    10.2 +++ b/resultio-spatial/sparqlhtml/pom.xml	Thu Apr 30 12:57:52 2015 +0300
    10.3 @@ -1,5 +1,4 @@
    10.4 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    10.5 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    10.6 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    10.7  
    10.8  	<modelVersion>4.0.0</modelVersion>
    10.9  
   10.10 @@ -23,5 +22,38 @@
   10.11  			<groupId>org.openrdf.sesame</groupId>
   10.12  			<artifactId>sesame-queryresultio-spatial-sparqlxml</artifactId>
   10.13  		</dependency>
   10.14 +        <dependency> <!-- TO BE REMOVED -->
   10.15 +                <groupId>org.openrdf.sesame</groupId>
   10.16 +                <artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
   10.17 +        </dependency>
   10.18 +
   10.19 +		<dependency>
   10.20 +			<groupId>org.slf4j</groupId>
   10.21 +			<artifactId>slf4j-log4j12</artifactId>
   10.22 +		</dependency>
   10.23 +		
   10.24 +		<dependency>
   10.25 +			<groupId>junit</groupId>
   10.26 +			<artifactId>junit</artifactId>
   10.27 +			<scope>test</scope>
   10.28 +		</dependency>
   10.29 +		<!--
   10.30 +		<dependency>
   10.31 +			<groupId>org.openrdf.sesame</groupId>
   10.32 +			<artifactId>sesame-model</artifactId>
   10.33 +		</dependency>
   10.34 +		<dependency>
   10.35 +			<groupId>org.openrdf.sesame</groupId>
   10.36 +			<artifactId>sesame-query</artifactId>
   10.37 +		</dependency>
   10.38 +		<dependency>
   10.39 +			<groupId>org.openrdf.sesame</groupId>
   10.40 +			<artifactId>sesame-rio-api</artifactId>
   10.41 +		</dependency>
   10.42 +		<dependency>
   10.43 +			<groupId>org.openrdf.sesame</groupId>
   10.44 +			<artifactId>sesame-util</artifactId>
   10.45 +		</dependency>
   10.46 +		-->
   10.47  	</dependencies>
   10.48  </project>
    11.1 --- a/resultio-spatial/sparqlkml/pom.xml	Thu Apr 30 02:44:22 2015 +0300
    11.2 +++ b/resultio-spatial/sparqlkml/pom.xml	Thu Apr 30 12:57:52 2015 +0300
    11.3 @@ -1,5 +1,4 @@
    11.4 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    11.5 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    11.6 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    11.7  
    11.8  	<modelVersion>4.0.0</modelVersion>
    11.9  
   11.10 @@ -23,5 +22,48 @@
   11.11  			<groupId>org.openrdf.sesame</groupId>
   11.12  			<artifactId>sesame-queryresultio-spatial-sparqlxml</artifactId>
   11.13  		</dependency>
   11.14 +		<dependency>
   11.15 +			<groupId>org.slf4j</groupId>
   11.16 +			<artifactId>slf4j-log4j12</artifactId>
   11.17 +		</dependency>
   11.18 +		
   11.19 +		<dependency>
   11.20 +			<groupId>junit</groupId>
   11.21 +			<artifactId>junit</artifactId>
   11.22 +			<scope>test</scope>
   11.23 +		</dependency>
   11.24 +		
   11.25 +		<dependency>
   11.26 +			<groupId>org.geotools.xsd</groupId>
   11.27 +			<artifactId>gt-xsd-kml</artifactId>
   11.28 +		</dependency>
   11.29 +
   11.30 +		<dependency> <!-- TO BE REMOVED -->
   11.31 +			<groupId>org.openrdf.sesame</groupId>
   11.32 +			<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
   11.33 +		</dependency>
   11.34 +		<dependency> <!-- TO BE REMOVED ? -->
   11.35 +			<groupId>org.openrdf.sesame</groupId>
   11.36 +			<artifactId>sesame-sail-generaldb</artifactId>
   11.37 +		</dependency>
   11.38 +
   11.39 +		<!--
   11.40 +		<dependency>
   11.41 +			<groupId>org.openrdf.sesame</groupId>
   11.42 +			<artifactId>sesame-model</artifactId>
   11.43 +		</dependency>
   11.44 +		<dependency>
   11.45 +			<groupId>org.openrdf.sesame</groupId>
   11.46 +			<artifactId>sesame-query</artifactId>
   11.47 +		</dependency>
   11.48 +		<dependency>
   11.49 +			<groupId>org.openrdf.sesame</groupId>
   11.50 +			<artifactId>sesame-rio-api</artifactId>
   11.51 +		</dependency>
   11.52 +		<dependency>
   11.53 +			<groupId>org.openrdf.sesame</groupId>
   11.54 +			<artifactId>sesame-util</artifactId>
   11.55 +		</dependency>
   11.56 +		-->
   11.57  	</dependencies>
   11.58  </project>
    12.1 --- a/resultio-spatial/sparqlxml/pom.xml	Thu Apr 30 02:44:22 2015 +0300
    12.2 +++ b/resultio-spatial/sparqlxml/pom.xml	Thu Apr 30 12:57:52 2015 +0300
    12.3 @@ -1,5 +1,4 @@
    12.4 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    12.5 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    12.6 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    12.7  
    12.8  	<modelVersion>4.0.0</modelVersion>
    12.9  
   12.10 @@ -19,5 +18,46 @@
   12.11  			<groupId>org.openrdf.sesame</groupId>
   12.12  			<artifactId>sesame-queryresultio-spatial-api</artifactId>
   12.13  		</dependency>
   12.14 +		<dependency>
   12.15 +			<groupId>org.openrdf.sesame</groupId>
   12.16 +			<artifactId>sesame-sail-generaldb</artifactId>
   12.17 +		</dependency>
   12.18 +		<dependency>
   12.19 +			<groupId>org.openrdf.sesame</groupId>
   12.20 +			<artifactId>sesame-queryresultio-sparqlxml</artifactId>
   12.21 +		</dependency>
   12.22 +                <dependency> <!-- TO BE REMOVED -->
   12.23 +                        <groupId>org.openrdf.sesame</groupId>
   12.24 +                        <artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
   12.25 +                </dependency>
   12.26 +
   12.27 +		<dependency>
   12.28 +			<groupId>org.slf4j</groupId>
   12.29 +			<artifactId>slf4j-log4j12</artifactId>
   12.30 +		</dependency>
   12.31 +		
   12.32 +		<dependency>
   12.33 +			<groupId>junit</groupId>
   12.34 +			<artifactId>junit</artifactId>
   12.35 +			<scope>test</scope>
   12.36 +		</dependency>
   12.37 +		<!--
   12.38 +		<dependency>
   12.39 +			<groupId>org.openrdf.sesame</groupId>
   12.40 +			<artifactId>sesame-model</artifactId>
   12.41 +		</dependency>
   12.42 +		<dependency>
   12.43 +			<groupId>org.openrdf.sesame</groupId>
   12.44 +			<artifactId>sesame-query</artifactId>
   12.45 +		</dependency>
   12.46 +		<dependency>
   12.47 +			<groupId>org.openrdf.sesame</groupId>
   12.48 +			<artifactId>sesame-rio-api</artifactId>
   12.49 +		</dependency>
   12.50 +		<dependency>
   12.51 +			<groupId>org.openrdf.sesame</groupId>
   12.52 +			<artifactId>sesame-util</artifactId>
   12.53 +		</dependency>
   12.54 +		-->
   12.55  	</dependencies>
   12.56  </project>
    13.1 --- a/resultio-spatial/text/pom.xml	Thu Apr 30 02:44:22 2015 +0300
    13.2 +++ b/resultio-spatial/text/pom.xml	Thu Apr 30 12:57:52 2015 +0300
    13.3 @@ -18,9 +18,46 @@
    13.4  			<groupId>org.openrdf.sesame</groupId>
    13.5  			<artifactId>sesame-queryresultio-spatial-api</artifactId>
    13.6  		</dependency>
    13.7 +        <dependency> <!-- TO BE REMOVED -->
    13.8 +                <groupId>org.openrdf.sesame</groupId>
    13.9 +                <artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
   13.10 +        </dependency>
   13.11 +        <dependency> <!-- TO BE REMOVED ? -->
   13.12 +			<groupId>org.openrdf.sesame</groupId>
   13.13 +			<artifactId>sesame-sail-generaldb</artifactId>
   13.14 +		</dependency>
   13.15          <dependency>
   13.16                  <groupId>org.openrdf.sesame</groupId>
   13.17                  <artifactId>sesame-queryresultio-text</artifactId>
   13.18          </dependency>
   13.19 +
   13.20 +		<dependency>
   13.21 +			<groupId>org.slf4j</groupId>
   13.22 +			<artifactId>slf4j-log4j12</artifactId>
   13.23 +		</dependency>
   13.24 +		
   13.25 +		<dependency>
   13.26 +			<groupId>junit</groupId>
   13.27 +			<artifactId>junit</artifactId>
   13.28 +			<scope>test</scope>
   13.29 +		</dependency>
   13.30 +<!--
   13.31 +		<dependency>
   13.32 +			<groupId>org.openrdf.sesame</groupId>
   13.33 +			<artifactId>sesame-model</artifactId>
   13.34 +		</dependency>
   13.35 +		<dependency>
   13.36 +			<groupId>org.openrdf.sesame</groupId>
   13.37 +			<artifactId>sesame-query</artifactId>
   13.38 +		</dependency>
   13.39 +		<dependency>
   13.40 +			<groupId>org.openrdf.sesame</groupId>
   13.41 +			<artifactId>sesame-rio-api</artifactId>
   13.42 +		</dependency>
   13.43 +		<dependency>
   13.44 +			<groupId>org.openrdf.sesame</groupId>
   13.45 +			<artifactId>sesame-util</artifactId>
   13.46 +		</dependency>
   13.47 +-->
   13.48  	</dependencies>
   13.49  </project>
    14.1 --- a/runtime/pom.xml	Thu Apr 30 02:44:22 2015 +0300
    14.2 +++ b/runtime/pom.xml	Thu Apr 30 12:57:52 2015 +0300
    14.3 @@ -1,5 +1,4 @@
    14.4 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    14.5 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    14.6 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    14.7  
    14.8  	<modelVersion>4.0.0</modelVersion>
    14.9  
   14.10 @@ -16,7 +15,75 @@
   14.11  	<packaging>jar</packaging>
   14.12  
   14.13  	<dependencies>
   14.14 -		<!-- Sesame Dependencies -->
   14.15 +		<dependency>
   14.16 +			<groupId>org.openrdf.sesame</groupId>
   14.17 +			<artifactId>sesame-sail-memory</artifactId>
   14.18 +		</dependency>
   14.19 +	
   14.20 +		<dependency>
   14.21 +			<groupId>org.openrdf.sesame</groupId>
   14.22 +			<artifactId>sesame-queryresultio-spatial-api</artifactId>
   14.23 +		</dependency>
   14.24 +		<dependency>
   14.25 +			<groupId>org.openrdf.sesame</groupId>
   14.26 +			<artifactId>sesame-queryresultio-spatial-sparqlgeojson</artifactId>
   14.27 +		</dependency>
   14.28 +		<dependency>
   14.29 +			<groupId>org.openrdf.sesame</groupId>
   14.30 +			<artifactId>sesame-queryresultio-spatial-sparqlkml</artifactId>
   14.31 +		</dependency>
   14.32 +		<dependency>
   14.33 +			<groupId>org.openrdf.sesame</groupId>
   14.34 +			<artifactId>sesame-queryresultio-spatial-sparqlxml</artifactId>
   14.35 +		</dependency>
   14.36 +		<dependency>
   14.37 +			<groupId>org.openrdf.sesame</groupId>
   14.38 +			<artifactId>sesame-queryresultio-spatial-sparqlhtml</artifactId>
   14.39 +		</dependency>
   14.40 +		<dependency>
   14.41 +			<groupId>org.openrdf.sesame</groupId>
   14.42 +			<artifactId>sesame-queryresultio-spatial-text</artifactId>
   14.43 +		</dependency>
   14.44 +		<dependency>
   14.45 +			<groupId>org.openrdf.sesame</groupId>
   14.46 +			<artifactId>sesame-queryresultio-sparqljson</artifactId>
   14.47 +		</dependency>
   14.48 +		<dependency>
   14.49 +			<groupId>org.openrdf.sesame</groupId>
   14.50 +			<artifactId>sesame-queryresultio-binary</artifactId>
   14.51 +		</dependency>
   14.52 +
   14.53 +
   14.54 +		<dependency>
   14.55 +			<groupId>org.openrdf.sesame</groupId>
   14.56 +			<artifactId>sesame-sail-postgis</artifactId>
   14.57 +		</dependency>
   14.58 +
   14.59 +		<dependency>
   14.60 +			<groupId>org.openrdf.sesame</groupId>
   14.61 +			<artifactId>sesame-sail-monetdb</artifactId>
   14.62 +		</dependency>
   14.63 +
   14.64 +		<dependency>
   14.65 +			<groupId>org.openrdf.sesame</groupId>
   14.66 +			<artifactId>sesame-sail-generaldb</artifactId>
   14.67 +		</dependency>
   14.68 +
   14.69 +		<dependency>
   14.70 +			<groupId>org.openrdf.sesame</groupId>
   14.71 +			<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
   14.72 +		</dependency>
   14.73 +
   14.74 +		<dependency>
   14.75 +			<groupId>org.openrdf.sesame</groupId>
   14.76 +			<artifactId>sesame-queryalgebra-model</artifactId>
   14.77 +		</dependency>
   14.78 +
   14.79 +		<dependency>
   14.80 +			<groupId>org.openrdf.sesame</groupId>
   14.81 +			<artifactId>sesame-queryalgebra-evaluation</artifactId>
   14.82 +		</dependency>
   14.83 +
   14.84  		<dependency>
   14.85  			<groupId>org.openrdf.sesame</groupId>
   14.86  			<artifactId>sesame-queryparser-api</artifactId>
   14.87 @@ -26,7 +93,33 @@
   14.88  			<groupId>org.openrdf.sesame</groupId>
   14.89  			<artifactId>sesame-queryparser-sparql</artifactId>
   14.90  		</dependency>
   14.91 -		
   14.92 +
   14.93 +		<dependency>
   14.94 +			<groupId>org.openrdf.sesame</groupId>
   14.95 +			<artifactId>sesame-model</artifactId>
   14.96 +		</dependency>
   14.97 +
   14.98 +		<dependency>
   14.99 +			<groupId>org.openrdf.sesame</groupId>
  14.100 +			<artifactId>sesame-sail-api</artifactId>
  14.101 +		</dependency>
  14.102 +
  14.103 +		<dependency>
  14.104 +			<groupId>org.openrdf.sesame</groupId>
  14.105 +			<artifactId>sesame-query</artifactId>
  14.106 +		</dependency>
  14.107 +
  14.108 +		<dependency>
  14.109 +			<groupId>org.openrdf.sesame</groupId>
  14.110 +			<artifactId>sesame-sail-rdbms</artifactId>
  14.111 +		</dependency>
  14.112 +
  14.113 +		<dependency>
  14.114 +			<groupId>org.openrdf.sesame</groupId>
  14.115 +			<artifactId>sesame-repository-sail</artifactId>
  14.116 +		</dependency>
  14.117 +
  14.118 +		<!-- rio API -->
  14.119  		<dependency>
  14.120  			<groupId>org.openrdf.sesame</groupId>
  14.121  			<artifactId>sesame-rio-rdfxml</artifactId>
  14.122 @@ -60,80 +153,196 @@
  14.123  		<dependency>
  14.124  			<groupId>org.openrdf.sesame</groupId>
  14.125  			<artifactId>sesame-rio-binary</artifactId>
  14.126 -		</dependency>		
  14.127 -		<!-- Sesame Dependencies -->
  14.128 -		
  14.129 -		<!-- Core Dependencies -->
  14.130 +		</dependency>
  14.131 +		<!-- rio API -->
  14.132 +
  14.133 +		<!-- GeoTools -->
  14.134  		<dependency>
  14.135 -			<groupId>org.openrdf.sesame</groupId>
  14.136 -			<artifactId>sesame-repository-sail</artifactId>
  14.137 +			<groupId>org.geotools</groupId>
  14.138 +			<artifactId>gt-geojson</artifactId>
  14.139  		</dependency>
  14.140  
  14.141  		<dependency>
  14.142 -			<groupId>org.openrdf.sesame</groupId>
  14.143 -			<artifactId>sesame-sail-postgis</artifactId>
  14.144 +			<groupId>org.geotools.xsd</groupId>
  14.145 +			<artifactId>gt-xsd-kml</artifactId>
  14.146  		</dependency>
  14.147  
  14.148  		<dependency>
  14.149 -			<groupId>org.openrdf.sesame</groupId>
  14.150 -			<artifactId>sesame-sail-monetdb</artifactId>
  14.151 +			<groupId>org.geotools</groupId>
  14.152 +			<artifactId>gt-xml</artifactId>
  14.153  		</dependency>
  14.154  
  14.155  		<dependency>
  14.156 -			<groupId>org.openrdf.sesame</groupId>
  14.157 -			<artifactId>sesame-sail-generaldb</artifactId>
  14.158 +			<groupId>org.geotools</groupId>
  14.159 +			<artifactId>gt-epsg-hsql</artifactId>
  14.160  		</dependency>
  14.161  
  14.162  		<dependency>
  14.163 -			<groupId>org.openrdf.sesame</groupId>
  14.164 -			<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
  14.165 +			<groupId>org.geotools</groupId>
  14.166 +			<artifactId>gt-shapefile</artifactId>
  14.167  		</dependency>
  14.168  
  14.169  		<dependency>
  14.170 -			<groupId>org.openrdf.sesame</groupId>
  14.171 -			<artifactId>sesame-queryresultio-spatial-api</artifactId>
  14.172 +			<groupId>org.geotools</groupId>
  14.173 +			<artifactId>gt-opengis</artifactId>
  14.174 +		</dependency>
  14.175 +
  14.176 +		<!-- Aduna Appbase -->
  14.177 +		<dependency>
  14.178 +			<groupId>info.aduna.appbase</groupId>
  14.179 +			<artifactId>aduna-appbase</artifactId>
  14.180 +			<type>pom</type>
  14.181 +		</dependency>
  14.182 +
  14.183 +		<!-- Aduna Commons -->
  14.184 +		<!-- Note: other Aduna Commons dependencies are imported from appbase -->
  14.185 +		<dependency>
  14.186 +			<groupId>info.aduna.commons</groupId>
  14.187 +			<artifactId>aduna-commons-collections</artifactId>
  14.188 +		</dependency>
  14.189 +		<dependency>
  14.190 +			<groupId>info.aduna.commons</groupId>
  14.191 +			<artifactId>aduna-commons-concurrent</artifactId>
  14.192 +		</dependency>
  14.193 +		<dependency>
  14.194 +			<groupId>info.aduna.commons</groupId>
  14.195 +			<artifactId>aduna-commons-i18n</artifactId>
  14.196 +		</dependency>
  14.197 +		<dependency>
  14.198 +			<groupId>info.aduna.commons</groupId>
  14.199 +			<artifactId>aduna-commons-iteration</artifactId>
  14.200 +		</dependency>
  14.201 +		<dependency>
  14.202 +			<groupId>info.aduna.commons</groupId>
  14.203 +			<artifactId>aduna-commons-net-http-server-embedded</artifactId>
  14.204 +			<exclusions>
  14.205 +				<exclusion>
  14.206 +					<artifactId>jsp-2.1</artifactId>
  14.207 +					<groupId>org.mortbay.jetty</groupId>
  14.208 +				</exclusion>
  14.209 +			</exclusions>
  14.210 +		</dependency>
  14.211 +
  14.212 +		<!-- Apache Commons -->
  14.213 +		<dependency>
  14.214 +			<groupId>commons-cli</groupId>
  14.215 +			<artifactId>commons-cli</artifactId>
  14.216 +		</dependency>
  14.217 +		<dependency>
  14.218 +			<groupId>commons-dbcp</groupId>
  14.219 +			<artifactId>commons-dbcp</artifactId>
  14.220 +		</dependency>
  14.221 +		<dependency>
  14.222 +			<groupId>commons-fileupload</groupId>
  14.223 +			<artifactId>commons-fileupload</artifactId>
  14.224 +		</dependency>
  14.225 +		<dependency>
  14.226 +			<groupId>commons-io</groupId>
  14.227 +			<artifactId>commons-io</artifactId>
  14.228 +			<!-- this is the version that is specified as an optional dependency for 
  14.229 +				fileupload -->
  14.230 +		</dependency>
  14.231 +		<dependency>
  14.232 +			<groupId>commons-httpclient</groupId>
  14.233 +			<artifactId>commons-httpclient</artifactId>
  14.234 +			<exclusions>
  14.235 +				<exclusion>
  14.236 +					<groupId>commons-logging</groupId>
  14.237 +					<artifactId>commons-logging</artifactId>
  14.238 +				</exclusion>
  14.239 +				<exclusion>
  14.240 +					<!-- httpclient includes older codec -->
  14.241 +					<groupId>commons-codec</groupId>
  14.242 +					<artifactId>commons-codec</artifactId>
  14.243 +				</exclusion>
  14.244 +			</exclusions>
  14.245 +		</dependency>
  14.246 +		<dependency>
  14.247 +			<groupId>commons-codec</groupId>
  14.248 +			<artifactId>commons-codec</artifactId>
  14.249 +			<scope>runtime</scope>
  14.250 +		</dependency>
  14.251 +
  14.252 +		<!-- Spring framework -->
  14.253 +		<dependency>
  14.254 +			<groupId>org.springframework</groupId>
  14.255 +			<artifactId>spring-aop</artifactId>
  14.256 +			<exclusions>
  14.257 +				<exclusion>
  14.258 +					<groupId>commons-logging</groupId>
  14.259 +					<artifactId>commons-logging</artifactId>
  14.260 +				</exclusion>
  14.261 +			</exclusions>
  14.262 +		</dependency>
  14.263 +
  14.264 +		<!-- Compliance tests -->
  14.265 +		<dependency>
  14.266 +			<groupId>edu.lehigh.swat.bench</groupId>
  14.267 +			<artifactId>uba</artifactId>
  14.268 +		</dependency>
  14.269 +		<dependency>
  14.270 +			<groupId>edu.lehigh.swat.bench</groupId>
  14.271 +			<artifactId>ubt</artifactId>
  14.272 +		</dependency>
  14.273 +
  14.274 +		<!-- JDBC Drivers -->
  14.275 +
  14.276 +		<dependency>
  14.277 +			<groupId>postgresql</groupId>
  14.278 +			<artifactId>postgresql</artifactId>
  14.279 +		</dependency>
  14.280 +<!-- 
  14.281 +		<dependency>
  14.282 +			<groupId>mysql</groupId>
  14.283 +			<artifactId>mysql-connector-java</artifactId>
  14.284 +		</dependency>
  14.285 + -->
  14.286 +		<!-- various -->
  14.287 +		<dependency>
  14.288 +			<groupId>cglib</groupId>
  14.289 +			<artifactId>cglib</artifactId>
  14.290 +		</dependency>
  14.291 +
  14.292 +		<!-- Testing: JUnit -->
  14.293 +		<dependency>
  14.294 +			<groupId>junit</groupId>
  14.295 +			<artifactId>junit</artifactId>
  14.296 +			<scope>test</scope>
  14.297 +		</dependency>
  14.298 +
  14.299 +		<dependency>
  14.300 +			<groupId>monetdb</groupId>
  14.301 +			<artifactId>jdbcclient</artifactId>
  14.302 +		</dependency>
  14.303 +
  14.304 +		<!-- Geotools -->
  14.305 +		<!-- One epsg jar file suffices. Read this: http://docs.geotools.org/latest/userguide/faq.html#q-how-to-choose-an-epsg-authority
  14.306 +		<dependency>
  14.307 +			<groupId>org.geotools</groupId>
  14.308 +			<artifactId>gt-epsg-wkt</artifactId>
  14.309 +		</dependency>
  14.310 +		-->
  14.311 +		
  14.312 +		<dependency>
  14.313 +			<groupId>org.geotools</groupId>
  14.314 +			<artifactId>gt-geometry</artifactId>
  14.315  		</dependency>
  14.316  		
  14.317  		<dependency>
  14.318 -			<groupId>org.openrdf.sesame</groupId>
  14.319 -			<artifactId>sesame-queryresultio-spatial-api</artifactId>
  14.320 +			<groupId>org.geotools</groupId>
  14.321 +			<artifactId>gt-data</artifactId>
  14.322 +		</dependency>
  14.323 +				
  14.324 +		<dependency>
  14.325 +			<groupId>org.geotools</groupId>
  14.326 +			<artifactId>gt-swing</artifactId>
  14.327  		</dependency>
  14.328  		
  14.329  		<dependency>
  14.330 -			<groupId>org.openrdf.sesame</groupId>
  14.331 -			<artifactId>sesame-queryresultio-spatial-sparqlgeojson</artifactId>
  14.332 +			<groupId>org.opengis</groupId>
  14.333 +			<artifactId>geoapi-pending</artifactId>
  14.334  		</dependency>
  14.335  		
  14.336 -		<dependency>
  14.337 -			<groupId>org.openrdf.sesame</groupId>
  14.338 -			<artifactId>sesame-queryresultio-spatial-sparqlkml</artifactId>
  14.339 -		</dependency>
  14.340 -		
  14.341 -		<dependency>
  14.342 -			<groupId>org.openrdf.sesame</groupId>
  14.343 -			<artifactId>sesame-queryresultio-spatial-sparqlxml</artifactId>
  14.344 -		</dependency>
  14.345 -		
  14.346 -		<dependency>
  14.347 -			<groupId>org.openrdf.sesame</groupId>
  14.348 -			<artifactId>sesame-queryresultio-spatial-sparqlhtml</artifactId>
  14.349 -		</dependency>
  14.350 -		
  14.351 -		<dependency>
  14.352 -			<groupId>org.openrdf.sesame</groupId>
  14.353 -			<artifactId>sesame-queryresultio-spatial-text</artifactId>
  14.354 -		</dependency>
  14.355 -		
  14.356 -		<dependency>
  14.357 -			<groupId>org.openrdf.sesame</groupId>
  14.358 -			<artifactId>sesame-queryresultio-sparqljson</artifactId>
  14.359 -		</dependency>
  14.360 -		
  14.361 -		<dependency>
  14.362 -			<groupId>org.openrdf.sesame</groupId>
  14.363 -			<artifactId>sesame-queryresultio-binary</artifactId>
  14.364 -		</dependency>		
  14.365 -		<!-- Core Dependencies -->
  14.366  	</dependencies>
  14.367  
  14.368  	<build>
  14.369 @@ -222,7 +431,7 @@
  14.370  		</plugins>
  14.371  	</build>
  14.372  
  14.373 -	<profiles>
  14.374 +<profiles>
  14.375  		<profile>
  14.376  			<id>create-debian</id>
  14.377  			<activation>
  14.378 @@ -232,66 +441,68 @@
  14.379  					<value>true</value>
  14.380  				</property>
  14.381  			</activation>
  14.382 -			<build>
  14.383 -				<plugins>
  14.384 -					<plugin>
  14.385 -						<groupId>org.codehaus.mojo</groupId>
  14.386 -						<artifactId>exec-maven-plugin</artifactId>
  14.387 -						<version>1.1.1</version>
  14.388 -						<executions>
  14.389 -							<execution>
  14.390 -								<!-- <id>some-execution</id> -->
  14.391 -								<phase>package</phase>
  14.392 -								<goals>
  14.393 -									<goal>exec</goal>
  14.394 -								</goals>
  14.395 -							</execution>
  14.396 -						</executions>
  14.397 -						<configuration>
  14.398 -							<executable>${basedir}/../scripts/update-debian-version.sh</executable>
  14.399 -						</configuration>
  14.400 -					</plugin>
  14.401 -					<plugin>
  14.402 -						<artifactId>jdeb</artifactId>
  14.403 -						<groupId>org.vafer</groupId>
  14.404 -						<version>1.3</version>
  14.405 -						<executions>
  14.406 -							<execution>
  14.407 -								<phase>package</phase>
  14.408 -								<goals>
  14.409 -									<goal>jdeb</goal>
  14.410 -								</goals>
  14.411 -								<configuration>
  14.412 -									<skipPOMs>false</skipPOMs>
  14.413 -									<dataSet>
  14.414 -										<data>
  14.415 -											<src>${project.build.directory}</src>
  14.416 -											<type>directory</type>
  14.417 -											<includes>**/</includes>
  14.418 -											<mapper>
  14.419 -												<type>perm</type>
  14.420 -												<prefix>/usr/share/jdeb/lib/strabon-runtime</prefix>
  14.421 -											</mapper>
  14.422 -										</data>
  14.423 -										<data>
  14.424 -											<src>${basedir}/strabon-cmd</src>
  14.425 -											<type>file</type>
  14.426 -											<mapper>
  14.427 -												<type>perm</type>
  14.428 -												<prefix>/usr/local/bin</prefix>
  14.429 -												<user>root</user>
  14.430 -												<group>root</group>
  14.431 -												<filemode>755</filemode>
  14.432 -											</mapper>
  14.433 -										</data>
  14.434 -									</dataSet>
  14.435 -								</configuration>
  14.436 -							</execution>
  14.437 -						</executions>
  14.438 -					</plugin>
  14.439 +				<build>
  14.440 +					<plugins>
  14.441 +<plugin>
  14.442 +                                                    <groupId>org.codehaus.mojo</groupId>
  14.443 +                                                    <artifactId>exec-maven-plugin</artifactId>
  14.444 +                                                    <version>1.1.1</version>
  14.445 +                                                    <executions>
  14.446 +                                                      <execution>
  14.447 +                                                        <!--
  14.448 +                                                        <id>some-execution</id>
  14.449 +                                                        -->
  14.450 +                                                        <phase>package</phase>
  14.451 +                                                        <goals>
  14.452 +                                                          <goal>exec</goal>
  14.453 +                                                        </goals>
  14.454 +                                                      </execution>
  14.455 +                                                    </executions>
  14.456 +                                                    <configuration>
  14.457 +                                                      <executable>${basedir}/../scripts/update-debian-version.sh</executable>
  14.458 +                                                    </configuration>
  14.459 +                                                  </plugin>
  14.460 +						<plugin>
  14.461 +                                <artifactId>jdeb</artifactId>
  14.462 +                                <groupId>org.vafer</groupId>
  14.463 +                                <version>1.3</version>
  14.464 +                                <executions>
  14.465 +                                        <execution>
  14.466 +                                                <phase>package</phase>
  14.467 +                                                <goals>
  14.468 +                                                        <goal>jdeb</goal>
  14.469 +                                                </goals>
  14.470 +                                        <configuration>
  14.471 +						<skipPOMs>false</skipPOMs>
  14.472 +                                                <dataSet>
  14.473 +                                                        <data>
  14.474 +                                                                <src>${project.build.directory}</src>
  14.475 +                                                                <type>directory</type>
  14.476 +								<includes>**/</includes>
  14.477 +                                                                <mapper>
  14.478 +                                                                        <type>perm</type>
  14.479 +                                                                        <prefix>/usr/share/jdeb/lib/strabon-runtime</prefix>
  14.480 +                                                                </mapper>
  14.481 +                                                        </data>
  14.482 +                                                        <data>
  14.483 +                                                                <src>${basedir}/strabon-cmd</src>
  14.484 +                                                                <type>file</type>
  14.485 +                                                                <mapper>
  14.486 +                                                                        <type>perm</type>
  14.487 +                                                                        <prefix>/usr/local/bin</prefix>
  14.488 +                                                                        <user>root</user>
  14.489 +                                                                        <group>root</group>
  14.490 +                                                                        <filemode>755</filemode>
  14.491 +                                                                </mapper>
  14.492 +                                                        </data>
  14.493 +                                                </dataSet>
  14.494 +                                        </configuration>
  14.495 +                                </execution>
  14.496 +                        </executions>
  14.497 +                        </plugin>
  14.498  
  14.499 -				</plugins>
  14.500 -			</build>
  14.501 +					</plugins>
  14.502 +				</build>
  14.503  
  14.504  		</profile>
  14.505  	</profiles>
    15.1 --- a/testsuite/pom.xml	Thu Apr 30 02:44:22 2015 +0300
    15.2 +++ b/testsuite/pom.xml	Thu Apr 30 12:57:52 2015 +0300
    15.3 @@ -1,5 +1,4 @@
    15.4 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    15.5 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    15.6 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    15.7  
    15.8  	<modelVersion>4.0.0</modelVersion>
    15.9  
   15.10 @@ -20,36 +19,13 @@
   15.11  			<groupId>eu.earthobservatory</groupId>
   15.12  			<artifactId>strabon-runtime</artifactId>
   15.13  		</dependency>
   15.14 -
   15.15 -		<!-- Apache Commons -->
   15.16 -		<dependency>
   15.17 -			<groupId>commons-io</groupId>
   15.18 -			<artifactId>commons-io</artifactId>
   15.19 -		</dependency>
   15.20 -		<!-- Apache Commons -->
   15.21 -
   15.22 -		<!-- JUnit -->
   15.23 + 
   15.24 +		<!-- Testing: JUnit -->
   15.25  		<dependency>
   15.26  			<groupId>junit</groupId>
   15.27  			<artifactId>junit</artifactId>
   15.28  			<scope>test</scope>
   15.29 -		</dependency>
   15.30 -		<!-- JUnit -->
   15.31 -
   15.32 -		<!-- JDBC Drivers -->
   15.33 -		<dependency>
   15.34 -			<groupId>monetdb</groupId>
   15.35 -			<artifactId>jdbcclient</artifactId>
   15.36 -			<version>3.4.0</version>
   15.37 -		</dependency>
   15.38 -
   15.39 -		<dependency>
   15.40 -			<groupId>postgresql</groupId>
   15.41 -			<artifactId>postgresql</artifactId>
   15.42 -			<version>9.0-801.jdbc4</version>
   15.43 -		</dependency>
   15.44 -		<!-- JDBC Drivers -->
   15.45 -
   15.46 +		</dependency>	
   15.47  	</dependencies>
   15.48  
   15.49  </project>
   15.50 \ No newline at end of file