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

Commit 4bf31f9

Browse files
GezimSejdiuGezimSejdiu
authored
Merge pull request #32 from SANSA-Stack/feature/0.6.0-SNAPSHOT
Feature/0.6.0 snapshot
2 parents a07f8d0 + 864127c commit 4bf31f9

File tree

3 files changed

+25
-38
lines changed

3 files changed

+25
-38
lines changed

‎pom.xml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>net.sansa-stack</groupId>
99
<artifactId>sansa-parent</artifactId>
10-
<version>0.5.1-SNAPSHOT</version>
10+
<version>0.6.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<version>2018-12.1-SNAPSHOT</version>
@@ -58,61 +58,66 @@
5858

5959
</modules>
6060

61+
<properties>
62+
<sansa.version>0.6.0-SNAPSHOT</sansa.version>
63+
</properties>
64+
6165
<dependencyManagement>
6266
<dependencies>
6367
<!-- RDF Layer -->
6468
<dependency>
6569
<groupId>${project.groupId}</groupId>
6670
<artifactId>sansa-rdf-spark_${scala.binary.version}</artifactId>
67-
<version>${sansa.rdf.version}</version>
71+
<version>${sansa.version}</version>
6872
</dependency>
6973

7074
<dependency>
7175
<groupId>${project.groupId}</groupId>
7276
<artifactId>sansa-rdf-flink_${scala.binary.version}</artifactId>
73-
<version>${sansa.rdf.version}</version>
77+
<version>${sansa.version}</version>
7478
</dependency>
7579
<!-- OWL Layer -->
7680
<dependency>
7781
<groupId>${project.groupId}</groupId>
7882
<artifactId>sansa-owl-spark_${scala.binary.version}</artifactId>
79-
<version>${sansa.owl.version}</version>
83+
<version>${sansa.version}</version>
8084
</dependency>
8185
<dependency>
8286
<groupId>${project.groupId}</groupId>
8387
<artifactId>sansa-owl-flink_${scala.binary.version}</artifactId>
84-
<version>${sansa.owl.version}</version>
88+
<version>${sansa.version}</version>
8589
</dependency>
8690

8791
<!-- Query Layer -->
8892
<dependency>
8993
<groupId>${project.groupId}</groupId>
9094
<artifactId>sansa-query-spark_${scala.binary.version}</artifactId>
91-
<version>${sansa.query.version}</version>
95+
<!-- <version>${project.parent.version}</version> -->
96+
<version>${sansa.version}</version>
9297
</dependency>
9398

9499
<!-- Inference Layer -->
95100
<dependency>
96101
<groupId>${project.groupId}</groupId>
97102
<artifactId>sansa-inference-spark_${scala.binary.version}</artifactId>
98-
<version>${sansa.inference.version}</version>
103+
<version>${sansa.version}</version>
99104
</dependency>
100105
<dependency>
101106
<groupId>${project.groupId}</groupId>
102107
<artifactId>sansa-inference-flink_${scala.binary.version}</artifactId>
103-
<version>${sansa.inference.version}</version>
108+
<version>${sansa.version}</version>
104109
</dependency>
105110

106111
<!-- ML Layer -->
107112
<dependency>
108113
<groupId>${project.groupId}</groupId>
109114
<artifactId>sansa-ml-spark_${scala.binary.version}</artifactId>
110-
<version>${sansa.ml.version}</version>
115+
<version>${sansa.version}</version>
111116
</dependency>
112117
<dependency>
113118
<groupId>${project.groupId}</groupId>
114119
<artifactId>sansa-ml-flink_${scala.binary.version}</artifactId>
115-
<version>${sansa.ml.version}</version>
120+
<version>${sansa.version}</version>
116121
</dependency>
117122

118123
</dependencies>

‎sansa-examples-spark/pom.xml‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
4+
55
<parent>
66
<groupId>net.sansa-stack</groupId>
77
<artifactId>sansa-examples-parent_2.11</artifactId>
@@ -24,18 +24,9 @@
2424
<groupId>org.apache.spark</groupId>
2525
<artifactId>spark-core_${scala.binary.version}</artifactId>
2626
<version>${spark.version}</version>
27-
<!--
28-
<exclusions>
29-
<exclusion>
30-
<groupId>org.mortbay.jetty</groupId>
31-
<artifactId>jetty</artifactId>
32-
</exclusion>
33-
<exclusion>
34-
<groupId>org.mortbay.jetty</groupId>
35-
<artifactId>jetty-util</artifactId>
36-
</exclusion>
37-
</exclusions>
38-
-->
27+
<!-- <exclusions> <exclusion> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId>
28+
</exclusion> <exclusion> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-util</artifactId>
29+
</exclusion> </exclusions> -->
3930
</dependency>
4031
<!-- Apache Spark SQL -->
4132
<dependency>
@@ -66,18 +57,9 @@
6657
<dependency>
6758
<groupId>${project.groupId}</groupId>
6859
<artifactId>sansa-owl-spark_${scala.binary.version}</artifactId>
69-
<!--
70-
<exclusions>
71-
<exclusion>
72-
<groupId>org.mortbay.jetty</groupId>
73-
<artifactId>jetty</artifactId>
74-
</exclusion>
75-
<exclusion>
76-
<groupId>org.mortbay.jetty</groupId>
77-
<artifactId>jetty-util</artifactId>
78-
</exclusion>
79-
</exclusions>
80-
-->
60+
<!-- <exclusions> <exclusion> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId>
61+
</exclusion> <exclusion> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-util</artifactId>
62+
</exclusion> </exclusions> -->
8163
</dependency>
8264

8365
<!-- SANSA Inference -->

sansa-examples-spark/src/main/scala/net/sansa_stack/examples/spark/query/Sparqlify.scala renamed to sansa-examples-spark/src/main/scala/net/sansa_stack/examples/spark/query/Sparklify.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import org.apache.spark.sql.SparkSession
1515
/**
1616
* Run SPARQL queries over Spark using Sparqlify approach.
1717
*/
18-
object Sparqlify {
18+
object Sparklify {
1919

2020
def main(args: Array[String]) {
2121
parser.parse(args, Config()) match {
@@ -28,7 +28,7 @@ object Sparqlify {
2828
def run(input: String, sparqlQuery: String = "", endpoint: Boolean = true, port: String = "7531"): Unit = {
2929

3030
println("======================================")
31-
println("| Sparqlify example |")
31+
println("| Sparklify example |")
3232
println("======================================")
3333

3434
val spark = SparkSession.builder
@@ -70,7 +70,7 @@ object Sparqlify {
7070

7171
case class Config(in: String = "", sparql: String = "", endpoint: Boolean = true, port: String = "7531")
7272

73-
val parser = new scopt.OptionParser[Config]("Sparqlify example") {
73+
val parser = new scopt.OptionParser[Config]("Sparklify example") {
7474

7575
head(" Sparqlify example")
7676

0 commit comments

Comments
 (0)