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

Commit

Permalink
Merge branch 'release/0.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@patrickwestphal
patrickwestphal committed Dec 14, 2017
2 parents 81ab834 + 4c16c17 commit 09e4898
Show file tree
Hide file tree
Showing 105 changed files with 5,676 additions and 1,616 deletions.
12 changes: 7 additions & 5 deletions README.md
View file
Expand Up @@ -3,6 +3,8 @@
# 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/)
[![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)

**Table of Contents**

Expand All @@ -20,9 +22,9 @@
- [Usage](#usage)
- [Example](#example)
- [Supported Reasoning Profiles](#)
- [RDFS](#rdfs)
- [RDFS Simple](#rdfs-simple)
- [OWL Horst](#owl-horst)
- [RDFS](#rdfs)
- [RDFS Simple](#rdfs-simple)
- [OWL Horst](#owl-horst)


## Structure
Expand All @@ -44,7 +46,7 @@ Contains common test classes and data.
### Prerequisites
* Maven 3.x
* Java 8
* Scala 2.11 (support for Scala 2.10 is planned)
* Scala 2.11 (support for Scala 2.12 once Spark moved to Scala 2.12 as well)
* Apache Spark 2.x
* Apache Flink 1.x

Expand Down Expand Up @@ -149,7 +151,7 @@ where `VERSION` is the released version you want to use.
## Usage
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:
```
RDFGraphMaterializer 0.1.0
RDFGraphMaterializer 0.2.0
Usage: RDFGraphMaterializer [options]
-i, --input <path1>,<path2>,...
Expand Down
116 changes: 78 additions & 38 deletions pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sansa-stack</groupId>
<artifactId>sansa-inference-parent_2.11</artifactId>
<version>0.2.0</version>
<version>0.3.0</version>
<packaging>pom</packaging>
<name>Inference API - Parent</name>

Expand Down Expand Up @@ -66,25 +66,26 @@
<!--<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.8</scala.version>
<scala.version>2.11.11</scala.version>
<scala.binary.version>2.11</scala.binary.version>
<spark.version>2.1.1</spark.version>
<flink.version>1.3.0</flink.version>
<jena.version>3.1.1</jena.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.2.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>
<jsa.subversion>1-1</jsa.subversion>
<jsa.subversion>1</jsa.subversion>
<jsa.version>${jena.version}-${jsa.subversion}</jsa.version>
<PermGen>64m</PermGen>
<MaxPermGen>512m</MaxPermGen>
<CodeCacheSize>512m</CodeCacheSize>
<gpg.keyname>AKSW</gpg.keyname>
<owlapi.version>5.1.3</owlapi.version>
</properties>

<prerequisites>
<maven>3.0</maven>
<maven>3.1</maven>
</prerequisites>

<dependencyManagement>
Expand Down Expand Up @@ -130,6 +131,12 @@
<version>${scala.version}</version>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>2.7.0</version>
</dependency>

<!-- Apache Spark Core -->
<dependency>
<groupId>org.apache.spark</groupId>
Expand Down Expand Up @@ -171,6 +178,28 @@
<version>${jena.version}</version>
</dependency>

<!-- OWL API -->
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi-api</artifactId>
<version>${owlapi.version}</version>
</dependency>
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi-apibinding</artifactId>
<version>${owlapi.version}</version>
</dependency>
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi-impl</artifactId>
<version>${owlapi.version}</version>
</dependency>
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi-parsers</artifactId>
<version>${owlapi.version}</version>
</dependency>

<!-- Graph API -->
<dependency>
<groupId>com.assembla.scala-incubator</groupId>
Expand All @@ -185,24 +214,24 @@
<dependency>
<groupId>org.jgrapht</groupId>
<artifactId>jgrapht-core</artifactId>
<version>1.0.1</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.jgrapht</groupId>
<artifactId>jgrapht-ext</artifactId>
<version>1.0.1</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.gephi</groupId>
<artifactId>gephi-toolkit</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>

<!-- Apache Calcite -->
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<version>1.12.0</version>
<version>1.13.0</version>
</dependency>

<!-- Test -->
Expand All @@ -215,22 +244,34 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
<version>3.0.3</version>
<version>3.0.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.specs2</groupId>
<artifactId>specs2-core_${scala.binary.version}</artifactId>
<version>4.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.specs2</groupId>
<artifactId>specs2-junit_${scala.binary.version}</artifactId>
<version>4.0.2</version>
<scope>test</scope>
</dependency>

<!-- Logging -->
<dependency>
<groupId>com.typesafe.scala-logging</groupId>
<artifactId>scala-logging_${scala.binary.version}</artifactId>
<version>3.5.0</version>
<version>3.7.2</version>
</dependency>

<!-- Guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
<version>22.0</version>
</dependency>

<!-- Shapeless lib -->
Expand All @@ -244,10 +285,18 @@
<dependency>
<groupId>com.github.scopt</groupId>
<artifactId>scopt_${scala.binary.version}</artifactId>
<version>3.5.0</version>
<version>3.7.0</version>
</dependency>

<!-- Config API -->
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>1.3.2</version>
</dependency>



</dependencies>
</dependencyManagement>

Expand All @@ -266,7 +315,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.2</version>
<version>3.3.1</version>
<executions>
<execution>
<goals>
Expand All @@ -283,7 +332,7 @@
<arg>-feature</arg>
<arg>-dependencyfile</arg>
<arg>${project.build.directory}/.scala_dependencies</arg>
<arg>-Xmax-classfile-name</arg>
<arg>-Xmax-classfile-name</arg>
<arg>128</arg>
</args>
<jvmArgs>
Expand Down Expand Up @@ -312,7 +361,7 @@

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<version>3.7.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
Expand All @@ -324,14 +373,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version>
<version>2.20.1</version>
</plugin>

<!-- Scalatest -->
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>1.0</version>
<version>2.0.0</version>
<configuration>
<tagsToExclude>net.sansa_stack.test.conformance.IntegrationTestSuite</tagsToExclude>
</configuration>
Expand All @@ -341,7 +390,7 @@
<plugin>
<groupId>com.amashchenko.maven.plugin</groupId>
<artifactId>gitflow-maven-plugin</artifactId>
<version>1.5.0</version>
<version>1.8.0</version>

<configuration>
<installProject>false</installProject>
Expand All @@ -357,19 +406,20 @@
<versionTagPrefix>v</versionTagPrefix>
<origin>origin</origin>
</gitFlowConfig>
<pushRemote>false</pushRemote>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.3</version>
<version>2.5</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<version>3.0.0-M1</version>
<executions>
<execution>
<id>enforce-versions</id>
Expand Down Expand Up @@ -426,7 +476,7 @@
<plugin>
<groupId>com.versioneye</groupId>
<artifactId>versioneye-maven-plugin</artifactId>
<version>3.11.2</version>
<version>3.11.4</version>
</plugin>

<plugin>
Expand All @@ -438,19 +488,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>3.0.0-M1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version>
<version>3.1.0</version>
</plugin>

<plugin>
Expand All @@ -460,12 +504,12 @@

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
</plugin>

</plugins>
Expand Down Expand Up @@ -742,9 +786,5 @@
</plugins>
</build>
</profile>

</profiles>



</project>
18 changes: 12 additions & 6 deletions sansa-inference-common/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<parent>
<artifactId>sansa-inference-parent_2.11</artifactId>
<groupId>net.sansa-stack</groupId>
<version>0.2.0</version>
<version>0.3.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>net.sansa-stack</groupId>
<artifactId>sansa-inference-common_${scala.binary.version}</artifactId>
<version>0.2.0</version>
<version>0.3.0</version>
<name>Inference API - Common</name>
<description>A set of common objects used in the Inference API</description>

Expand All @@ -31,12 +31,12 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb</artifactId>
<version>3.2.0</version>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
<version>3.2.0</version>
<version>3.5.0</version>
</dependency>

<!-- Graph API -->
Expand Down Expand Up @@ -78,6 +78,12 @@
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.5.0</version>
</dependency>


<!-- Test -->
<dependency>
Expand All @@ -91,8 +97,8 @@
</dependencies>

<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<!--<sourceDirectory>src/main/scala,src/main/resources</sourceDirectory>-->
<!--<testSourceDirectory>src/test/scala</testSourceDirectory>-->
<!--<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>-->
<!--<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>-->
<plugins>
Expand Down

0 comments on commit 09e4898

Please sign in to comment.