Merge branch 'release/0.2.0'

Conflicts:
	sansa-owl-flink/pom.xml
	sansa-owl-spark/pom.xml

Author: GezimSejdiu

LICENSE

@@ -1,8 +1,8 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sansa-stack</groupId>
-    <artifactId>sansa-owl-parent</artifactId>
-    <version>0.1.0</version>
+    <artifactId>sansa-owl-parent_2.11</artifactId>
+    <version>0.2.0</version>
     <packaging>pom</packaging>
     <name>OWL - Parent</name>
 
@@ -65,11 +65,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <scala.version>2.11.8</scala.version>
         <scala.binary.version>2.11</scala.binary.version>
-        <spark.version>2.0.0</spark.version>
-        <flink.version>1.1.3</flink.version>
+        <spark.version>2.1.1</spark.version>
+        <flink.version>1.3.0</flink.version>
         <hadoop.common.version>2.7.0</hadoop.common.version>
         <hadoop.mapreduce-client.version>2.3.0</hadoop.mapreduce-client.version>
-        <owlapi.version>5.0.3</owlapi.version>
+        <owlapi.version>5.1.0</owlapi.version>
     </properties>
 
 
@@ -85,7 +85,7 @@
             <!-- Apache Spark dependencies -->
             <dependency>
                 <groupId>org.apache.spark</groupId>
-                <artifactId>spark-core_${scala.binary.version}</artifactId>
+                <artifactId>spark-core_2.11</artifactId>
                 <version>${spark.version}</version>
             </dependency>
             <dependency>
@@ -105,6 +105,22 @@
                 <artifactId>flink-clients_${scala.binary.version}</artifactId>
                 <version>${flink.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-scala_2.11</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-clients_2.11</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
+            <!-- was required to be able to switch to Flink 1.3 -->
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId>
+                <version>${flink.version}</version>
+            </dependency>
 
             <!-- 
             Hadoop dependencies (used for custom InputFormat definition in
@@ -151,6 +167,13 @@
                 <version>1.6.1</version>
             </dependency>
 
+            <!-- parsing dependencies -->
+            <dependency>
+                <groupId>org.scala-lang.modules</groupId>
+                <artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
+                <version>1.0.6</version>
+            </dependency>
+
             <!-- Testing dependencies -->
             <dependency>
                 <groupId>junit</groupId>
@@ -167,7 +190,8 @@
             <dependency>
                 <groupId>com.holdenkarau</groupId>
                 <artifactId>spark-testing-base_${scala.binary.version}</artifactId>
-                <version>${spark.version}_0.4.7</version>
+                <!--version>${spark.version}_0.4.7</version-->
+                <version>2.1.0_0.6.0</version>
                 <scope>test</scope>
             </dependency>
 
@@ -177,7 +201,12 @@
                 <artifactId>scala-logging_2.11</artifactId>
                 <version>3.5.0</version>
             </dependency>
-
+            <!-- needed due to the flink-hadoop-compatibility dependency -->
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.17</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

pom.xml

@@ -6,12 +6,12 @@
 
     <parent>
         <groupId>net.sansa-stack</groupId>
-        <artifactId>sansa-owl-parent</artifactId>
-        <version>0.1.0</version>
+        <artifactId>sansa-owl-parent_2.11</artifactId>
+        <version>0.2.0</version>
     </parent>
 
-    <artifactId>sansa-owl-common</artifactId>
-    <version>0.1.0</version>
+    <artifactId>sansa-owl-common_2.11</artifactId>
+    <version>0.2.0</version>
 
     <dependencies>
         <!-- Scala dependencies -->
@@ -30,6 +30,12 @@
             <artifactId>owlapi-apibinding</artifactId>
         </dependency>
 
+        <!-- parsing dependencies -->
+        <dependency>
+            <groupId>org.scala-lang.modules</groupId>
+            <artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
+        </dependency>
+
         <!-- Testing dependencies -->
         <dependency>
             <groupId>org.scalatest</groupId>