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

Commit adce8f8

Browse files
LorenzBuehmannLorenzBuehmann
committed
Merge branch 'develop'
# Conflicts: # sansa-inference-flink/pom.xml
2 parents f79c546 + 31c56e2 commit adce8f8

File tree

502 files changed

+254
-6164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

502 files changed

+254
-6164
lines changed

‎pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,14 @@
236236
</dependencies>
237237
</dependencyManagement>
238238

239+
<dependencies>
240+
<dependency>
241+
<groupId>org.scalatest</groupId>
242+
<artifactId>scalatest_${scala.binary.version}</artifactId>
243+
<scope>test</scope>
244+
</dependency>
245+
</dependencies>
246+
239247
<build>
240248
<pluginManagement>
241249
<plugins>
@@ -385,6 +393,19 @@
385393
</pluginManagement>
386394
</build>
387395

396+
<distributionManagement>
397+
<repository>
398+
<id>maven.aksw.internal</id>
399+
<name>AKSW Release Repository</name>
400+
<url>http://maven.aksw.org/archiva/repository/internal</url>
401+
</repository>
402+
<snapshotRepository>
403+
<id>maven.aksw.snapshots</id>
404+
<name>AKSW Snapshot Repository</name>
405+
<url>http://maven.aksw.org/archiva/repository/snapshots</url>
406+
</snapshotRepository>
407+
</distributionManagement>
408+
388409
<repositories>
389410
<repository>
390411
<id>oss-sonatype</id>

‎sansa-inference-common/src/main/scala/net/sansa_stack/inference/utils/RDFTripleToNTripleString.scala‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package net.sansa_stack.inference.utils
2+
3+
import net.sansa_stack.inference.data.RDFTriple
4+
5+
/**
6+
* Convert an RDFTriple object to an N-Triple string.
7+
*
8+
* @author Lorenz Buehmann
9+
*/
10+
class RDFTripleToNTripleString extends Function1[RDFTriple, String] with java.io.Serializable {
11+
override def apply(t: RDFTriple): String = {
12+
val objStr = if(t.`object`.startsWith("http:") || t.`object`.startsWith("ftp:")) s"<${t.`object`}>" else t.`object`
13+
s"<${t.subject}> <${t.predicate}> ${objStr} ."
14+
}
15+
}

‎sansa-inference-flink/pom.xml‎

Lines changed: 153 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -220,164 +220,166 @@ under the License.
220220
</dependency>
221221
</dependencies>
222222
</profile>
223-
224223
<profile>
225-
<id>dist</id>
226-
<activation>
227-
<property>
228-
<name>dist</name>
229-
</property>
230-
</activation>
231-
<build>
232-
<plugins>
233-
<!-- We use the maven-shade plugin to create a fat jar that contains all dependencies
234-
except flink and it's transitive dependencies. The resulting fat-jar can be executed
235-
on a cluster. Change the value of Program-Class if your program entry point changes. -->
236-
<plugin>
237-
<groupId>org.apache.maven.plugins</groupId>
238-
<artifactId>maven-shade-plugin</artifactId>
239-
<version>2.4.1</version>
240-
<executions>
241-
<!-- Run shade goal on package phase -->
242-
<execution>
243-
<phase>package</phase>
244-
<goals>
245-
<goal>shade</goal>
246-
</goals>
247-
<configuration>
248-
<minimizeJar>true</minimizeJar>
249-
<artifactSet>
250-
<excludes>
251-
<!-- This list contains all dependencies of flink-dist
252-
Everything else will be packaged into the fat-jar
253-
-->
254-
<exclude>org.apache.flink:flink-shaded-*_2.11</exclude>
255-
<exclude>org.apache.flink:flink-core_2.11</exclude>
256-
<exclude>org.apache.flink:flink-java*</exclude>
257-
<exclude>org.apache.flink:flink-java_2.11</exclude>
258-
<exclude>org.apache.flink:flink-scala_2.11</exclude>
259-
<exclude>org.apache.flink:flink-runtime_2.11</exclude>
260-
<exclude>org.apache.flink:flink-optimizer_2.11</exclude>
261-
<exclude>org.apache.flink:flink-clients_2.11</exclude>
262-
<exclude>org.apache.flink:flink-avro_2.11</exclude>
263-
<exclude>org.apache.flink:flink-java-examples_2.11</exclude>
264-
<exclude>org.apache.flink:flink-scala-examples_2.11</exclude>
265-
<exclude>org.apache.flink:flink-streaming-examples_2.11</exclude>
266-
<exclude>org.apache.flink:flink-streaming-java_2.11</exclude>
224+
<id>dist</id>
225+
<activation>
226+
<property>
227+
<name>dist</name>
228+
</property>
229+
</activation>
230+
<!-- This profile uses the assembly plugin to create a special "dist" package for BigTop
231+
that contains Spark but not the Hadoop JARs it depends on. -->
232+
<build>
233+
<plugins>
234+
<!-- We use the maven-shade plugin to create a fat jar that contains all dependencies
235+
except flink and it's transitive dependencies. The resulting fat-jar can be executed
236+
on a cluster. Change the value of Program-Class if your program entry point changes. -->
237+
<plugin>
238+
<groupId>org.apache.maven.plugins</groupId>
239+
<artifactId>maven-shade-plugin</artifactId>
240+
<version>2.4.1</version>
241+
<executions>
242+
<!-- Run shade goal on package phase -->
243+
<execution>
244+
<phase>package</phase>
245+
<goals>
246+
<goal>shade</goal>
247+
</goals>
248+
<configuration>
249+
<minimizeJar>true</minimizeJar>
250+
<artifactSet>
251+
<excludes>
252+
<!-- This list contains all dependencies of flink-dist
253+
Everything else will be packaged into the fat-jar
254+
-->
255+
<exclude>org.apache.flink:flink-shaded-*_2.11</exclude>
256+
<exclude>org.apache.flink:flink-core_2.11</exclude>
257+
<exclude>org.apache.flink:flink-java*</exclude>
258+
<exclude>org.apache.flink:flink-java_2.11</exclude>
259+
<exclude>org.apache.flink:flink-scala_2.11</exclude>
260+
<exclude>org.apache.flink:flink-runtime_2.11</exclude>
261+
<exclude>org.apache.flink:flink-optimizer_2.11</exclude>
262+
<exclude>org.apache.flink:flink-clients_2.11</exclude>
263+
<exclude>org.apache.flink:flink-avro_2.11</exclude>
264+
<exclude>org.apache.flink:flink-java-examples_2.11</exclude>
265+
<exclude>org.apache.flink:flink-scala-examples_2.11</exclude>
266+
<exclude>org.apache.flink:flink-streaming-examples_2.11</exclude>
267+
<exclude>org.apache.flink:flink-streaming-java_2.11</exclude>
268+
269+
<!-- Also exclude very big transitive dependencies of Flink
267270
268-
<!-- Also exclude very big transitive dependencies of Flink
271+
WARNING: You have to remove these excludes if your code relies on other
272+
versions of these dependencies.
269273
270-
WARNING: You have to remove these excludes if your code relies on other
271-
versions of these dependencies.
274+
-->
272275

273-
-->
276+
<exclude>org.scala-lang:scala-library</exclude>
277+
<exclude>org.scala-lang:scala-compiler</exclude>
278+
<exclude>org.scala-lang:scala-reflect</exclude>
279+
<exclude>com.amazonaws:aws-java-sdk</exclude>
280+
<exclude>com.typesafe.akka:akka-actor_*</exclude>
281+
<exclude>com.typesafe.akka:akka-remote_*</exclude>
282+
<exclude>com.typesafe.akka:akka-slf4j_*</exclude>
283+
<exclude>io.netty:netty-all</exclude>
284+
<exclude>io.netty:netty</exclude>
285+
<exclude>org.eclipse.jetty:jetty-server</exclude>
286+
<exclude>org.eclipse.jetty:jetty-continuation</exclude>
287+
<exclude>org.eclipse.jetty:jetty-http</exclude>
288+
<exclude>org.eclipse.jetty:jetty-io</exclude>
289+
<exclude>org.eclipse.jetty:jetty-util</exclude>
290+
<exclude>org.eclipse.jetty:jetty-security</exclude>
291+
<exclude>org.eclipse.jetty:jetty-servlet</exclude>
292+
<exclude>org.gephi:*</exclude>
293+
<exclude>org.netbeans.api:*</exclude>
274294

275-
<exclude>org.scala-lang:scala-library</exclude>
276-
<exclude>org.scala-lang:scala-compiler</exclude>
277-
<exclude>org.scala-lang:scala-reflect</exclude>
278-
<exclude>com.amazonaws:aws-java-sdk</exclude>
279-
<exclude>com.typesafe.akka:akka-actor_*</exclude>
280-
<exclude>com.typesafe.akka:akka-remote_*</exclude>
281-
<exclude>com.typesafe.akka:akka-slf4j_*</exclude>
282-
<exclude>io.netty:netty-all</exclude>
283-
<exclude>io.netty:netty</exclude>
284-
<exclude>org.eclipse.jetty:jetty-server</exclude>
285-
<exclude>org.eclipse.jetty:jetty-continuation</exclude>
286-
<exclude>org.eclipse.jetty:jetty-http</exclude>
287-
<exclude>org.eclipse.jetty:jetty-io</exclude>
288-
<exclude>org.eclipse.jetty:jetty-util</exclude>
289-
<exclude>org.eclipse.jetty:jetty-security</exclude>
290-
<exclude>org.eclipse.jetty:jetty-servlet</exclude>
291-
<exclude>org.gephi:*</exclude>
292-
<exclude>org.netbeans.api:*</exclude>
295+
<exclude>commons-fileupload:commons-fileupload</exclude>
296+
<exclude>org.apache.avro:avro</exclude>
297+
<exclude>commons-collections:commons-collections</exclude>
298+
<exclude>org.codehaus.jackson:jackson-core-asl</exclude>
299+
<exclude>org.codehaus.jackson:jackson-mapper-asl</exclude>
300+
<exclude>com.thoughtworks.paranamer:paranamer</exclude>
301+
<exclude>org.xerial.snappy:snappy-java</exclude>
302+
<exclude>org.apache.commons:commons-compress</exclude>
303+
<exclude>org.tukaani:xz</exclude>
304+
<exclude>com.esotericsoftware.kryo:kryo</exclude>
305+
<exclude>com.esotericsoftware.minlog:minlog</exclude>
306+
<exclude>org.objenesis:objenesis</exclude>
307+
<exclude>com.twitter:chill_*</exclude>
308+
<exclude>com.twitter:chill-java</exclude>
309+
<exclude>com.twitter:chill-avro_*</exclude>
310+
<exclude>com.twitter:chill-bijection_*</exclude>
311+
<exclude>com.twitter:bijection-core_*</exclude>
312+
<exclude>com.twitter:bijection-avro_*</exclude>
313+
<exclude>commons-lang:commons-lang</exclude>
314+
<exclude>junit:junit</exclude>
315+
<exclude>de.javakaffee:kryo-serializers</exclude>
316+
<exclude>joda-time:joda-time</exclude>
317+
<exclude>org.apache.commons:commons-lang3</exclude>
318+
<exclude>org.slf4j:slf4j-api</exclude>
319+
<exclude>org.slf4j:slf4j-log4j12</exclude>
320+
<exclude>log4j:log4j</exclude>
321+
<exclude>org.apache.commons:commons-math</exclude>
322+
<exclude>org.apache.sling:org.apache.sling.commons.json</exclude>
323+
<exclude>commons-logging:commons-logging</exclude>
324+
<exclude>org.apache.httpcomponents:httpclient</exclude>
325+
<exclude>org.apache.httpcomponents:httpcore</exclude>
326+
<exclude>commons-codec:commons-codec</exclude>
327+
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
328+
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
329+
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
330+
<exclude>org.codehaus.jettison:jettison</exclude>
331+
<exclude>stax:stax-api</exclude>
332+
<exclude>com.typesafe:config</exclude>
333+
<exclude>org.uncommons.maths:uncommons-maths</exclude>
334+
<!--<exclude>com.github.scopt:scopt_*</exclude>-->
335+
<exclude>org.mortbay.jetty:servlet-api</exclude>
336+
<exclude>commons-io:commons-io</exclude>
337+
<exclude>commons-cli:commons-cli</exclude>
293338

294-
<exclude>commons-fileupload:commons-fileupload</exclude>
295-
<exclude>org.apache.avro:avro</exclude>
296-
<exclude>commons-collections:commons-collections</exclude>
297-
<exclude>org.codehaus.jackson:jackson-core-asl</exclude>
298-
<exclude>org.codehaus.jackson:jackson-mapper-asl</exclude>
299-
<exclude>com.thoughtworks.paranamer:paranamer</exclude>
300-
<exclude>org.xerial.snappy:snappy-java</exclude>
301-
<exclude>org.apache.commons:commons-compress</exclude>
302-
<exclude>org.tukaani:xz</exclude>
303-
<exclude>com.esotericsoftware.kryo:kryo</exclude>
304-
<exclude>com.esotericsoftware.minlog:minlog</exclude>
305-
<exclude>org.objenesis:objenesis</exclude>
306-
<exclude>com.twitter:chill_*</exclude>
307-
<exclude>com.twitter:chill-java</exclude>
308-
<exclude>com.twitter:chill-avro_*</exclude>
309-
<exclude>com.twitter:chill-bijection_*</exclude>
310-
<exclude>com.twitter:bijection-core_*</exclude>
311-
<exclude>com.twitter:bijection-avro_*</exclude>
312-
<exclude>commons-lang:commons-lang</exclude>
313-
<exclude>junit:junit</exclude>
314-
<exclude>de.javakaffee:kryo-serializers</exclude>
315-
<exclude>joda-time:joda-time</exclude>
316-
<exclude>org.apache.commons:commons-lang3</exclude>
317-
<exclude>org.slf4j:slf4j-api</exclude>
318-
<exclude>org.slf4j:slf4j-log4j12</exclude>
319-
<exclude>log4j:log4j</exclude>
320-
<exclude>org.apache.commons:commons-math</exclude>
321-
<exclude>org.apache.sling:org.apache.sling.commons.json</exclude>
322-
<exclude>commons-logging:commons-logging</exclude>
323-
<exclude>org.apache.httpcomponents:httpclient</exclude>
324-
<exclude>org.apache.httpcomponents:httpcore</exclude>
325-
<exclude>commons-codec:commons-codec</exclude>
326-
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
327-
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
328-
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
329-
<exclude>org.codehaus.jettison:jettison</exclude>
330-
<exclude>stax:stax-api</exclude>
331-
<exclude>com.typesafe:config</exclude>
332-
<exclude>org.uncommons.maths:uncommons-maths</exclude>
333-
<!--<exclude>com.github.scopt:scopt_*</exclude>-->
334-
<exclude>org.mortbay.jetty:servlet-api</exclude>
335-
<exclude>commons-io:commons-io</exclude>
336-
<exclude>commons-cli:commons-cli</exclude>
339+
<exclude>sqlite:*</exclude>
340+
<exclude>netbeans:*</exclude>
341+
<exclude>org.apache.xmlgraphics:*</exclude>
342+
<exclude>mysql:*</exclude>
343+
</excludes>
344+
</artifactSet>
345+
<filters>
346+
<filter>
347+
<artifact>org.apache.flink:*</artifact>
348+
<excludes>
349+
<exclude>org/apache/flink/shaded/**</exclude>
350+
<exclude>web-docs/**</exclude>
351+
</excludes>
352+
</filter>
353+
<filter>
354+
<!-- Do not copy the signatures in the META-INF folder.
355+
Otherwise, this might cause SecurityExceptions when using the JAR. -->
356+
<artifact>*:*</artifact>
357+
<excludes>
358+
<exclude>META-INF/*.SF</exclude>
359+
<exclude>META-INF/*.DSA</exclude>
360+
<exclude>META-INF/*.RSA</exclude>
361+
</excludes>
362+
</filter>
363+
</filters>
364+
<finalName>dist-${project.artifactId}-${project.version}</finalName>
365+
<transformers>
366+
<!-- add Main-Class to manifest file -->
367+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
368+
<mainClass>net.sansa_stack.inference.flink.RDFGraphMaterializer</mainClass>
369+
</transformer>
370+
</transformers>
371+
<createDependencyReducedPom>false</createDependencyReducedPom>
372+
<relocations>
373+
<relocation>
374+
<pattern>scopt</pattern>
375+
<shadedPattern>scopt.shaded</shadedPattern>
376+
</relocation>
377+
</relocations>
378+
</configuration>
379+
</execution>
380+
</executions>
381+
</plugin>
337382

338-
<exclude>sqlite:*</exclude>
339-
<exclude>netbeans:*</exclude>
340-
<exclude>org.apache.xmlgraphics:*</exclude>
341-
<exclude>mysql:*</exclude>
342-
</excludes>
343-
</artifactSet>
344-
<filters>
345-
<filter>
346-
<artifact>org.apache.flink:*</artifact>
347-
<excludes>
348-
<exclude>org/apache/flink/shaded/**</exclude>
349-
<exclude>web-docs/**</exclude>
350-
</excludes>
351-
</filter>
352-
<filter>
353-
<!-- Do not copy the signatures in the META-INF folder.
354-
Otherwise, this might cause SecurityExceptions when using the JAR. -->
355-
<artifact>*:*</artifact>
356-
<excludes>
357-
<exclude>META-INF/*.SF</exclude>
358-
<exclude>META-INF/*.DSA</exclude>
359-
<exclude>META-INF/*.RSA</exclude>
360-
</excludes>
361-
</filter>
362-
</filters>
363-
<finalName>dist-${project.artifactId}-${project.version}</finalName>
364-
<transformers>
365-
<!-- add Main-Class to manifest file -->
366-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
367-
<mainClass>net.sansa_stack.inference.flink.RDFGraphMaterializer</mainClass>
368-
</transformer>
369-
</transformers>
370-
<createDependencyReducedPom>false</createDependencyReducedPom>
371-
<relocations>
372-
<relocation>
373-
<pattern>scopt</pattern>
374-
<shadedPattern>scopt.shaded</shadedPattern>
375-
</relocation>
376-
</relocations>
377-
</configuration>
378-
</execution>
379-
</executions>
380-
</plugin>
381383

382384
</plugins>
383385
</build>

0 commit comments

Comments
 (0)