Merge branch 'develop' into Hebaallahibrahim-patch-1

# Conflicts:
#	sansa-inference-spark/pom.xml

Author: LorenzBuehmann

pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>net.sansa-stack</groupId>
 		<artifactId>sansa-parent</artifactId>
-		<version>0.5.1-SNAPSHOT</version>
+		<version>0.6.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>sansa-inference-parent_2.11</artifactId>
@@ -72,7 +72,7 @@
 			<dependency>
 				<groupId>${project.groupId}</groupId>
 				<artifactId>sansa-rdf-spark_${scala.binary.version}</artifactId>
-				<version>${sansa.rdf.version}</version>
+				<version>${project.version}</version>
 				<!-- we have to exclude an old version here transitively included by 
 					a Kafka dependency of Spark Don't know how Spark 2.3 is able to work with 
 					Kafka 0.10 right now ... -->
@@ -85,15 +85,15 @@
 			</dependency>
 			<!-- SANSA OWL -->
 			<dependency>
-				<groupId>net.sansa-stack</groupId>
+				<groupId>${project.groupId}</groupId>
 				<artifactId>sansa-owl-spark_${scala.binary.version}</artifactId>
-				<version>${sansa.owl.version}</version>
+				<version>${project.version}</version>
 			</dependency>
 			<!-- Query Layer -->
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>sansa-query-spark-sparqlify</artifactId>
-				<version>${sansa.query.version}</version>
+				<artifactId>sansa-query-spark_${scala.binary.version}</artifactId>
+				<version>${project.version}</version>
 			</dependency>
 
 		</dependencies>

sansa-inference-common/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>sansa-inference-parent_2.11</artifactId>
     <groupId>net.sansa-stack</groupId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>sansa-inference-common_${scala.binary.version}</artifactId>

sansa-inference-flink/pom.xml

@@ -23,7 +23,7 @@ under the License.
 	<parent>
 		<groupId>net.sansa-stack</groupId>
 		<artifactId>sansa-inference-parent_2.11</artifactId>
-		<version>0.5.1-SNAPSHOT</version>
+		<version>0.6.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>sansa-inference-flink_${scala.binary.version}</artifactId>
@@ -35,12 +35,12 @@ under the License.
 		<dependency>
 			<groupId>net.sansa-stack</groupId>
 			<artifactId>sansa-inference-common_${scala.binary.version}</artifactId>
-			<version>${parent.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sansa-stack</groupId>
 			<artifactId>sansa-inference-tests_${scala.binary.version}</artifactId>
-			<version>${parent.version}</version>
+			<version>${project.version}</version>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>

sansa-inference-spark/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.sansa-stack</groupId>
         <artifactId>sansa-inference-parent_2.11</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sansa-inference-spark_${scala.binary.version}</artifactId>
@@ -14,21 +14,18 @@
 
     <properties>
         <spark.deps.scope>compile</spark.deps.scope>
-      
-        <sansa.version>0.3.1-SNAPSHOT</sansa.version>
-        <sansa.inference.version>0.5.1-SNAPSHOT</sansa.inference.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>net.sansa-stack</groupId>
             <artifactId>sansa-inference-common_${scala.binary.version}</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>net.sansa-stack</groupId>
             <artifactId>sansa-inference-tests_${scala.binary.version}</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -114,7 +111,6 @@
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-tdb</artifactId>
-            <version>${jena.version}</version>
             <scope>provided</scope>
         </dependency>
 

sansa-inference-tests/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>sansa-inference-parent_2.11</artifactId>
     <groupId>net.sansa-stack</groupId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>sansa-inference-tests_${scala.binary.version}</artifactId>
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>net.sansa-stack</groupId>
       <artifactId>sansa-inference-common_${scala.binary.version}</artifactId>
-      <version>${parent.version}</version>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>