Merge branch 'release/0.4.0'

# Conflicts: # pom.xml
SANSA-Stack · Jun 26, 2018 · b27042d · b27042d
2 parents 4797324 + e03c9a7
commit b27042d
Show file tree

Hide file tree

Showing 71 changed files with 836 additions and 1,247 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,5 @@ project/plugins/project/
 .worksheet
 *.iml
 .idea
+
+scalastyle-output.xml
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,10 @@
+language: scala
+sudo: false
+cache:
+  directories:
+    - $HOME/.m2
+scala:
+  - 2.11.11
+script:
+  - mvn scalastyle:check
+  - mvn test
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # SANSA Inference Layer
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.sansa-stack/sansa-inference-parent_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/net.sansa-stack/sansa-inference-parent_2.11)
-[![Build Status](https://ci.aksw.org/jenkins/job/SANSA%20Inference%20Layer/job/develop/badge/icon)](https://ci.aksw.org/jenkins/job/SANSA%20Inference%20Layer/job/develop/)
+[![Build Status](https://travis-ci.com/SANSA-Stack/SANSA-Inference.svg?branch=develop)](https://travis-ci.com/SANSA-Stack/SANSA-Inference)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Twitter](https://img.shields.io/twitter/follow/SANSA_Stack.svg?style=social)](https://twitter.com/SANSA_Stack)
 
@@ -17,14 +17,15 @@
 	- [Setup](#setup)
 		- [Prerequisites](#prerequisites)
 		- [From source](#from-source)
-		- [Using Maven pre-build artifacts](#)
+		- [Using Maven pre-build artifacts](#using-maven-pre-build-artifacts)
 		- [Using SBT](#using-SBT)
 	- [Usage](#usage)
 		- [Example](#example)
-	- [Supported Reasoning Profiles](#)
+	- [Supported Reasoning Profiles](#supported-reasoning-profiles)
 		- [RDFS](#rdfs)
 		- [RDFS Simple](#rdfs-simple)
 		- [OWL Horst](#owl-horst)
+  	- [How to Contribute](#how-to-contribute)
 
 
 ## Structure
@@ -216,3 +217,7 @@ OWL Horst is a fragment of OWL and was proposed by Herman ter Horst [1] defining
 
 [1] Herman J. ter Horst:
 *Completeness, decidability and complexity of entailment for RDF Schema and a semantic extension involving the OWL vocabulary.* J. Web Sem. 3(2-3): 79-115 (2005)
+
+## How to Contribute
+We always welcome new contributors to the project! Please see [our contribution guide](http://sansa-stack.net/contributing-to-sansa/) for more details on how to get started contributing to SANSA.
+
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.sansa-stack</groupId>
   <artifactId>sansa-inference-parent_2.11</artifactId>
-  <version>0.3.0</version>
+  <version>0.4.0</version>
   <packaging>pom</packaging>
   <name>Inference API - Parent</name>
 
@@ -66,12 +66,12 @@
     <!--<java.version>>=1.8</java.version>-->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <scala.version>2.11.11</scala.version>
+    <scala.version>2.11.12</scala.version>
     <scala.binary.version>2.11</scala.binary.version>
-    <spark.version>2.2.1</spark.version>
-    <flink.version>1.3.2</flink.version>
-    <jena.version>3.5.0</jena.version>
-    <sansa.stack.version>0.3.0</sansa.stack.version>
+    <spark.version>2.3.1</spark.version>
+    <flink.version>1.5.0</flink.version>
+    <jena.version>3.7.0</jena.version>
+    <sansa.stack.version>0.4.0</sansa.stack.version>
     <sansa.rdf.version>${sansa.stack.version}</sansa.rdf.version>
     <sansa.query.version>${sansa.stack.version}</sansa.query.version>
     <sansa.owl.version>${sansa.stack.version}</sansa.owl.version>
@@ -81,7 +81,8 @@
     <MaxPermGen>512m</MaxPermGen>
     <CodeCacheSize>512m</CodeCacheSize>
     <gpg.keyname>AKSW</gpg.keyname>
-    <owlapi.version>5.1.3</owlapi.version>
+    <owlapi.version>5.1.5</owlapi.version>
+    <scalastyle.config.path>${project.basedir}/scalastyle-config.xml</scalastyle.config.path>
   </properties>
 
   <prerequisites>
@@ -93,8 +94,17 @@
       <!-- RDF Layer -->
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>sansa-rdf-spark-core</artifactId>
+        <artifactId>sansa-rdf-spark_${scala.binary.version}</artifactId>
         <version>${sansa.rdf.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 ...
+        -->
+        <exclusions>
+          <exclusion>
+            <groupId>net.jpountz.lz4</groupId>
+            <artifactId>lz4</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
@@ -148,6 +158,16 @@
         <artifactId>spark-sql_${scala.binary.version}</artifactId>
         <version>${spark.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.spark</groupId>
+        <artifactId>spark-streaming_${scala.binary.version}</artifactId>
+        <version>${spark.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.spark</groupId>
+        <artifactId>spark-streaming-kafka-0-10_${scala.binary.version}</artifactId>
+        <version>${spark.version}</version>
+      </dependency>
 
       <!-- Apache Flink -->
       <dependency>
@@ -177,6 +197,16 @@
         <artifactId>jena-arq</artifactId>
         <version>${jena.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-tdb</artifactId>
+        <version>${jena.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-cmds</artifactId>
+        <version>${jena.version}</version>
+      </dependency>
 
       <!-- OWL API -->
       <dependency>
@@ -202,24 +232,29 @@
 
       <!-- Graph API -->
       <dependency>
-        <groupId>com.assembla.scala-incubator</groupId>
+        <groupId>org.scala-graph</groupId>
         <artifactId>graph-core_${scala.binary.version}</artifactId>
-        <version>1.10.0</version>
+        <version>1.12.5</version>
       </dependency>
       <dependency>
-        <groupId>com.assembla.scala-incubator</groupId>
+        <groupId>org.scala-graph</groupId>
         <artifactId>graph-dot_${scala.binary.version}</artifactId>
-        <version>1.9.0</version>
+        <version>1.11.5</version>
       </dependency>
       <dependency>
         <groupId>org.jgrapht</groupId>
         <artifactId>jgrapht-core</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jgrapht</groupId>
+        <artifactId>jgrapht-io</artifactId>
+        <version>1.2.0</version>
       </dependency>
       <dependency>
         <groupId>org.jgrapht</groupId>
         <artifactId>jgrapht-ext</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
       </dependency>
       <dependency>
         <groupId>org.gephi</groupId>
@@ -231,7 +266,7 @@
         <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-core</artifactId>
-            <version>1.13.0</version>
+            <version>1.16.0</version>
         </dependency>
 
       <!-- Test -->
@@ -250,21 +285,21 @@
       <dependency>
         <groupId>org.specs2</groupId>
         <artifactId>specs2-core_${scala.binary.version}</artifactId>
-        <version>4.0.2</version>
+        <version>4.2.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.specs2</groupId>
         <artifactId>specs2-junit_${scala.binary.version}</artifactId>
-        <version>4.0.2</version>
+        <version>4.2.0</version>
         <scope>test</scope>
       </dependency>
 
       <!-- Logging -->
       <dependency>
         <groupId>com.typesafe.scala-logging</groupId>
         <artifactId>scala-logging_${scala.binary.version}</artifactId>
-        <version>3.7.2</version>
+        <version>3.9.0</version>
       </dependency>
 
       <!-- Guava -->
@@ -278,7 +313,7 @@
       <dependency>
         <groupId>com.chuusai</groupId>
         <artifactId>shapeless_${scala.binary.version}</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
       </dependency>
 
       <!-- Scopt -->
@@ -292,7 +327,7 @@
       <dependency>
         <groupId>com.typesafe</groupId>
         <artifactId>config</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
       </dependency>
 
 
@@ -520,30 +555,33 @@
         <groupId>com.versioneye</groupId>
         <artifactId>versioneye-maven-plugin</artifactId>
       </plugin>
-      <!--<plugin>-->
-        <!--<groupId>org.scalastyle</groupId>-->
-        <!--<artifactId>scalastyle-maven-plugin</artifactId>-->
-        <!--<version>0.8.0</version>-->
-        <!--<configuration>-->
-          <!--<verbose>false</verbose>-->
-          <!--<failOnViolation>false</failOnViolation>-->
-          <!--<includeTestSourceDirectory>false</includeTestSourceDirectory>-->
-          <!--<failOnWarning>false</failOnWarning>-->
-          <!--<sourceDirectory>${basedir}/src/main/scala</sourceDirectory>-->
-          <!--<testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>-->
-          <!--<configLocation>scalastyle-config.xml</configLocation>-->
-          <!--<outputFile>${basedir}/target/scalastyle-output.xml</outputFile>-->
-          <!--<inputEncoding>${project.build.sourceEncoding}</inputEncoding>-->
-          <!--<outputEncoding>${project.reporting.outputEncoding}</outputEncoding>-->
-        <!--</configuration>-->
-        <!--<executions>-->
-          <!--<execution>-->
-            <!--<goals>-->
-              <!--<goal>check</goal>-->
-            <!--</goals>-->
-          <!--</execution>-->
-        <!--</executions>-->
-      <!--</plugin>-->
+
+      <!-- Scalastyle -->
+      <plugin>
+        <groupId>org.scalastyle</groupId>
+        <artifactId>scalastyle-maven-plugin</artifactId>
+        <version>1.0.0</version>
+        <configuration>
+          <verbose>false</verbose>
+          <failOnViolation>true</failOnViolation>
+          <includeTestSourceDirectory>true</includeTestSourceDirectory>
+          <failOnWarning>false</failOnWarning>
+          <sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>
+          <testSourceDirectory>${project.basedir}/src/test/scala</testSourceDirectory>
+          <!-- we use a central config located in the root directory -->
+          <configLocation>${scalastyle.config.path}</configLocation>
+          <outputFile>${project.basedir}/scalastyle-output.xml</outputFile>
+          <outputEncoding>UTF-8</outputEncoding>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 
@@ -668,7 +706,8 @@
 
     <!-- the profile used for deployment to Sonatype Maven repository -->
     <profile>
-      <id>ossrh</id>
+      <!-- for Maven Central deployment -->
+      <id>release</id>
       <distributionManagement>
         <repository>
           <id>ossrh</id>
@@ -786,5 +825,18 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- for Scalastyle plugin -->
+    <profile>
+      <id>root-dir</id>
+      <activation>
+        <file>
+          <exists>${project.basedir}/../../scalastyle-config.xml</exists>
+        </file>
+      </activation>
+      <properties>
+        <scalastyle.config.path>${project.basedir}/../scalastyle-config.xml</scalastyle.config.path>
+      </properties>
+    </profile>
   </profiles>
 </project>
diff --git a/sansa-inference-common/pom.xml b/sansa-inference-common/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>sansa-inference-parent_2.11</artifactId>
     <groupId>net.sansa-stack</groupId>
-    <version>0.3.0</version>
+    <version>0.4.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>net.sansa-stack</groupId>
   <artifactId>sansa-inference-common_${scala.binary.version}</artifactId>
-  <version>0.3.0</version>
+  <version>0.4.0</version>
   <name>Inference API - Common</name>
   <description>A set of common objects used in the Inference API</description>
 
@@ -31,21 +31,19 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb</artifactId>
-      <version>3.5.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-cmds</artifactId>
-      <version>3.5.0</version>
     </dependency>
 
     <!-- Graph API -->
     <dependency>
-      <groupId>com.assembla.scala-incubator</groupId>
+      <groupId>org.scala-graph</groupId>
       <artifactId>graph-core_${scala.binary.version}</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.assembla.scala-incubator</groupId>
+      <groupId>org.scala-graph</groupId>
       <artifactId>graph-dot_${scala.binary.version}</artifactId>
     </dependency>
     <dependency>
@@ -56,6 +54,10 @@
       <groupId>org.jgrapht</groupId>
       <artifactId>jgrapht-ext</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jgrapht</groupId>
+      <artifactId>jgrapht-io</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.gephi</groupId>
       <artifactId>gephi-toolkit</artifactId>
@@ -65,6 +67,7 @@
           <artifactId>google-collections</artifactId>
         </exclusion>
       </exclusions>
+      <scope>compile</scope>
     </dependency>
 
     <!-- Guava -->
@@ -84,6 +87,11 @@
       <version>3.5.0</version>
     </dependency>
 
+    <!-- Scopt CLI API-->
+    <dependency>
+      <groupId>com.github.scopt</groupId>
+      <artifactId>scopt_${scala.binary.version}</artifactId>
+    </dependency>
 
     <!-- Test -->
     <dependency>