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

Commit 1d175c9

Browse files
GezimSejdiuGezimSejdiu
committed
Merge branch 'release/0.6.0'
2 parents 57210ce + 8ee7677 commit 1d175c9

File tree

13 files changed

+75
-457
lines changed

13 files changed

+75
-457
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ project/plugins/project/
2323
deptree.txt
2424
scalastyle-output.xml
2525

26+
27+
# Files generated for spark runs
28+
sansa-examples-spark/data/
29+

‎pom.xml‎

Lines changed: 17 additions & 246 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<groupId>net.sansa-stack</groupId>
65
<artifactId>sansa-examples-parent_2.11</artifactId>
7-
<version>2018-12</version>
6+
7+
<parent>
8+
<groupId>net.sansa-stack</groupId>
9+
<artifactId>sansa-parent</artifactId>
10+
<version>0.6.0</version>
11+
</parent>
12+
813
<packaging>pom</packaging>
914
<name>SANSA-Examples - Parent</name>
1015
<description>SANSA examples</description>
@@ -52,301 +57,67 @@
5257

5358
</modules>
5459

55-
<properties>
56-
<maven.compiler.source>1.8</maven.compiler.source>
57-
<maven.compiler.target>1.8</maven.compiler.target>
58-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
59-
<scala.version>2.11.11</scala.version>
60-
<scala.binary.version>2.11</scala.binary.version>
61-
<spark.version>2.4.0</spark.version>
62-
<flink.version>1.7.0</flink.version>
63-
<hadoop.version>2.8.3</hadoop.version>
64-
<jena.version>3.9.0</jena.version>
65-
<sansa.rdf.version>0.5.0</sansa.rdf.version>
66-
<sansa.owl.version>0.4.1</sansa.owl.version>
67-
<sansa.query.version>0.5.0</sansa.query.version>
68-
<sansa.inference.version>0.5.0</sansa.inference.version>
69-
<sansa.ml.version>0.5.0</sansa.ml.version>
70-
<scalastyle.config.path>${project.basedir}/scalastyle-config.xml</scalastyle.config.path>
71-
</properties>
72-
7360
<dependencyManagement>
7461
<dependencies>
75-
<!-- Scala -->
76-
<dependency>
77-
<groupId>org.scala-lang</groupId>
78-
<artifactId>scala-library</artifactId>
79-
<version>${scala.version}</version>
80-
</dependency>
81-
82-
<!-- Apache Spark Core -->
83-
<dependency>
84-
<groupId>org.apache.spark</groupId>
85-
<artifactId>spark-core_${scala.binary.version}</artifactId>
86-
<version>${spark.version}</version>
87-
</dependency>
88-
<dependency>
89-
<groupId>org.apache.spark</groupId>
90-
<artifactId>spark-sql_${scala.binary.version}</artifactId>
91-
<version>${spark.version}</version>
92-
</dependency>
93-
94-
<!-- Apache Flink -->
95-
<dependency>
96-
<groupId>org.apache.flink</groupId>
97-
<artifactId>flink-scala_${scala.binary.version}</artifactId>
98-
<version>${flink.version}</version>
99-
</dependency>
100-
<dependency>
101-
<groupId>org.apache.flink</groupId>
102-
<artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
103-
<version>${flink.version}</version>
104-
</dependency>
105-
<dependency>
106-
<groupId>org.apache.flink</groupId>
107-
<artifactId>flink-clients_${scala.binary.version}</artifactId>
108-
<version>${flink.version}</version>
109-
</dependency>
110-
111-
<!-- Hadoop dependencies (mainly used for InputFormat definitions) -->
112-
<dependency>
113-
<groupId>org.apache.hadoop</groupId>
114-
<artifactId>hadoop-mapreduce-client-core</artifactId>
115-
<version>${hadoop.version}</version>
116-
</dependency>
117-
<dependency>
118-
<groupId>org.apache.hadoop</groupId>
119-
<artifactId>hadoop-common</artifactId>
120-
<version>${hadoop.version}</version>
121-
</dependency>
122-
<dependency>
123-
<groupId>org.apache.hadoop</groupId>
124-
<artifactId>hadoop-streaming</artifactId>
125-
<version>${hadoop.version}</version>
126-
</dependency>
127-
128-
<!-- Apache JENA 3.x -->
129-
<dependency>
130-
<groupId>org.apache.jena</groupId>
131-
<artifactId>jena-core</artifactId>
132-
<version>${jena.version}</version>
133-
</dependency>
134-
<dependency>
135-
<groupId>org.apache.jena</groupId>
136-
<artifactId>jena-arq</artifactId>
137-
<version>${jena.version}</version>
138-
</dependency>
139-
140-
<!-- Test -->
141-
<dependency>
142-
<groupId>junit</groupId>
143-
<artifactId>junit</artifactId>
144-
<version>4.12</version>
145-
<scope>test</scope>
146-
</dependency>
147-
<dependency>
148-
<groupId>org.scalatest</groupId>
149-
<artifactId>scalatest_${scala.binary.version}</artifactId>
150-
<version>2.2.6</version>
151-
<scope>test</scope>
152-
</dependency>
153-
154-
<!-- Logging -->
155-
<dependency>
156-
<groupId>com.typesafe.scala-logging</groupId>
157-
<artifactId>scala-logging_${scala.binary.version}</artifactId>
158-
<version>3.5.0</version>
159-
</dependency>
160-
<!-- Scopt -->
161-
<dependency>
162-
<groupId>com.github.scopt</groupId>
163-
<artifactId>scopt_${scala.binary.version}</artifactId>
164-
<version>3.5.0</version>
165-
</dependency>
166-
167-
<!-- Guava -->
168-
<!-- <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId>
169-
<version>19.0</version> </dependency> -->
170-
17162
<!-- RDF Layer -->
17263
<dependency>
17364
<groupId>${project.groupId}</groupId>
17465
<artifactId>sansa-rdf-spark_${scala.binary.version}</artifactId>
175-
<version>${sansa.rdf.version}</version>
66+
<version>${project.version}</version>
17667
</dependency>
17768

17869
<dependency>
17970
<groupId>${project.groupId}</groupId>
18071
<artifactId>sansa-rdf-flink_${scala.binary.version}</artifactId>
181-
<version>${sansa.rdf.version}</version>
72+
<version>${project.version}</version>
18273
</dependency>
18374
<!-- OWL Layer -->
18475
<dependency>
18576
<groupId>${project.groupId}</groupId>
18677
<artifactId>sansa-owl-spark_${scala.binary.version}</artifactId>
187-
<version>${sansa.owl.version}</version>
78+
<version>${project.version}</version>
18879
</dependency>
18980
<dependency>
19081
<groupId>${project.groupId}</groupId>
19182
<artifactId>sansa-owl-flink_${scala.binary.version}</artifactId>
192-
<version>${sansa.owl.version}</version>
83+
<version>${project.version}</version>
19384
</dependency>
19485

19586
<!-- Query Layer -->
19687
<dependency>
19788
<groupId>${project.groupId}</groupId>
19889
<artifactId>sansa-query-spark_${scala.binary.version}</artifactId>
199-
<version>${sansa.query.version}</version>
90+
<!-- <version>${project.parent.version}</version> -->
91+
<version>${project.version}</version>
20092
</dependency>
20193

20294
<!-- Inference Layer -->
20395
<dependency>
20496
<groupId>${project.groupId}</groupId>
20597
<artifactId>sansa-inference-spark_${scala.binary.version}</artifactId>
206-
<version>${sansa.inference.version}</version>
98+
<version>${sansa.version}</version>
20799
</dependency>
208100
<dependency>
209101
<groupId>${project.groupId}</groupId>
210102
<artifactId>sansa-inference-flink_${scala.binary.version}</artifactId>
211-
<version>${sansa.inference.version}</version>
103+
<version>${sansa.version}</version>
212104
</dependency>
213105

214106
<!-- ML Layer -->
215107
<dependency>
216108
<groupId>${project.groupId}</groupId>
217109
<artifactId>sansa-ml-spark_${scala.binary.version}</artifactId>
218-
<version>${sansa.ml.version}</version>
110+
<version>${project.version}</version>
219111
</dependency>
220112
<dependency>
221113
<groupId>${project.groupId}</groupId>
222114
<artifactId>sansa-ml-flink_${scala.binary.version}</artifactId>
223-
<version>${sansa.ml.version}</version>
224-
</dependency>
225-
226-
<dependency>
227-
<groupId>com.holdenkarau</groupId>
228-
<artifactId>spark-testing-base_${scala.binary.version}</artifactId>
229-
<version>2.3.0_0.9.0</version>
230-
<scope>test</scope>
231-
</dependency>
232-
233-
<dependency>
234-
<groupId>org.glassfish.jersey</groupId>
235-
<artifactId>jersey-bom</artifactId>
236-
<version>2.26-b03</version>
237-
<type>pom</type>
238-
<scope>import</scope>
239-
</dependency>
240-
241-
<dependency>
242-
<groupId>commons-codec</groupId>
243-
<artifactId>commons-codec</artifactId>
244-
<version>1.11</version>
245-
</dependency>
246-
247-
<dependency>
248-
<groupId>org.apache.commons</groupId>
249-
<artifactId>commons-compress</artifactId>
250-
<version>1.18</version>
115+
<version>${project.version}</version>
251116
</dependency>
252117

253118
</dependencies>
254119
</dependencyManagement>
255120

256-
<build>
257-
<pluginManagement>
258-
<plugins>
259-
<!-- Scala Maven -->
260-
<plugin>
261-
<groupId>net.alchim31.maven</groupId>
262-
<artifactId>scala-maven-plugin</artifactId>
263-
<version>3.2.1</version>
264-
<executions>
265-
<execution>
266-
<goals>
267-
<goal>compile</goal>
268-
<goal>testCompile</goal>
269-
</goals>
270-
<configuration>
271-
<args>
272-
<!--<arg>-make:transitive</arg> -->
273-
<arg>-dependencyfile</arg>
274-
<arg>${project.build.directory}/.scala_dependencies</arg>
275-
</args>
276-
</configuration>
277-
</execution>
278-
</executions>
279-
<configuration>
280-
<scalaVersion>${scala.version}</scalaVersion>
281-
<recompileMode>incremental</recompileMode>
282-
</configuration>
283-
</plugin>
284-
285-
<plugin>
286-
<artifactId>maven-compiler-plugin</artifactId>
287-
<version>3.5.1</version>
288-
<configuration>
289-
<source>${maven.compiler.source}</source>
290-
<target>${maven.compiler.target}</target>
291-
<encoding>${project.build.sourceEncoding}</encoding>
292-
</configuration>
293-
</plugin>
294-
295-
<!-- Surefire -->
296-
<plugin>
297-
<groupId>org.apache.maven.plugins</groupId>
298-
<artifactId>maven-surefire-plugin</artifactId>
299-
<version>2.19.1</version>
300-
</plugin>
301-
302-
<!-- Scalastyle -->
303-
<plugin>
304-
<groupId>org.scalastyle</groupId>
305-
<artifactId>scalastyle-maven-plugin</artifactId>
306-
<version>1.0.0</version>
307-
<configuration>
308-
<verbose>false</verbose>
309-
<failOnViolation>true</failOnViolation>
310-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
311-
<failOnWarning>false</failOnWarning>
312-
<sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>
313-
<testSourceDirectory>${project.basedir}/src/test/scala</testSourceDirectory>
314-
<!-- we use a central config located in the root directory -->
315-
<configLocation>${scalastyle.config.path}</configLocation>
316-
<outputFile>${project.basedir}/scalastyle-output.xml</outputFile>
317-
<outputEncoding>UTF-8</outputEncoding>
318-
</configuration>
319-
<executions>
320-
<execution>
321-
<goals>
322-
<goal>check</goal>
323-
</goals>
324-
</execution>
325-
</executions>
326-
</plugin>
327-
328-
<!-- Scalatest -->
329-
<plugin>
330-
<groupId>org.scalatest</groupId>
331-
<artifactId>scalatest-maven-plugin</artifactId>
332-
<version>1.0</version>
333-
</plugin>
334-
335-
<!-- Git Flow -->
336-
<plugin>
337-
<groupId>com.amashchenko.maven.plugin</groupId>
338-
<artifactId>gitflow-maven-plugin</artifactId>
339-
<version>1.8.0</version>
340-
<configuration>
341-
<gitFlowConfig>
342-
<versionTagPrefix>v</versionTagPrefix>
343-
</gitFlowConfig>
344-
</configuration>
345-
</plugin>
346-
347-
</plugins>
348-
</pluginManagement>
349-
</build>
350121

351122
<profiles>
352123
<profile>

‎sansa-examples-flink/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5+
6+
57
<parent>
6-
<artifactId>sansa-examples-parent_2.11</artifactId>
78
<groupId>net.sansa-stack</groupId>
8-
<version>2018-12</version>
9+
<artifactId>sansa-examples-parent_2.11</artifactId>
10+
<version>0.6.0</version>
911
</parent>
12+
1013
<artifactId>sansa-examples-flink_2.11</artifactId>
1114
<name>SANSA Examples - Apache Flink</name>
1215
<description>SANSA examples for Apache Flink</description>
@@ -89,13 +92,11 @@
8992
<dependency>
9093
<groupId>org.specs2</groupId>
9194
<artifactId>specs2-core_${scala.binary.version}</artifactId>
92-
<version>2.4.16</version>
9395
<scope>test</scope>
9496
</dependency>
9597
<dependency>
9698
<groupId>org.scalatest</groupId>
9799
<artifactId>scalatest_${scala.binary.version}</artifactId>
98-
<version>2.2.4</version>
99100
<scope>test</scope>
100101
</dependency>
101102
</dependencies>
@@ -123,7 +124,6 @@
123124
<plugin>
124125
<groupId>org.apache.maven.plugins</groupId>
125126
<artifactId>maven-shade-plugin</artifactId>
126-
<version>2.4.3</version>
127127
<executions>
128128
<execution>
129129
<phase>package</phase>

‎sansa-examples-flink/src/main/scala/net/sansa_stack/examples/flink/inference/RDFGraphInference.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ object RDFGraphInference {
7272

7373
// load triples from disk
7474
val graph = RDFGraphLoader.loadFromDisk(input, env)
75-
println(s"|G| = ${graph.size()}")
75+
println(s"|G| = ${graph.size}")
7676

7777
// create reasoner
7878
val reasoner = profile match {
@@ -88,7 +88,7 @@ object RDFGraphInference {
8888

8989
// compute inferred graph
9090
val inferredGraph = reasoner.apply(graph)
91-
println(s"|G_inf| = ${inferredGraph.size()}")
91+
println(s"|G_inf| = ${inferredGraph.size}")
9292

9393
val jn = if (jobName.isEmpty) s"RDF Graph Inference ($profile)" else jobName
9494
}

0 commit comments

Comments
 (0)