Merge branch 'QuestionAnswering' of https://github.com/AKSW/gerbil.git into QuestionAnswering

Author: TortugaAttack

pom.xml

@@ -20,20 +20,20 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.aksw</groupId>
-	<artifactId>gerbil</artifactId>
-	<version>1.2.3-QA-RC1</version>
-	<name>General Entity Annotator Benchmark</name>
+	<artifactId>gerbil-qa</artifactId>
+	<version>0.1.0</version>
+	<name>General Entity Annotator Benchmark - Question Answering Extension</name>
 	<description>This project is a benchmark for entity annotation and disambiguation tools extended towards question answering.</description>
 	<inceptionYear>2014</inceptionYear>
 
 	<properties>
-		<java.version>1.7</java.version>
+		<java.version>1.7</java.version>
 		<slf4j.version>1.7.6</slf4j.version>
 		<junit.version>4.11</junit.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.version>3.2.17.RELEASE</spring.version>
 		<jena.version>2.13.0</jena.version>
-		<jsonld-java-jena.version>0.4.1</jsonld-java-jena.version>
+		<jsonld-java-jena.version>0.4.1</jsonld-java-jena.version>
 	</properties>
 
 	<repositories>
@@ -63,7 +63,7 @@
 		<!-- NIF transfer lib -->
 		<dependency>
 			<groupId>org.aksw</groupId>
-			<artifactId>gerbil.nif.transfer</artifactId>
+			<artifactId>gerbil.nif.transfer</artifactId>
 			<version>1.2.1</version>
 		</dependency>
 		<!-- Jena for using JSON-LD -->
@@ -100,7 +100,7 @@
 					<groupId>ch.qos.logback</groupId>
 					<artifactId>logback-classic</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions>
 		</dependency>
 
 		<!-- NERD -->
@@ -116,7 +116,7 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
-		<!-- slf4j: Logging Binding - is already contained in aida -->
+		<!-- slf4j: Logging Binding - is already contained in aida -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
@@ -211,8 +211,8 @@
 			<groupId>edu.stanford</groupId>
 			<artifactId>stanpost341</artifactId>
 			<version>3.4.1</version>
-		</dependency>
-
+		</dependency>
+
 		<!-- File Upload -->
 		<dependency>
 			<groupId>commons-fileupload</groupId>
@@ -288,7 +288,7 @@
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 			<version>2.3.2</version>
-		</dependency>
+		</dependency>
 		<!-- H2 in-memory SQL DB -->
 		<dependency>
 			<groupId>com.h2database</groupId>
@@ -304,7 +304,7 @@
 		</dependency>
 
 		<!-- FOX -->
-		<dependency>
+		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>fluent-hc</artifactId>
 			<version>4.4</version>
@@ -317,7 +317,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.4</version>
+			<version>4.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
@@ -355,10 +355,10 @@
 				<artifactId>license-maven-plugin</artifactId>
 				<version>2.6</version>
 				<configuration>
-					<header>com/mycila/maven/plugin/license/templates/LGPL-3.txt</header>
-					<properties>
-						<owner>Agile Knowledge Engineering and Semantic Web (AKSW)
-							([email protected])</owner>
+					<header>com/mycila/maven/plugin/license/templates/LGPL-3.txt</header>
+					<properties>
+						<owner>Agile Knowledge Engineering and Semantic Web (AKSW)
+							([email protected])</owner>
 					</properties>
 					<excludes>
 						<exclude>**/README</exclude>
@@ -375,7 +375,7 @@
 						<exclude>src/test/resources/**</exclude>
 					</excludes>
 				</configuration>
-			</plugin>
+			</plugin>
 			<!-- Maven Exec Plugin -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -418,7 +418,7 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin>
 		</plugins>
 
 		<resources>