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

Commit 386a790

Browse files
GezimSejdiuGezimSejdiu
committed
Merge branch 'develop'
2 parents a599672 + 414ded1 commit 386a790

File tree

25 files changed

+47739
-110
lines changed

25 files changed

+47739
-110
lines changed

‎pom.xml‎

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
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>
55
<groupId>net.sansa-stack</groupId>
6-
<artifactId>sansa-examples-parent</artifactId>
7-
<version>2016-12</version>
6+
<artifactId>sansa-examples-parent_2.11</artifactId>
7+
<version>2017-06</version>
88
<packaging>pom</packaging>
99
<name>SANSA-Examples - Parent</name>
1010
<description>SANSA examples</description>
@@ -14,7 +14,7 @@
1414
<url>http://sda.tech/</url>
1515
</organization>
1616

17-
<inceptionYear>2016</inceptionYear>
17+
<inceptionYear>2017</inceptionYear>
1818

1919
<url>http://sansa-stack.net/</url>
2020

@@ -58,9 +58,10 @@
5858
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5959
<scala.version>2.11.8</scala.version>
6060
<scala.binary.version>2.11</scala.binary.version>
61-
<spark.version>2.0.0</spark.version>
62-
<flink.version>1.1.3</flink.version>
63-
<jena.version>3.1.0</jena.version>
61+
<spark.version>2.1.1</spark.version>
62+
<flink.version>1.3.0</flink.version>
63+
<jena.version>3.1.1</jena.version>
64+
<sansa.version>0.2.0</sansa.version>
6465
</properties>
6566

6667
<dependencyManagement>
@@ -130,8 +131,14 @@
130131
<!-- Logging -->
131132
<dependency>
132133
<groupId>com.typesafe.scala-logging</groupId>
133-
<artifactId>scala-logging-slf4j_${scala.binary.version}</artifactId>
134-
<version>2.1.2</version>
134+
<artifactId>scala-logging_${scala.binary.version}</artifactId>
135+
<version>3.5.0</version>
136+
</dependency>
137+
<!-- Scopt -->
138+
<dependency>
139+
<groupId>com.github.scopt</groupId>
140+
<artifactId>scopt_${scala.binary.version}</artifactId>
141+
<version>3.5.0</version>
135142
</dependency>
136143

137144
<!-- Guava -->
@@ -144,57 +151,62 @@
144151
<!-- RDF Layer -->
145152
<dependency>
146153
<groupId>${project.groupId}</groupId>
147-
<artifactId>sansa-rdf-spark-bundle</artifactId>
148-
<version>0.1.0</version>
154+
<artifactId>sansa-rdf-spark-bundle_${scala.binary.version}</artifactId>
155+
<version>${sansa.version}</version>
149156
</dependency>
150157

151158
<dependency>
152159
<groupId>${project.groupId}</groupId>
153-
<artifactId>sansa-rdf-flink</artifactId>
154-
<version>0.1.0</version>
160+
<artifactId>sansa-rdf-flink_${scala.binary.version}</artifactId>
161+
<version>${sansa.version}</version>
155162
</dependency>
156163
<!-- OWL Layer -->
157164
<dependency>
158165
<groupId>${project.groupId}</groupId>
159-
<artifactId>sansa-owl-spark</artifactId>
160-
<version>0.1.0</version>
166+
<artifactId>sansa-owl-spark_${scala.binary.version}</artifactId>
167+
<version>${sansa.version}</version>
161168
</dependency>
162169
<dependency>
163170
<groupId>${project.groupId}</groupId>
164-
<artifactId>sansa-owl-flink</artifactId>
165-
<version>0.1.0</version>
171+
<artifactId>sansa-owl-flink_${scala.binary.version}</artifactId>
172+
<version>${sansa.version}</version>
166173
</dependency>
167174

168175
<!-- Query Layer -->
169176
<dependency>
170177
<groupId>${project.groupId}</groupId>
171-
<artifactId>sansa-query-spark-bundle</artifactId>
172-
<version>0.1.0</version>
178+
<artifactId>sansa-query-spark-bundle_${scala.binary.version}</artifactId>
179+
<version>${sansa.version}</version>
173180
</dependency>
174181

175182

176183
<!-- Inference Layer -->
177184
<dependency>
178185
<groupId>${project.groupId}</groupId>
179186
<artifactId>sansa-inference-parent_${scala.binary.version}</artifactId>
180-
<version>0.1.0</version>
187+
<version>${sansa.version}</version>
181188
</dependency>
182189
<dependency>
183190
<groupId>${project.groupId}</groupId>
184191
<artifactId>sansa-inference-spark_${scala.binary.version}</artifactId>
185-
<version>0.1.0</version>
192+
<version>${sansa.version}</version>
186193
</dependency>
187194
<dependency>
188195
<groupId>${project.groupId}</groupId>
189196
<artifactId>sansa-inference-flink_${scala.binary.version}</artifactId>
190-
<version>0.1.0</version>
197+
<version>${sansa.version}</version>
191198
</dependency>
192199

193200
<!-- ML Layer -->
194201
<dependency>
195202
<groupId>${project.groupId}</groupId>
196-
<artifactId>sansa-ml-spark</artifactId>
197-
<version>0.1.0</version>
203+
<artifactId>sansa-ml-spark_${scala.binary.version}</artifactId>
204+
<version>${sansa.version}</version>
205+
</dependency>
206+
<dependency>
207+
<groupId>${project.groupId}</groupId>
208+
<artifactId>sansa-ml-flink_${scala.binary.version}</artifactId>
209+
<version>${sansa.version}</version>
198210
</dependency>
199211

200212
</dependencies>

‎sansa-examples-flink/pom.xml‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,40 @@
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>
55
<parent>
6-
<artifactId>sansa-examples-parent</artifactId>
6+
<artifactId>sansa-examples-parent_2.11</artifactId>
77
<groupId>net.sansa-stack</groupId>
8-
<version>2016-12</version>
8+
<version>2017-06</version>
99
</parent>
10-
<artifactId>sansa-examples-flink</artifactId>
10+
<artifactId>sansa-examples-flink_2.11</artifactId>
1111
<name>SANSA Examples - Apache Flink</name>
1212
<description>SANSA examples for Apache Flink</description>
1313

1414
<dependencies>
1515
<!-- SANSA RDF -->
16-
16+
<dependency>
17+
<groupId>${project.groupId}</groupId>
18+
<artifactId>sansa-rdf-flink_${scala.binary.version}</artifactId>
19+
</dependency>
20+
1721
<!-- SANSA OWL -->
1822
<dependency>
1923
<groupId>${project.groupId}</groupId>
20-
<artifactId>sansa-owl-flink</artifactId>
21-
<version>0.1.0-SNAPSHOT</version>
24+
<artifactId>sansa-owl-flink_${scala.binary.version}</artifactId>
2225
</dependency>
2326

2427
<!-- SANSA Inference -->
2528
<dependency>
2629
<groupId>${project.groupId}</groupId>
2730
<artifactId>sansa-inference-flink_${scala.binary.version}</artifactId>
2831
</dependency>
29-
32+
3033
<!-- SANSA Query -->
31-
34+
3235
<!-- SANSA ML -->
36+
<dependency>
37+
<groupId>${project.groupId}</groupId>
38+
<artifactId>sansa-ml-flink_${scala.binary.version}</artifactId>
39+
</dependency>
3340

3441
<!-- Scala -->
3542
<dependency>
@@ -55,7 +62,13 @@
5562
<!-- Logging -->
5663
<dependency>
5764
<groupId>com.typesafe.scala-logging</groupId>
58-
<artifactId>scala-logging-slf4j_${scala.binary.version}</artifactId>
65+
<artifactId>scala-logging_${scala.binary.version}</artifactId>
66+
</dependency>
67+
68+
<!-- Scopt -->
69+
<dependency>
70+
<groupId>com.github.scopt</groupId>
71+
<artifactId>scopt_${scala.binary.version}</artifactId>
5972
</dependency>
6073

6174
<!-- Test -->

‎sansa-examples-flink/src/main/resources/Clustering_sampledata.nt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<http://twitter/user0> <http://twitter/follows> <http://twitter/user1> .
2+
<http://twitter/user0> <http://twitter/follows> <http://twitter/user2> .
3+
<http://twitter/user0> <http://twitter/follows> <http://twitter/user3> .
4+
<http://twitter/user1> <http://twitter/follows> <http://twitter/user2> .
5+
<http://twitter/user1> <http://twitter/follows> <http://twitter/user3> .
6+
<http://twitter/user1> <http://twitter/follows> <http://twitter/user6> .
7+
<http://twitter/user2> <http://twitter/follows> <http://twitter/user3> .
8+
<http://twitter/user3> <http://twitter/follows> <http://twitter/user4> .
9+
<http://twitter/user4> <http://twitter/follows> <http://twitter/user5> .
10+
<http://twitter/user5> <http://twitter/follows> <http://twitter/user6> .
11+
<http://twitter/user4> <http://twitter/follows> <http://twitter/user7> .
12+
<http://twitter/user5> <http://twitter/follows> <http://twitter/user7> .
13+
<http://twitter/user6> <http://twitter/follows> <http://twitter/user7> .

0 commit comments

Comments
 (0)