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

Commit b5118cb

Browse files
GezimSejdiuGezimSejdiu
committed
Merge branch 'release/0.7.1'
2 parents 1d175c9 + 33816ab commit b5118cb

File tree

15 files changed

+784
-123
lines changed

15 files changed

+784
-123
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ cache:
55
- $HOME/.m2
66
scala:
77
- 2.11.11
8+
jdk:
9+
- openjdk8
810
script:
911
- mvn scalastyle:check
1012
- mvn clean install

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
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.6.0</version>
10+
<version>0.7.1</version>
1111
</parent>
1212

1313
<packaging>pom</packaging>

‎run-examples-wip.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
LAYER=query
2+
EXAMPLE=Sparklify
3+
4+
JAR=`ls sansa-examples-spark/target/sansa-examples-spark_*-dist.jar`
5+
BASE_URL="file://"`pwd`"/"
6+
echo "Using jar file $JAR"
7+
echo "Base URL: $BASE_URL"
8+
9+
spark-submit \
10+
--class net.sansa_stack.examples.spark.$LAYER.$EXAMPLE \
11+
--master spark://spark-master:7077 \
12+
"$JAR" -i "$BASE_URL/sansa-examples-spark/src/main/resources/rdf.nt" \
13+
14+
# TODO Validate the output
15+
curl -LH 'Accept: application/sparql-results+json' 'http://localhost:7531/sparql?query=SELECT%20%2A%20%7B%20%3Fs%20%3Fp%20%3Fo%20%7D'
16+

‎sansa-examples-flink/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>net.sansa-stack</groupId>
99
<artifactId>sansa-examples-parent_2.11</artifactId>
10-
<version>0.6.0</version>
10+
<version>0.7.1</version>
1111
</parent>
1212

1313
<artifactId>sansa-examples-flink_2.11</artifactId>

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
package net.sansa_stack.examples.flink.inference
22

3-
import java.io.{ File, FileInputStream }
3+
import java.io.{File, FileInputStream}
44
import java.net.URI
55
import java.util.Properties
66

77
import scala.io.Source
8-
98
import com.typesafe.config.ConfigFactory
10-
import net.sansa_stack.inference.flink.data.{ RDFGraphLoader, RDFGraphWriter }
11-
import net.sansa_stack.inference.flink.forwardchaining.{
12-
ForwardRuleReasonerOWLHorst,
13-
ForwardRuleReasonerRDFS
14-
}
15-
import net.sansa_stack.inference.rules.{ RDFSLevel, ReasoningProfile }
9+
import de.javakaffee.kryoserializers.UnmodifiableCollectionsSerializer
10+
import net.sansa_stack.inference.flink.data.{RDFGraphLoader, RDFGraphWriter}
11+
import net.sansa_stack.inference.flink.forwardchaining.{ForwardRuleReasonerOWLHorst, ForwardRuleReasonerRDFS}
12+
import net.sansa_stack.inference.rules.{RDFSLevel, ReasoningProfile}
1613
import net.sansa_stack.inference.rules.ReasoningProfile._
1714
import org.apache.flink.api.java.utils.ParameterTool
1815
import org.apache.flink.api.scala.ExecutionEnvironment

‎sansa-examples-spark/pom.xml‎

Lines changed: 116 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,55 @@
55
<parent>
66
<groupId>net.sansa-stack</groupId>
77
<artifactId>sansa-examples-parent_2.11</artifactId>
8-
<version>0.6.0</version>
8+
<version>0.7.1</version>
99
</parent>
1010

1111
<artifactId>sansa-examples-spark_2.11</artifactId>
1212
<name>SANSA Examples - Apache Spark</name>
1313
<description>SANSA Examples for Apache Spark</description>
1414

1515
<dependencies>
16-
<!-- Scala -->
17-
<dependency>
18-
<groupId>org.scala-lang</groupId>
19-
<artifactId>scala-library</artifactId>
20-
</dependency>
21-
22-
<!-- Apache Spark Core -->
16+
<!-- Apache Spark -->
2317
<dependency>
2418
<groupId>org.apache.spark</groupId>
2519
<artifactId>spark-core_${scala.binary.version}</artifactId>
2620
<version>${spark.version}</version>
21+
<scope>provided</scope>
2722
<!-- <exclusions> <exclusion> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId>
2823
</exclusion> <exclusion> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-util</artifactId>
2924
</exclusion> </exclusions> -->
3025
</dependency>
31-
<!-- Apache Spark SQL -->
3226
<dependency>
3327
<groupId>org.apache.spark</groupId>
3428
<artifactId>spark-sql_${scala.binary.version}</artifactId>
3529
<version>${spark.version}</version>
30+
<scope>provided</scope>
3631
</dependency>
3732
<dependency>
3833
<groupId>org.apache.spark</groupId>
39-
<artifactId>spark-mllib_${scala.binary.version}</artifactId>
34+
<artifactId>spark-graphx_${scala.binary.version}</artifactId>
4035
<version>${spark.version}</version>
36+
<scope>provided</scope>
4137
</dependency>
4238

4339
<!-- Apache JENA 3.x -->
4440
<dependency>
4541
<groupId>org.apache.jena</groupId>
46-
<artifactId>apache-jena-libs</artifactId>
47-
<type>pom</type>
42+
<artifactId>jena-core</artifactId>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.apache.jena</groupId>
46+
<artifactId>jena-arq</artifactId>
47+
</dependency>
48+
49+
<dependency>
50+
<groupId>org.aksw.jena-sparql-api</groupId>
51+
<artifactId>jena-sparql-api-server-standalone</artifactId>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.eclipse.jetty</groupId>
55+
<artifactId>jetty-server</artifactId>
56+
<version>9.4.18.v20190429</version>
4857
</dependency>
4958

5059
<!-- SANSA RDF -->
@@ -80,18 +89,6 @@
8089
<artifactId>sansa-ml-spark_${scala.binary.version}</artifactId>
8190
</dependency>
8291

83-
<!-- Test -->
84-
<dependency>
85-
<groupId>junit</groupId>
86-
<artifactId>junit</artifactId>
87-
<scope>test</scope>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.scalatest</groupId>
91-
<artifactId>scalatest_${scala.binary.version}</artifactId>
92-
<scope>test</scope>
93-
</dependency>
94-
9592
<!-- Logging -->
9693
<dependency>
9794
<groupId>com.typesafe.scala-logging</groupId>
@@ -104,11 +101,30 @@
104101
<artifactId>scopt_${scala.binary.version}</artifactId>
105102
</dependency>
106103

104+
<!-- BigDL Library -->
105+
<dependency>
106+
<groupId>com.intel.analytics.bigdl</groupId>
107+
<artifactId>bigdl-SPARK_2.2</artifactId>
108+
<version>0.3.0</version>
109+
<scope>provided</scope>
110+
</dependency>
111+
<dependency>
112+
<groupId>com.github.haifengl</groupId>
113+
<artifactId>smile-core</artifactId>
114+
<version>1.5.0</version>
115+
<scope>provided</scope>
116+
</dependency>
117+
<dependency>
118+
<groupId>com.github.haifengl</groupId>
119+
<artifactId>smile-netlib</artifactId>
120+
<version>1.5.0</version>
121+
<scope>provided</scope>
122+
</dependency>
123+
107124
</dependencies>
108125

109126
<build>
110127
<sourceDirectory>src/main/scala</sourceDirectory>
111-
<testSourceDirectory>src/test/scala</testSourceDirectory>
112128
<plugins>
113129
<plugin>
114130
<groupId>net.alchim31.maven</groupId>
@@ -151,6 +167,8 @@
151167
<goal>shade</goal>
152168
</goals>
153169
<configuration>
170+
<shadedClassifierName>dist</shadedClassifierName>
171+
<!-- <finalName>dist-${project.artifactId}-${project.version}</finalName>-->
154172
<artifactSet>
155173
<excludes>
156174
<exclude>asm:asm</exclude>
@@ -162,7 +180,7 @@
162180
<exclude>com.google.code.findbugs:jsr305</exclude>
163181
<exclude>com.google.code.gson:gson</exclude>
164182
<exclude>com.google.inject.extensions:guice-servlet</exclude>
165-
<exclude>com.google.guava:guava</exclude>
183+
<!-- <exclude>com.google.guava:guava</exclude>-->
166184
<exclude>com.google.protobuf:protobuf-java</exclude>
167185
<exclude>com.jcraft:jsch</exclude>
168186
<exclude>com.ning:compress-lzf</exclude>
@@ -184,7 +202,7 @@
184202
<exclude>commons-logging:commons-logging</exclude>
185203
<exclude>commons-net:commons-net</exclude>
186204
<exclude>io.dropwizard.metrics:metrics*</exclude>
187-
<exckude>io.netty:netty*</exckude>
205+
<exclude>io.netty:netty*</exclude>
188206
<exclude>javax.activation:activation</exclude>
189207
<exclude>javax.annotation:javax.annotation-api</exclude>
190208
<exclude>javax.servlet:javax.servlet-api</exclude>
@@ -207,9 +225,36 @@
207225
<exclude>org.apache.curator:curator*</exclude>
208226
<exclude>org.apache.directory.api:*</exclude>
209227
<exclude>org.apache.directory.server:*</exclude>
210-
<exclude>org.apache.hadoop:*</exclude>
228+
<!-- commented out and replaced by longer list naming each
229+
Hadoop package (except hadoop-streaming) individually to avoid
230+
excluding hadoop-streaming which is needed by SANSA-OWL -->
231+
<!--exclude>org.apache.hadoop:*</exclude-->
232+
233+
<exclude>org.apache.hadoop:hadoop-annotations</exclude>
234+
<exclude>org.apache.hadoop:hadoop-auth</exclude>
235+
<exclude>org.apache.hadoop:hadoop-client</exclude>
236+
<exclude>org.apache.hadoop:hadoop-common</exclude>
237+
<exclude>org.apache.hadoop:hadoop-hdfs-client</exclude>
238+
<exclude>org.apache.hadoop:hadoop-hdfs</exclude>
239+
<exclude>org.apache.hadoop:hadoop-mapreduce-client-app</exclude>
240+
<exclude>org.apache.hadoop:hadoop-mapreduce-client-common</exclude>
241+
<exclude>org.apache.hadoop:hadoop-mapreduce-client-core</exclude>
242+
<exclude>org.apache.hadoop:hadoop-mapreduce-client-hs</exclude>
243+
<exclude>org.apache.hadoop:hadoop-mapreduce-client-jobclient</exclude>
244+
<exclude>org.apache.hadoop:hadoop-mapreduce-client-shuffle</exclude>
245+
<exclude>org.apache.hadoop:hadoop-minicluster</exclude>
246+
<exclude>org.apache.hadoop:hadoop-yarn-api</exclude>
247+
<exclude>org.apache.hadoop:hadoop-yarn-client</exclude>
248+
<exclude>org.apache.hadoop:hadoop-yarn-common</exclude>
249+
<exclude>org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice</exclude>
250+
<exclude>org.apache.hadoop:hadoop-yarn-server-common</exclude>
251+
<exclude>org.apache.hadoop:hadoop-yarn-server-nodemanager</exclude>
252+
<exclude>org.apache.hadoop:hadoop-yarn-server-resourcemanager</exclude>
253+
<exclude>org.apache.hadoop:hadoop-yarn-server-tests</exclude>
254+
<exclude>org.apache.hadoop:hadoop-yarn-server-web-proxy</exclude>
255+
211256
<exclude>org.apache.htrace:htrace-core</exclude>
212-
<exclude>org.apache.httpcomponents:*</exclude>
257+
<!-- <exclude>org.apache.httpcomponents:*</exclude>-->
213258
<exclude>org.apache.ivy:ivy</exclude>
214259
<exclude>org.apache.mesos:mesos</exclude>
215260
<exclude>org.apache.parquet:parquet*</exclude>
@@ -220,8 +265,8 @@
220265
<exclude>org.codehaus.janino:*</exclude>
221266
<exclude>org.codehaus.jettison:jettison</exclude>
222267
<exclude>org.fusesource.leveldbjni:leveldbjni-all</exclude>
223-
<exckude>org.glassfish.hk2*</exckude>
224-
<exclude>org.glassfish.jersey*</exclude>
268+
<!-- <exclude>org.glassfish.hk2*</exclude>-->
269+
<!-- <exclude>org.glassfish.jersey*</exclude>-->
225270
<exclude>org.javassist:javassist</exclude>
226271
<exclude>org.json4s:json4s*</exclude>
227272
<exclude>org.mortbay.jetty:jetty*</exclude>
@@ -234,6 +279,29 @@
234279
<exclude>org.xerial.snappy:snappy-java</exclude>
235280
<exclude>oro:oro</exclude>
236281
<exclude>xmlenc:xmlenc</exclude>
282+
283+
<exclude>org.netbeans.api:*</exclude>
284+
<exclude>org.gephi:*</exclude>
285+
<exclude>org.jfree:*</exclude>
286+
<exclude>com.itextpdf:*</exclude>
287+
<exclude>org.apache.poi:*</exclude>
288+
<exclude>org.apache.batik:*</exclude>
289+
<exclude>org.xerial:sqlite-jdbc</exclude>
290+
<exclude>org.apache.jena:jena-osgi</exclude>
291+
292+
<!--exclude>org.eclipse.rdf4j:*</exclude-->
293+
<!--<exclude>com.amazonaws:*</exclude>-->
294+
<exclude>org.apache.xmlgraphics:*</exclude>
295+
<exclude>org.netbeans.api:*</exclude>
296+
<exclude>org.codehaus.groovy:*</exclude>
297+
<exclude>org.apache.spark:*</exclude>
298+
<exclude>org.apache.calcite:*</exclude>
299+
<exclude>org.scalacheck:*</exclude>
300+
<exclude>org.h2:*</exclude>
301+
302+
<exclude>com.intel.analytics.bigdl:*</exclude>
303+
304+
237305
</excludes>
238306
</artifactSet>
239307
<filters>
@@ -245,6 +313,23 @@
245313
<exclude>META-INF/*.RSA</exclude>
246314
</excludes>
247315
</filter>
316+
<filter>
317+
<artifact>org.aksw.jena-sparql-api:*</artifact>
318+
<includes>
319+
<include>**</include>
320+
</includes>
321+
</filter>
322+
<filter>
323+
<artifact>*:*</artifact>
324+
<excludes>
325+
<exclude>*.so</exclude>
326+
<exclude>*.nt</exclude>
327+
<exclude>*.dll</exclude>
328+
<exclude>*.jnilib</exclude>
329+
<exclude>*.txt</exclude>
330+
<exclude>*.pom</exclude>
331+
</excludes>
332+
</filter>
248333
</filters>
249334
<createDependencyReducedPom>false</createDependencyReducedPom>
250335
<transformers>
@@ -261,41 +346,6 @@
261346
</executions>
262347
</plugin>
263348

264-
<!-- disable surefire -->
265-
<plugin>
266-
<groupId>org.apache.maven.plugins</groupId>
267-
<artifactId>maven-surefire-plugin</artifactId>
268-
<configuration>
269-
<useFile>false</useFile>
270-
<disableXmlReport>true</disableXmlReport>
271-
<!-- If you have classpath issue like NoDefClassError,... -->
272-
<!-- useManifestOnlyJar>false</useManifestOnlyJar -->
273-
<includes>
274-
<include>**/*Test.*</include>
275-
<include>**/*Suite.*</include>
276-
</includes>
277-
<skipTests>true</skipTests>
278-
</configuration>
279-
</plugin>
280-
281-
<!-- enable scalatest -->
282-
<plugin>
283-
<groupId>org.scalatest</groupId>
284-
<artifactId>scalatest-maven-plugin</artifactId>
285-
<configuration>
286-
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
287-
<junitxml>.</junitxml>
288-
<filereports>WDF TestSuite.txt</filereports>
289-
</configuration>
290-
<executions>
291-
<execution>
292-
<id>test</id>
293-
<goals>
294-
<goal>test</goal>
295-
</goals>
296-
</execution>
297-
</executions>
298-
</plugin>
299349
<plugin>
300350
<groupId>org.scalastyle</groupId>
301351
<artifactId>scalastyle-maven-plugin</artifactId>

0 commit comments

Comments
 (0)