1.1 --- a/runtime/pom.xml	Wed Apr 29 13:17:27 2015 +0300
     1.2 +++ b/runtime/pom.xml	Wed Apr 29 13:18:24 2015 +0300
     1.3 @@ -15,44 +15,12 @@
     1.4  	<packaging>jar</packaging>
     1.5  
     1.6  	<dependencies>
     1.7 +
     1.8 +		<!-- Core dependencies -->
     1.9  		<dependency>
    1.10  			<groupId>org.openrdf.sesame</groupId>
    1.11 -			<artifactId>sesame-sail-memory</artifactId>
    1.12 +			<artifactId>sesame-repository-sail</artifactId>
    1.13  		</dependency>
    1.14 -	
    1.15 -		<dependency>
    1.16 -			<groupId>org.openrdf.sesame</groupId>
    1.17 -			<artifactId>sesame-queryresultio-spatial-api</artifactId>
    1.18 -		</dependency>
    1.19 -		<dependency>
    1.20 -			<groupId>org.openrdf.sesame</groupId>
    1.21 -			<artifactId>sesame-queryresultio-spatial-sparqlgeojson</artifactId>
    1.22 -		</dependency>
    1.23 -		<dependency>
    1.24 -			<groupId>org.openrdf.sesame</groupId>
    1.25 -			<artifactId>sesame-queryresultio-spatial-sparqlkml</artifactId>
    1.26 -		</dependency>
    1.27 -		<dependency>
    1.28 -			<groupId>org.openrdf.sesame</groupId>
    1.29 -			<artifactId>sesame-queryresultio-spatial-sparqlxml</artifactId>
    1.30 -		</dependency>
    1.31 -		<dependency>
    1.32 -			<groupId>org.openrdf.sesame</groupId>
    1.33 -			<artifactId>sesame-queryresultio-spatial-sparqlhtml</artifactId>
    1.34 -		</dependency>
    1.35 -		<dependency>
    1.36 -			<groupId>org.openrdf.sesame</groupId>
    1.37 -			<artifactId>sesame-queryresultio-spatial-text</artifactId>
    1.38 -		</dependency>
    1.39 -		<dependency>
    1.40 -			<groupId>org.openrdf.sesame</groupId>
    1.41 -			<artifactId>sesame-queryresultio-sparqljson</artifactId>
    1.42 -		</dependency>
    1.43 -		<dependency>
    1.44 -			<groupId>org.openrdf.sesame</groupId>
    1.45 -			<artifactId>sesame-queryresultio-binary</artifactId>
    1.46 -		</dependency>
    1.47 -
    1.48  
    1.49  		<dependency>
    1.50  			<groupId>org.openrdf.sesame</groupId>
    1.51 @@ -73,52 +41,8 @@
    1.52  			<groupId>org.openrdf.sesame</groupId>
    1.53  			<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
    1.54  		</dependency>
    1.55 -
    1.56 -		<dependency>
    1.57 -			<groupId>org.openrdf.sesame</groupId>
    1.58 -			<artifactId>sesame-queryalgebra-model</artifactId>
    1.59 -		</dependency>
    1.60 -
    1.61 -		<dependency>
    1.62 -			<groupId>org.openrdf.sesame</groupId>
    1.63 -			<artifactId>sesame-queryalgebra-evaluation</artifactId>
    1.64 -		</dependency>
    1.65 -
    1.66 -		<dependency>
    1.67 -			<groupId>org.openrdf.sesame</groupId>
    1.68 -			<artifactId>sesame-queryparser-api</artifactId>
    1.69 -		</dependency>
    1.70 -
    1.71 -		<dependency>
    1.72 -			<groupId>org.openrdf.sesame</groupId>
    1.73 -			<artifactId>sesame-queryparser-sparql</artifactId>
    1.74 -		</dependency>
    1.75 -
    1.76 -		<dependency>
    1.77 -			<groupId>org.openrdf.sesame</groupId>
    1.78 -			<artifactId>sesame-model</artifactId>
    1.79 -		</dependency>
    1.80 -
    1.81 -		<dependency>
    1.82 -			<groupId>org.openrdf.sesame</groupId>
    1.83 -			<artifactId>sesame-sail-api</artifactId>
    1.84 -		</dependency>
    1.85 -
    1.86 -		<dependency>
    1.87 -			<groupId>org.openrdf.sesame</groupId>
    1.88 -			<artifactId>sesame-query</artifactId>
    1.89 -		</dependency>
    1.90 -
    1.91 -		<dependency>
    1.92 -			<groupId>org.openrdf.sesame</groupId>
    1.93 -			<artifactId>sesame-sail-rdbms</artifactId>
    1.94 -		</dependency>
    1.95 -
    1.96 -		<dependency>
    1.97 -			<groupId>org.openrdf.sesame</groupId>
    1.98 -			<artifactId>sesame-repository-sail</artifactId>
    1.99 -		</dependency>
   1.100 -
   1.101 +		<!-- Core dependencies -->
   1.102 +		
   1.103  		<!-- rio API -->
   1.104  		<dependency>
   1.105  			<groupId>org.openrdf.sesame</groupId>
   1.106 @@ -156,193 +80,40 @@
   1.107  		</dependency>
   1.108  		<!-- rio API -->
   1.109  
   1.110 -		<!-- GeoTools -->
   1.111 +		<!-- Query results -->
   1.112  		<dependency>
   1.113 -			<groupId>org.geotools</groupId>
   1.114 -			<artifactId>gt-geojson</artifactId>
   1.115 -		</dependency>
   1.116 -
   1.117 -		<dependency>
   1.118 -			<groupId>org.geotools.xsd</groupId>
   1.119 -			<artifactId>gt-xsd-kml</artifactId>
   1.120 -		</dependency>
   1.121 -
   1.122 -		<dependency>
   1.123 -			<groupId>org.geotools</groupId>
   1.124 -			<artifactId>gt-xml</artifactId>
   1.125 -		</dependency>
   1.126 -
   1.127 -		<dependency>
   1.128 -			<groupId>org.geotools</groupId>
   1.129 -			<artifactId>gt-epsg-hsql</artifactId>
   1.130 -		</dependency>
   1.131 -
   1.132 -		<dependency>
   1.133 -			<groupId>org.geotools</groupId>
   1.134 -			<artifactId>gt-shapefile</artifactId>
   1.135 -		</dependency>
   1.136 -
   1.137 -		<dependency>
   1.138 -			<groupId>org.geotools</groupId>
   1.139 -			<artifactId>gt-opengis</artifactId>
   1.140 -		</dependency>
   1.141 -
   1.142 -		<!-- Aduna Appbase -->
   1.143 -		<dependency>
   1.144 -			<groupId>info.aduna.appbase</groupId>
   1.145 -			<artifactId>aduna-appbase</artifactId>
   1.146 -			<type>pom</type>
   1.147 -		</dependency>
   1.148 -
   1.149 -		<!-- Aduna Commons -->
   1.150 -		<!-- Note: other Aduna Commons dependencies are imported from appbase -->
   1.151 -		<dependency>
   1.152 -			<groupId>info.aduna.commons</groupId>
   1.153 -			<artifactId>aduna-commons-collections</artifactId>
   1.154 +			<groupId>org.openrdf.sesame</groupId>
   1.155 +			<artifactId>sesame-queryresultio-spatial-api</artifactId>
   1.156  		</dependency>
   1.157  		<dependency>
   1.158 -			<groupId>info.aduna.commons</groupId>
   1.159 -			<artifactId>aduna-commons-concurrent</artifactId>
   1.160 +			<groupId>org.openrdf.sesame</groupId>
   1.161 +			<artifactId>sesame-queryresultio-spatial-sparqlgeojson</artifactId>
   1.162  		</dependency>
   1.163  		<dependency>
   1.164 -			<groupId>info.aduna.commons</groupId>
   1.165 -			<artifactId>aduna-commons-i18n</artifactId>
   1.166 +			<groupId>org.openrdf.sesame</groupId>
   1.167 +			<artifactId>sesame-queryresultio-spatial-sparqlkml</artifactId>
   1.168  		</dependency>
   1.169  		<dependency>
   1.170 -			<groupId>info.aduna.commons</groupId>
   1.171 -			<artifactId>aduna-commons-iteration</artifactId>
   1.172 +			<groupId>org.openrdf.sesame</groupId>
   1.173 +			<artifactId>sesame-queryresultio-spatial-sparqlxml</artifactId>
   1.174  		</dependency>
   1.175  		<dependency>
   1.176 -			<groupId>info.aduna.commons</groupId>
   1.177 -			<artifactId>aduna-commons-net-http-server-embedded</artifactId>
   1.178 -			<exclusions>
   1.179 -				<exclusion>
   1.180 -					<artifactId>jsp-2.1</artifactId>
   1.181 -					<groupId>org.mortbay.jetty</groupId>
   1.182 -				</exclusion>
   1.183 -			</exclusions>
   1.184 -		</dependency>
   1.185 -
   1.186 -		<!-- Apache Commons -->
   1.187 -		<dependency>
   1.188 -			<groupId>commons-cli</groupId>
   1.189 -			<artifactId>commons-cli</artifactId>
   1.190 +			<groupId>org.openrdf.sesame</groupId>
   1.191 +			<artifactId>sesame-queryresultio-spatial-sparqlhtml</artifactId>
   1.192  		</dependency>
   1.193  		<dependency>
   1.194 -			<groupId>commons-dbcp</groupId>
   1.195 -			<artifactId>commons-dbcp</artifactId>
   1.196 +			<groupId>org.openrdf.sesame</groupId>
   1.197 +			<artifactId>sesame-queryresultio-spatial-text</artifactId>
   1.198  		</dependency>
   1.199  		<dependency>
   1.200 -			<groupId>commons-fileupload</groupId>
   1.201 -			<artifactId>commons-fileupload</artifactId>
   1.202 +			<groupId>org.openrdf.sesame</groupId>
   1.203 +			<artifactId>sesame-queryresultio-sparqljson</artifactId>
   1.204  		</dependency>
   1.205  		<dependency>
   1.206 -			<groupId>commons-io</groupId>
   1.207 -			<artifactId>commons-io</artifactId>
   1.208 -			<!-- this is the version that is specified as an optional dependency for 
   1.209 -				fileupload -->
   1.210 +			<groupId>org.openrdf.sesame</groupId>
   1.211 +			<artifactId>sesame-queryresultio-binary</artifactId>
   1.212  		</dependency>
   1.213 -		<dependency>
   1.214 -			<groupId>commons-httpclient</groupId>
   1.215 -			<artifactId>commons-httpclient</artifactId>
   1.216 -			<exclusions>
   1.217 -				<exclusion>
   1.218 -					<groupId>commons-logging</groupId>
   1.219 -					<artifactId>commons-logging</artifactId>
   1.220 -				</exclusion>
   1.221 -				<exclusion>
   1.222 -					<!-- httpclient includes older codec -->
   1.223 -					<groupId>commons-codec</groupId>
   1.224 -					<artifactId>commons-codec</artifactId>
   1.225 -				</exclusion>
   1.226 -			</exclusions>
   1.227 -		</dependency>
   1.228 -		<dependency>
   1.229 -			<groupId>commons-codec</groupId>
   1.230 -			<artifactId>commons-codec</artifactId>
   1.231 -			<scope>runtime</scope>
   1.232 -		</dependency>
   1.233 -
   1.234 -		<!-- Spring framework -->
   1.235 -		<dependency>
   1.236 -			<groupId>org.springframework</groupId>
   1.237 -			<artifactId>spring-aop</artifactId>
   1.238 -			<exclusions>
   1.239 -				<exclusion>
   1.240 -					<groupId>commons-logging</groupId>
   1.241 -					<artifactId>commons-logging</artifactId>
   1.242 -				</exclusion>
   1.243 -			</exclusions>
   1.244 -		</dependency>
   1.245 -
   1.246 -		<!-- Compliance tests -->
   1.247 -		<dependency>
   1.248 -			<groupId>edu.lehigh.swat.bench</groupId>
   1.249 -			<artifactId>uba</artifactId>
   1.250 -		</dependency>
   1.251 -		<dependency>
   1.252 -			<groupId>edu.lehigh.swat.bench</groupId>
   1.253 -			<artifactId>ubt</artifactId>
   1.254 -		</dependency>
   1.255 -
   1.256 -		<!-- JDBC Drivers -->
   1.257 -
   1.258 -		<dependency>
   1.259 -			<groupId>postgresql</groupId>
   1.260 -			<artifactId>postgresql</artifactId>
   1.261 -		</dependency>
   1.262 -<!-- 
   1.263 -		<dependency>
   1.264 -			<groupId>mysql</groupId>
   1.265 -			<artifactId>mysql-connector-java</artifactId>
   1.266 -		</dependency>
   1.267 - -->
   1.268 -		<!-- various -->
   1.269 -		<dependency>
   1.270 -			<groupId>cglib</groupId>
   1.271 -			<artifactId>cglib</artifactId>
   1.272 -		</dependency>
   1.273 -
   1.274 -		<!-- Testing: JUnit -->
   1.275 -		<dependency>
   1.276 -			<groupId>junit</groupId>
   1.277 -			<artifactId>junit</artifactId>
   1.278 -			<scope>test</scope>
   1.279 -		</dependency>
   1.280 -
   1.281 -		<dependency>
   1.282 -			<groupId>monetdb</groupId>
   1.283 -			<artifactId>jdbcclient</artifactId>
   1.284 -		</dependency>
   1.285 -
   1.286 -		<!-- Geotools -->
   1.287 -		<!-- One epsg jar file suffices. Read this: http://docs.geotools.org/latest/userguide/faq.html#q-how-to-choose-an-epsg-authority
   1.288 -		<dependency>
   1.289 -			<groupId>org.geotools</groupId>
   1.290 -			<artifactId>gt-epsg-wkt</artifactId>
   1.291 -		</dependency>
   1.292 -		-->
   1.293 -		
   1.294 -		<dependency>
   1.295 -			<groupId>org.geotools</groupId>
   1.296 -			<artifactId>gt-geometry</artifactId>
   1.297 -		</dependency>
   1.298 -		
   1.299 -		<dependency>
   1.300 -			<groupId>org.geotools</groupId>
   1.301 -			<artifactId>gt-data</artifactId>
   1.302 -		</dependency>
   1.303 -				
   1.304 -		<dependency>
   1.305 -			<groupId>org.geotools</groupId>
   1.306 -			<artifactId>gt-swing</artifactId>
   1.307 -		</dependency>
   1.308 -		
   1.309 -		<dependency>
   1.310 -			<groupId>org.opengis</groupId>
   1.311 -			<artifactId>geoapi-pending</artifactId>
   1.312 -		</dependency>
   1.313 -		
   1.314 +		<!-- Query results -->
   1.315  	</dependencies>
   1.316  
   1.317  	<build>