Merge branch 'release/0.2.0'

SANSA-Stack · Jun 13, 2017 · 671678d · 671678d
2 parents e703d3e + d72ed96
commit 671678d
Show file tree

Hide file tree

Showing 39 changed files with 45,770 additions and 4,679 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/pom.xml b/pom.xml
@@ -3,8 +3,8 @@
 	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-ml-parent</artifactId>
-	<version>0.1.0</version>
+	<artifactId>sansa-ml-parent_2.11</artifactId>
+	<version>0.2.0</version>
 	<packaging>pom</packaging>
 	<name>ML API - Parent</name>
 	<description>RDF/OWL Machine Learning Library for Big Data</description>
@@ -46,11 +46,6 @@
 	</issueManagement>
 
 	<modules>
-
-
-
-
-
 		<module>sansa-ml-common</module>
 		<module>sansa-ml-flink</module>
 		<module>sansa-ml-spark</module>
@@ -63,9 +58,10 @@
 		<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>
-		<jena.version>3.1.0</jena.version>
+		<spark.version>2.1.1</spark.version>
+		<flink.version>1.3.0</flink.version>
+		<jena.version>3.1.1</jena.version>
+		<sansa.version>0.2.0</sansa.version>
 	</properties>
 
 	<dependencyManagement>
@@ -77,6 +73,19 @@
 				<version>${scala.version}</version>
 			</dependency>
 
+			<!-- SANSA RDF -->
+			<dependency>
+				<groupId>net.sansa-stack</groupId>
+				<artifactId>sansa-rdf-spark-core_${scala.binary.version}</artifactId>
+				<version>${sansa.version}</version>
+			</dependency>
+			<!-- SANSA OWL -->
+			<dependency>
+				<groupId>net.sansa-stack</groupId>
+				<artifactId>sansa-owl-spark_${scala.binary.version}</artifactId>
+				<version>${sansa.version}</version>
+			</dependency>
+
 			<!-- Apache Spark Core -->
 			<dependency>
 				<groupId>org.apache.spark</groupId>
@@ -105,6 +114,11 @@
 				<artifactId>flink-clients_${scala.binary.version}</artifactId>
 				<version>${flink.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.flink</groupId>
+				<artifactId>flink-gelly-scala_${scala.binary.version}</artifactId>
+				<version>${flink.version}</version>
+			</dependency>
 
 			<!-- Apache JENA 3.x -->
 			<dependency>
@@ -135,8 +149,14 @@
 			<!-- Logging -->
 			<dependency>
 				<groupId>com.typesafe.scala-logging</groupId>
-				<artifactId>scala-logging-slf4j_${scala.binary.version}</artifactId>
-				<version>2.1.2</version>
+				<artifactId>scala-logging_${scala.binary.version}</artifactId>
+				<version>3.5.0</version>
+			</dependency>
+			<!-- Scopt -->
+			<dependency>
+				<groupId>com.github.scopt</groupId>
+				<artifactId>scopt_${scala.binary.version}</artifactId>
+				<version>3.5.0</version>
 			</dependency>
 
 			<!-- Guava -->
@@ -235,6 +255,17 @@
 				<enabled>true</enabled>
 			</snapshots>
 		</repository>
+		<repository>
+			<id>maven.aksw.internal</id>
+			<name>AKSW Release Repository</name>
+			<url>http://maven.aksw.org/archiva/repository/internal</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
 		<repository>
 			<id>maven.aksw.snapshots</id>
 			<name>AKSW Snapshot Repository</name>

diff --git a/sansa-ml-common/pom.xml b/sansa-ml-common/pom.xml
@@ -2,13 +2,13 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>sansa-ml-parent</artifactId>
+    <artifactId>sansa-ml-parent_2.11</artifactId>
     <groupId>net.sansa-stack</groupId>
-    <version>0.1.0</version>
+    <version>0.2.0</version>
   </parent>
   <groupId>net.sansa-stack</groupId>
-  <artifactId>sansa-ml-common</artifactId>
-  <version>0.1.0</version>
+  <artifactId>sansa-ml-common_2.11</artifactId>
+  <version>0.2.0</version>
   <name>ML API - Common</name>
   <description>Common objects for the SANSA Machine Learning Layer</description>
   <inceptionYear>2016</inceptionYear>