Skip to content
This repository was archived by the owner on Oct 8, 2020. It is now read-only.

Commit b27042d

Browse files
LorenzBuehmannLorenzBuehmann
committed
Merge branch 'release/0.4.0'
# Conflicts: # pom.xml
2 parents 4797324 + e03c9a7 commit b27042d

File tree

71 files changed

+836
-1247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+836
-1247
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ project/plugins/project/
1717
.worksheet
1818
*.iml
1919
.idea
20+
21+
scalastyle-output.xml

‎.travis.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
language: scala
2+
sudo: false
3+
cache:
4+
directories:
5+
- $HOME/.m2
6+
scala:
7+
- 2.11.11
8+
script:
9+
- mvn scalastyle:check
10+
- mvn test

‎README.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# SANSA Inference Layer
44
[![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)
5-
[![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/)
5+
[![Build Status](https://travis-ci.com/SANSA-Stack/SANSA-Inference.svg?branch=develop)](https://travis-ci.com/SANSA-Stack/SANSA-Inference)
66
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
77
[![Twitter](https://img.shields.io/twitter/follow/SANSA_Stack.svg?style=social)](https://twitter.com/SANSA_Stack)
88

@@ -17,14 +17,15 @@
1717
- [Setup](#setup)
1818
- [Prerequisites](#prerequisites)
1919
- [From source](#from-source)
20-
- [Using Maven pre-build artifacts](#)
20+
- [Using Maven pre-build artifacts](#using-maven-pre-build-artifacts)
2121
- [Using SBT](#using-SBT)
2222
- [Usage](#usage)
2323
- [Example](#example)
24-
- [Supported Reasoning Profiles](#)
24+
- [Supported Reasoning Profiles](#supported-reasoning-profiles)
2525
- [RDFS](#rdfs)
2626
- [RDFS Simple](#rdfs-simple)
2727
- [OWL Horst](#owl-horst)
28+
- [How to Contribute](#how-to-contribute)
2829

2930

3031
## Structure
@@ -216,3 +217,7 @@ OWL Horst is a fragment of OWL and was proposed by Herman ter Horst [1] defining
216217

217218
[1] Herman J. ter Horst:
218219
*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)
220+
221+
## How to Contribute
222+
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.
223+

‎pom.xml‎

Lines changed: 97 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>net.sansa-stack</groupId>
55
<artifactId>sansa-inference-parent_2.11</artifactId>
6-
<version>0.3.0</version>
6+
<version>0.4.0</version>
77
<packaging>pom</packaging>
88
<name>Inference API - Parent</name>
99

@@ -66,12 +66,12 @@
6666
<!--<java.version>>=1.8</java.version>-->
6767
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6868
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
69-
<scala.version>2.11.11</scala.version>
69+
<scala.version>2.11.12</scala.version>
7070
<scala.binary.version>2.11</scala.binary.version>
71-
<spark.version>2.2.1</spark.version>
72-
<flink.version>1.3.2</flink.version>
73-
<jena.version>3.5.0</jena.version>
74-
<sansa.stack.version>0.3.0</sansa.stack.version>
71+
<spark.version>2.3.1</spark.version>
72+
<flink.version>1.5.0</flink.version>
73+
<jena.version>3.7.0</jena.version>
74+
<sansa.stack.version>0.4.0</sansa.stack.version>
7575
<sansa.rdf.version>${sansa.stack.version}</sansa.rdf.version>
7676
<sansa.query.version>${sansa.stack.version}</sansa.query.version>
7777
<sansa.owl.version>${sansa.stack.version}</sansa.owl.version>
@@ -81,7 +81,8 @@
8181
<MaxPermGen>512m</MaxPermGen>
8282
<CodeCacheSize>512m</CodeCacheSize>
8383
<gpg.keyname>AKSW</gpg.keyname>
84-
<owlapi.version>5.1.3</owlapi.version>
84+
<owlapi.version>5.1.5</owlapi.version>
85+
<scalastyle.config.path>${project.basedir}/scalastyle-config.xml</scalastyle.config.path>
8586
</properties>
8687

8788
<prerequisites>
@@ -93,8 +94,17 @@
9394
<!-- RDF Layer -->
9495
<dependency>
9596
<groupId>${project.groupId}</groupId>
96-
<artifactId>sansa-rdf-spark-core</artifactId>
97+
<artifactId>sansa-rdf-spark_${scala.binary.version}</artifactId>
9798
<version>${sansa.rdf.version}</version>
99+
<!-- we have to exclude an old version here transitively included by a Kafka dependency of Spark
100+
Don't know how Spark 2.3 is able to work with Kafka 0.10 right now ...
101+
-->
102+
<exclusions>
103+
<exclusion>
104+
<groupId>net.jpountz.lz4</groupId>
105+
<artifactId>lz4</artifactId>
106+
</exclusion>
107+
</exclusions>
98108
</dependency>
99109
<dependency>
100110
<groupId>${project.groupId}</groupId>
@@ -148,6 +158,16 @@
148158
<artifactId>spark-sql_${scala.binary.version}</artifactId>
149159
<version>${spark.version}</version>
150160
</dependency>
161+
<dependency>
162+
<groupId>org.apache.spark</groupId>
163+
<artifactId>spark-streaming_${scala.binary.version}</artifactId>
164+
<version>${spark.version}</version>
165+
</dependency>
166+
<dependency>
167+
<groupId>org.apache.spark</groupId>
168+
<artifactId>spark-streaming-kafka-0-10_${scala.binary.version}</artifactId>
169+
<version>${spark.version}</version>
170+
</dependency>
151171

152172
<!-- Apache Flink -->
153173
<dependency>
@@ -177,6 +197,16 @@
177197
<artifactId>jena-arq</artifactId>
178198
<version>${jena.version}</version>
179199
</dependency>
200+
<dependency>
201+
<groupId>org.apache.jena</groupId>
202+
<artifactId>jena-tdb</artifactId>
203+
<version>${jena.version}</version>
204+
</dependency>
205+
<dependency>
206+
<groupId>org.apache.jena</groupId>
207+
<artifactId>jena-cmds</artifactId>
208+
<version>${jena.version}</version>
209+
</dependency>
180210

181211
<!-- OWL API -->
182212
<dependency>
@@ -202,24 +232,29 @@
202232

203233
<!-- Graph API -->
204234
<dependency>
205-
<groupId>com.assembla.scala-incubator</groupId>
235+
<groupId>org.scala-graph</groupId>
206236
<artifactId>graph-core_${scala.binary.version}</artifactId>
207-
<version>1.10.0</version>
237+
<version>1.12.5</version>
208238
</dependency>
209239
<dependency>
210-
<groupId>com.assembla.scala-incubator</groupId>
240+
<groupId>org.scala-graph</groupId>
211241
<artifactId>graph-dot_${scala.binary.version}</artifactId>
212-
<version>1.9.0</version>
242+
<version>1.11.5</version>
213243
</dependency>
214244
<dependency>
215245
<groupId>org.jgrapht</groupId>
216246
<artifactId>jgrapht-core</artifactId>
217-
<version>1.1.0</version>
247+
<version>1.2.0</version>
248+
</dependency>
249+
<dependency>
250+
<groupId>org.jgrapht</groupId>
251+
<artifactId>jgrapht-io</artifactId>
252+
<version>1.2.0</version>
218253
</dependency>
219254
<dependency>
220255
<groupId>org.jgrapht</groupId>
221256
<artifactId>jgrapht-ext</artifactId>
222-
<version>1.1.0</version>
257+
<version>1.2.0</version>
223258
</dependency>
224259
<dependency>
225260
<groupId>org.gephi</groupId>
@@ -231,7 +266,7 @@
231266
<dependency>
232267
<groupId>org.apache.calcite</groupId>
233268
<artifactId>calcite-core</artifactId>
234-
<version>1.13.0</version>
269+
<version>1.16.0</version>
235270
</dependency>
236271

237272
<!-- Test -->
@@ -250,21 +285,21 @@
250285
<dependency>
251286
<groupId>org.specs2</groupId>
252287
<artifactId>specs2-core_${scala.binary.version}</artifactId>
253-
<version>4.0.2</version>
288+
<version>4.2.0</version>
254289
<scope>test</scope>
255290
</dependency>
256291
<dependency>
257292
<groupId>org.specs2</groupId>
258293
<artifactId>specs2-junit_${scala.binary.version}</artifactId>
259-
<version>4.0.2</version>
294+
<version>4.2.0</version>
260295
<scope>test</scope>
261296
</dependency>
262297

263298
<!-- Logging -->
264299
<dependency>
265300
<groupId>com.typesafe.scala-logging</groupId>
266301
<artifactId>scala-logging_${scala.binary.version}</artifactId>
267-
<version>3.7.2</version>
302+
<version>3.9.0</version>
268303
</dependency>
269304

270305
<!-- Guava -->
@@ -278,7 +313,7 @@
278313
<dependency>
279314
<groupId>com.chuusai</groupId>
280315
<artifactId>shapeless_${scala.binary.version}</artifactId>
281-
<version>2.3.2</version>
316+
<version>2.3.3</version>
282317
</dependency>
283318

284319
<!-- Scopt -->
@@ -292,7 +327,7 @@
292327
<dependency>
293328
<groupId>com.typesafe</groupId>
294329
<artifactId>config</artifactId>
295-
<version>1.3.2</version>
330+
<version>1.3.3</version>
296331
</dependency>
297332

298333

@@ -520,30 +555,33 @@
520555
<groupId>com.versioneye</groupId>
521556
<artifactId>versioneye-maven-plugin</artifactId>
522557
</plugin>
523-
<!--<plugin>-->
524-
<!--<groupId>org.scalastyle</groupId>-->
525-
<!--<artifactId>scalastyle-maven-plugin</artifactId>-->
526-
<!--<version>0.8.0</version>-->
527-
<!--<configuration>-->
528-
<!--<verbose>false</verbose>-->
529-
<!--<failOnViolation>false</failOnViolation>-->
530-
<!--<includeTestSourceDirectory>false</includeTestSourceDirectory>-->
531-
<!--<failOnWarning>false</failOnWarning>-->
532-
<!--<sourceDirectory>${basedir}/src/main/scala</sourceDirectory>-->
533-
<!--<testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>-->
534-
<!--<configLocation>scalastyle-config.xml</configLocation>-->
535-
<!--<outputFile>${basedir}/target/scalastyle-output.xml</outputFile>-->
536-
<!--<inputEncoding>${project.build.sourceEncoding}</inputEncoding>-->
537-
<!--<outputEncoding>${project.reporting.outputEncoding}</outputEncoding>-->
538-
<!--</configuration>-->
539-
<!--<executions>-->
540-
<!--<execution>-->
541-
<!--<goals>-->
542-
<!--<goal>check</goal>-->
543-
<!--</goals>-->
544-
<!--</execution>-->
545-
<!--</executions>-->
546-
<!--</plugin>-->
558+
559+
<!-- Scalastyle -->
560+
<plugin>
561+
<groupId>org.scalastyle</groupId>
562+
<artifactId>scalastyle-maven-plugin</artifactId>
563+
<version>1.0.0</version>
564+
<configuration>
565+
<verbose>false</verbose>
566+
<failOnViolation>true</failOnViolation>
567+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
568+
<failOnWarning>false</failOnWarning>
569+
<sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>
570+
<testSourceDirectory>${project.basedir}/src/test/scala</testSourceDirectory>
571+
<!-- we use a central config located in the root directory -->
572+
<configLocation>${scalastyle.config.path}</configLocation>
573+
<outputFile>${project.basedir}/scalastyle-output.xml</outputFile>
574+
<outputEncoding>UTF-8</outputEncoding>
575+
</configuration>
576+
<executions>
577+
<execution>
578+
<goals>
579+
<goal>check</goal>
580+
</goals>
581+
</execution>
582+
</executions>
583+
</plugin>
584+
547585
</plugins>
548586
</build>
549587

@@ -668,7 +706,8 @@
668706

669707
<!-- the profile used for deployment to Sonatype Maven repository -->
670708
<profile>
671-
<id>ossrh</id>
709+
<!-- for Maven Central deployment -->
710+
<id>release</id>
672711
<distributionManagement>
673712
<repository>
674713
<id>ossrh</id>
@@ -786,5 +825,18 @@
786825
</plugins>
787826
</build>
788827
</profile>
828+
829+
<!-- for Scalastyle plugin -->
830+
<profile>
831+
<id>root-dir</id>
832+
<activation>
833+
<file>
834+
<exists>${project.basedir}/../../scalastyle-config.xml</exists>
835+
</file>
836+
</activation>
837+
<properties>
838+
<scalastyle.config.path>${project.basedir}/../scalastyle-config.xml</scalastyle.config.path>
839+
</properties>
840+
</profile>
789841
</profiles>
790842
</project>

‎sansa-inference-common/pom.xml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<parent>
55
<artifactId>sansa-inference-parent_2.11</artifactId>
66
<groupId>net.sansa-stack</groupId>
7-
<version>0.3.0</version>
7+
<version>0.4.0</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<groupId>net.sansa-stack</groupId>
1111
<artifactId>sansa-inference-common_${scala.binary.version}</artifactId>
12-
<version>0.3.0</version>
12+
<version>0.4.0</version>
1313
<name>Inference API - Common</name>
1414
<description>A set of common objects used in the Inference API</description>
1515

@@ -31,21 +31,19 @@
3131
<dependency>
3232
<groupId>org.apache.jena</groupId>
3333
<artifactId>jena-tdb</artifactId>
34-
<version>3.5.0</version>
3534
</dependency>
3635
<dependency>
3736
<groupId>org.apache.jena</groupId>
3837
<artifactId>jena-cmds</artifactId>
39-
<version>3.5.0</version>
4038
</dependency>
4139

4240
<!-- Graph API -->
4341
<dependency>
44-
<groupId>com.assembla.scala-incubator</groupId>
42+
<groupId>org.scala-graph</groupId>
4543
<artifactId>graph-core_${scala.binary.version}</artifactId>
4644
</dependency>
4745
<dependency>
48-
<groupId>com.assembla.scala-incubator</groupId>
46+
<groupId>org.scala-graph</groupId>
4947
<artifactId>graph-dot_${scala.binary.version}</artifactId>
5048
</dependency>
5149
<dependency>
@@ -56,6 +54,10 @@
5654
<groupId>org.jgrapht</groupId>
5755
<artifactId>jgrapht-ext</artifactId>
5856
</dependency>
57+
<dependency>
58+
<groupId>org.jgrapht</groupId>
59+
<artifactId>jgrapht-io</artifactId>
60+
</dependency>
5961
<dependency>
6062
<groupId>org.gephi</groupId>
6163
<artifactId>gephi-toolkit</artifactId>
@@ -65,6 +67,7 @@
6567
<artifactId>google-collections</artifactId>
6668
</exclusion>
6769
</exclusions>
70+
<scope>compile</scope>
6871
</dependency>
6972

7073
<!-- Guava -->
@@ -84,6 +87,11 @@
8487
<version>3.5.0</version>
8588
</dependency>
8689

90+
<!-- Scopt CLI API-->
91+
<dependency>
92+
<groupId>com.github.scopt</groupId>
93+
<artifactId>scopt_${scala.binary.version}</artifactId>
94+
</dependency>
8795

8896
<!-- Test -->
8997
<dependency>

0 commit comments

Comments
 (0)