Merge branch 'release/0.7.1'

pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>net.sansa-stack</groupId>
 		<artifactId>sansa-parent</artifactId>
-		<version>0.6.0</version>
+		<version>0.7.1</version>
 	</parent>
 
 	<artifactId>sansa-inference-parent_2.11</artifactId>

sansa-inference-common/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>sansa-inference-parent_2.11</artifactId>
     <groupId>net.sansa-stack</groupId>
-    <version>0.6.0</version>
+    <version>0.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>sansa-inference-common_${scala.binary.version}</artifactId>
@@ -79,11 +79,6 @@
       <groupId>org.apache.calcite</groupId>
       <artifactId>calcite-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>3.5.0</version>
-    </dependency>
 
     <!-- Scopt CLI API-->
     <dependency>

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.6.0</version>
+		<version>0.7.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>sansa-inference-flink_${scala.binary.version}</artifactId>

sansa-inference-flink/src/main/scala/net/sansa_stack/inference/flink/forwardchaining/ForwardRuleReasonerRDFS.scala

@@ -318,7 +318,7 @@ class ForwardRuleReasonerRDFS(env: ExecutionEnvironment) extends ForwardRuleReas
 
       val additionalTripleRDDs = mutable.Seq(rdfs4, rdfs6, rdfs8_10, rdfs12)
 
-      allTriples = env.union(Seq(allTriples) ++ additionalTripleRDDs).distinct()
+      allTriples = env.union(Seq(allTriples) ++ additionalTripleRDDs).distinct(_.hashCode)
     }
 
     logger.info(

sansa-inference-flink/src/main/scala/net/sansa_stack/inference/flink/forwardchaining/TransitiveReasoner.scala

@@ -7,10 +7,9 @@ import org.apache.flink.api.common.typeinfo.TypeInformation
 import org.apache.flink.api.scala.{DataSet, _}
 import org.apache.flink.util.Collector
 import org.apache.jena.graph.{Node, Triple}
-import org.apache.jena.sparql.util.NodeComparator
 
-import net.sansa_stack.inference.flink.utils.NodeKey
 import net.sansa_stack.inference.utils.Profiler
+import net.sansa_stack.rdf.flink.utils.NodeKey
 
 /**
   * An engine to compute the transitive closure (TC) for a set of triples given in several datastructures.

sansa-inference-spark/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.sansa-stack</groupId>
         <artifactId>sansa-inference-parent_2.11</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sansa-inference-spark_${scala.binary.version}</artifactId>
@@ -136,6 +136,7 @@
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
+            <version>${hadoop.version}</version>
         </dependency>
 
         <!-- Graph API -->
@@ -170,8 +171,6 @@
         <dependency>
             <groupId>com.holdenkarau</groupId>
             <artifactId>spark-testing-base_${scala.binary.version}</artifactId>
-            <!--version>${spark.version}_0.7.1</version-->
-            <version>2.3.0_0.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -323,7 +322,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <!--<version>3.0.1</version>-->
                 <executions>
                     <execution>
                         <id>resource-dependencies</id>

sansa-inference-spark/src/main/scala/net/sansa_stack/inference/spark/data/loader/RDFGraphLoader.scala

@@ -4,10 +4,9 @@ import java.net.URI
 
 import net.sansa_stack.inference.data.{SQLSchema, SQLSchemaDefault}
 import net.sansa_stack.inference.spark.data.model.{RDFGraph, RDFGraphDataFrame, RDFGraphDataset, RDFGraphNative}
-import net.sansa_stack.inference.utils.NTriplesStringToJenaTriple
 import org.apache.jena.graph.Triple
 import org.apache.jena.riot.Lang
-import org.apache.spark.sql.{Dataset, Encoder, SaveMode, SparkSession}
+import org.apache.spark.sql.{Dataset, Encoder, SparkSession}
 import org.apache.spark.{SparkConf, SparkContext}
 import org.slf4j.LoggerFactory
 import scala.language.implicitConversions
@@ -222,7 +221,7 @@ object RDFGraphLoader {
     println(triples.count())
     triples
       .filter("p == 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type'")
-      .write.mode(SaveMode.Append).rdf("/tmp/lubm/out")
+      .write.mode(org.apache.spark.sql.SaveMode.Append).rdf("/tmp/lubm/out")
 
 
 

sansa-inference-tests/pom.xml

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