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

Commit 09e4898

Browse files
patrickwestphalpatrickwestphal
committed
Merge branch 'release/0.3.0'
2 parents 81ab834 + 4c16c17 commit 09e4898

File tree

105 files changed

+5676
-1616
lines changed

Some content is hidden

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

105 files changed

+5676
-1616
lines changed

‎README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
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)
55
[![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/)
6+
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
7+
[![Twitter](https://img.shields.io/twitter/follow/SANSA_Stack.svg?style=social)](https://twitter.com/SANSA_Stack)
68

79
**Table of Contents**
810

@@ -20,9 +22,9 @@
2022
- [Usage](#usage)
2123
- [Example](#example)
2224
- [Supported Reasoning Profiles](#)
23-
- [RDFS](#rdfs)
24-
- [RDFS Simple](#rdfs-simple)
25-
- [OWL Horst](#owl-horst)
25+
- [RDFS](#rdfs)
26+
- [RDFS Simple](#rdfs-simple)
27+
- [OWL Horst](#owl-horst)
2628

2729

2830
## Structure
@@ -44,7 +46,7 @@ Contains common test classes and data.
4446
### Prerequisites
4547
* Maven 3.x
4648
* Java 8
47-
* Scala 2.11 (support for Scala 2.10 is planned)
49+
* Scala 2.11 (support for Scala 2.12 once Spark moved to Scala 2.12 as well)
4850
* Apache Spark 2.x
4951
* Apache Flink 1.x
5052

@@ -149,7 +151,7 @@ where `VERSION` is the released version you want to use.
149151
## Usage
150152
Besides using the Inference API in your application code, we also provide a command line interface with various options that allow for a convenient way to use the core reasoning algorithms:
151153
```
152-
RDFGraphMaterializer 0.1.0
154+
RDFGraphMaterializer 0.2.0
153155
Usage: RDFGraphMaterializer [options]
154156
155157
-i, --input <path1>,<path2>,...

‎pom.xml‎

Lines changed: 78 additions & 38 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.2.0</version>
6+
<version>0.3.0</version>
77
<packaging>pom</packaging>
88
<name>Inference API - Parent</name>
99

@@ -66,25 +66,26 @@
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.8</scala.version>
69+
<scala.version>2.11.11</scala.version>
7070
<scala.binary.version>2.11</scala.binary.version>
71-
<spark.version>2.1.1</spark.version>
72-
<flink.version>1.3.0</flink.version>
73-
<jena.version>3.1.1</jena.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>
7474
<sansa.stack.version>0.2.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>
78-
<jsa.subversion>1-1</jsa.subversion>
78+
<jsa.subversion>1</jsa.subversion>
7979
<jsa.version>${jena.version}-${jsa.subversion}</jsa.version>
8080
<PermGen>64m</PermGen>
8181
<MaxPermGen>512m</MaxPermGen>
8282
<CodeCacheSize>512m</CodeCacheSize>
8383
<gpg.keyname>AKSW</gpg.keyname>
84+
<owlapi.version>5.1.3</owlapi.version>
8485
</properties>
8586

8687
<prerequisites>
87-
<maven>3.0</maven>
88+
<maven>3.1</maven>
8889
</prerequisites>
8990

9091
<dependencyManagement>
@@ -130,6 +131,12 @@
130131
<version>${scala.version}</version>
131132
</dependency>
132133

134+
<dependency>
135+
<groupId>org.apache.hadoop</groupId>
136+
<artifactId>hadoop-client</artifactId>
137+
<version>2.7.0</version>
138+
</dependency>
139+
133140
<!-- Apache Spark Core -->
134141
<dependency>
135142
<groupId>org.apache.spark</groupId>
@@ -171,6 +178,28 @@
171178
<version>${jena.version}</version>
172179
</dependency>
173180

181+
<!-- OWL API -->
182+
<dependency>
183+
<groupId>net.sourceforge.owlapi</groupId>
184+
<artifactId>owlapi-api</artifactId>
185+
<version>${owlapi.version}</version>
186+
</dependency>
187+
<dependency>
188+
<groupId>net.sourceforge.owlapi</groupId>
189+
<artifactId>owlapi-apibinding</artifactId>
190+
<version>${owlapi.version}</version>
191+
</dependency>
192+
<dependency>
193+
<groupId>net.sourceforge.owlapi</groupId>
194+
<artifactId>owlapi-impl</artifactId>
195+
<version>${owlapi.version}</version>
196+
</dependency>
197+
<dependency>
198+
<groupId>net.sourceforge.owlapi</groupId>
199+
<artifactId>owlapi-parsers</artifactId>
200+
<version>${owlapi.version}</version>
201+
</dependency>
202+
174203
<!-- Graph API -->
175204
<dependency>
176205
<groupId>com.assembla.scala-incubator</groupId>
@@ -185,24 +214,24 @@
185214
<dependency>
186215
<groupId>org.jgrapht</groupId>
187216
<artifactId>jgrapht-core</artifactId>
188-
<version>1.0.1</version>
217+
<version>1.1.0</version>
189218
</dependency>
190219
<dependency>
191220
<groupId>org.jgrapht</groupId>
192221
<artifactId>jgrapht-ext</artifactId>
193-
<version>1.0.1</version>
222+
<version>1.1.0</version>
194223
</dependency>
195224
<dependency>
196225
<groupId>org.gephi</groupId>
197226
<artifactId>gephi-toolkit</artifactId>
198-
<version>0.9.1</version>
227+
<version>0.9.2</version>
199228
</dependency>
200229

201230
<!-- Apache Calcite -->
202231
<dependency>
203232
<groupId>org.apache.calcite</groupId>
204233
<artifactId>calcite-core</artifactId>
205-
<version>1.12.0</version>
234+
<version>1.13.0</version>
206235
</dependency>
207236

208237
<!-- Test -->
@@ -215,22 +244,34 @@
215244
<dependency>
216245
<groupId>org.scalatest</groupId>
217246
<artifactId>scalatest_${scala.binary.version}</artifactId>
218-
<version>3.0.3</version>
247+
<version>3.0.4</version>
248+
<scope>test</scope>
249+
</dependency>
250+
<dependency>
251+
<groupId>org.specs2</groupId>
252+
<artifactId>specs2-core_${scala.binary.version}</artifactId>
253+
<version>4.0.2</version>
254+
<scope>test</scope>
255+
</dependency>
256+
<dependency>
257+
<groupId>org.specs2</groupId>
258+
<artifactId>specs2-junit_${scala.binary.version}</artifactId>
259+
<version>4.0.2</version>
219260
<scope>test</scope>
220261
</dependency>
221262

222263
<!-- Logging -->
223264
<dependency>
224265
<groupId>com.typesafe.scala-logging</groupId>
225266
<artifactId>scala-logging_${scala.binary.version}</artifactId>
226-
<version>3.5.0</version>
267+
<version>3.7.2</version>
227268
</dependency>
228269

229270
<!-- Guava -->
230271
<dependency>
231272
<groupId>com.google.guava</groupId>
232273
<artifactId>guava</artifactId>
233-
<version>21.0</version>
274+
<version>22.0</version>
234275
</dependency>
235276

236277
<!-- Shapeless lib -->
@@ -244,10 +285,18 @@
244285
<dependency>
245286
<groupId>com.github.scopt</groupId>
246287
<artifactId>scopt_${scala.binary.version}</artifactId>
247-
<version>3.5.0</version>
288+
<version>3.7.0</version>
289+
</dependency>
290+
291+
<!-- Config API -->
292+
<dependency>
293+
<groupId>com.typesafe</groupId>
294+
<artifactId>config</artifactId>
295+
<version>1.3.2</version>
248296
</dependency>
249297

250298

299+
251300
</dependencies>
252301
</dependencyManagement>
253302

@@ -266,7 +315,7 @@
266315
<plugin>
267316
<groupId>net.alchim31.maven</groupId>
268317
<artifactId>scala-maven-plugin</artifactId>
269-
<version>3.2.2</version>
318+
<version>3.3.1</version>
270319
<executions>
271320
<execution>
272321
<goals>
@@ -283,7 +332,7 @@
283332
<arg>-feature</arg>
284333
<arg>-dependencyfile</arg>
285334
<arg>${project.build.directory}/.scala_dependencies</arg>
286-
<arg>-Xmax-classfile-name</arg>
335+
<arg>-Xmax-classfile-name</arg>
287336
<arg>128</arg>
288337
</args>
289338
<jvmArgs>
@@ -312,7 +361,7 @@
312361

313362
<plugin>
314363
<artifactId>maven-compiler-plugin</artifactId>
315-
<version>3.6.1</version>
364+
<version>3.7.0</version>
316365
<configuration>
317366
<source>${maven.compiler.source}</source>
318367
<target>${maven.compiler.target}</target>
@@ -324,14 +373,14 @@
324373
<plugin>
325374
<groupId>org.apache.maven.plugins</groupId>
326375
<artifactId>maven-surefire-plugin</artifactId>
327-
<version>2.20</version>
376+
<version>2.20.1</version>
328377
</plugin>
329378

330379
<!-- Scalatest -->
331380
<plugin>
332381
<groupId>org.scalatest</groupId>
333382
<artifactId>scalatest-maven-plugin</artifactId>
334-
<version>1.0</version>
383+
<version>2.0.0</version>
335384
<configuration>
336385
<tagsToExclude>net.sansa_stack.test.conformance.IntegrationTestSuite</tagsToExclude>
337386
</configuration>
@@ -341,7 +390,7 @@
341390
<plugin>
342391
<groupId>com.amashchenko.maven.plugin</groupId>
343392
<artifactId>gitflow-maven-plugin</artifactId>
344-
<version>1.5.0</version>
393+
<version>1.8.0</version>
345394

346395
<configuration>
347396
<installProject>false</installProject>
@@ -357,19 +406,20 @@
357406
<versionTagPrefix>v</versionTagPrefix>
358407
<origin>origin</origin>
359408
</gitFlowConfig>
409+
<pushRemote>false</pushRemote>
360410
</configuration>
361411
</plugin>
362412

363413
<plugin>
364414
<groupId>org.codehaus.mojo</groupId>
365415
<artifactId>versions-maven-plugin</artifactId>
366-
<version>2.3</version>
416+
<version>2.5</version>
367417
</plugin>
368418

369419
<plugin>
370420
<groupId>org.apache.maven.plugins</groupId>
371421
<artifactId>maven-enforcer-plugin</artifactId>
372-
<version>1.4.1</version>
422+
<version>3.0.0-M1</version>
373423
<executions>
374424
<execution>
375425
<id>enforce-versions</id>
@@ -426,7 +476,7 @@
426476
<plugin>
427477
<groupId>com.versioneye</groupId>
428478
<artifactId>versioneye-maven-plugin</artifactId>
429-
<version>3.11.2</version>
479+
<version>3.11.4</version>
430480
</plugin>
431481

432482
<plugin>
@@ -438,19 +488,13 @@
438488
<plugin>
439489
<groupId>org.apache.maven.plugins</groupId>
440490
<artifactId>maven-javadoc-plugin</artifactId>
441-
<version>2.10.4</version>
491+
<version>3.0.0-M1</version>
442492
</plugin>
443493

444494
<plugin>
445495
<groupId>org.apache.maven.plugins</groupId>
446496
<artifactId>maven-shade-plugin</artifactId>
447-
<version>3.0.0</version>
448-
</plugin>
449-
450-
<plugin>
451-
<groupId>org.apache.maven.plugins</groupId>
452-
<artifactId>maven-surefire-plugin</artifactId>
453-
<version>2.20</version>
497+
<version>3.1.0</version>
454498
</plugin>
455499

456500
<plugin>
@@ -460,12 +504,12 @@
460504

461505
<plugin>
462506
<artifactId>maven-assembly-plugin</artifactId>
463-
<version>3.0.0</version>
507+
<version>3.1.0</version>
464508
</plugin>
465509

466510
<plugin>
467511
<artifactId>maven-dependency-plugin</artifactId>
468-
<version>3.0.1</version>
512+
<version>3.0.2</version>
469513
</plugin>
470514

471515
</plugins>
@@ -742,9 +786,5 @@
742786
</plugins>
743787
</build>
744788
</profile>
745-
746789
</profiles>
747-
748-
749-
750790
</project>

‎sansa-inference-common/pom.xml‎

Lines changed: 12 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.2.0</version>
7+
<version>0.3.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.2.0</version>
12+
<version>0.3.0</version>
1313
<name>Inference API - Common</name>
1414
<description>A set of common objects used in the Inference API</description>
1515

@@ -31,12 +31,12 @@
3131
<dependency>
3232
<groupId>org.apache.jena</groupId>
3333
<artifactId>jena-tdb</artifactId>
34-
<version>3.2.0</version>
34+
<version>3.5.0</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.apache.jena</groupId>
3838
<artifactId>jena-cmds</artifactId>
39-
<version>3.2.0</version>
39+
<version>3.5.0</version>
4040
</dependency>
4141

4242
<!-- Graph API -->
@@ -78,6 +78,12 @@
7878
<groupId>org.apache.calcite</groupId>
7979
<artifactId>calcite-core</artifactId>
8080
</dependency>
81+
<dependency>
82+
<groupId>com.google.protobuf</groupId>
83+
<artifactId>protobuf-java</artifactId>
84+
<version>3.5.0</version>
85+
</dependency>
86+
8187

8288
<!-- Test -->
8389
<dependency>
@@ -91,8 +97,8 @@
9197
</dependencies>
9298

9399
<build>
94-
<sourceDirectory>src/main/scala</sourceDirectory>
95-
<testSourceDirectory>src/test/scala</testSourceDirectory>
100+
<!--<sourceDirectory>src/main/scala,src/main/resources</sourceDirectory>-->
101+
<!--<testSourceDirectory>src/test/scala</testSourceDirectory>-->
96102
<!--<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>-->
97103
<!--<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>-->
98104
<plugins>

0 commit comments

Comments
 (0)