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

Commit 3b48dc9

Browse files
LorenzBuehmannLorenzBuehmann
committed
Merge branch 'release/0.1.0' into develop
2 parents 56f3c15 + adf5606 commit 3b48dc9

10 files changed

Lines changed: 137 additions & 118 deletions

File tree

‎pom.xml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>net.sansa-stack</groupId>
55
<artifactId>sansa-inference-parent_2.11</artifactId>
6-
<version>0.1.0-SNAPSHOT</version>
6+
<version>0.1.0</version>
77
<packaging>pom</packaging>
88
<name>Inference API - Parent</name>
99

@@ -54,7 +54,7 @@
5454
<maven.compiler.source>1.8</maven.compiler.source>
5555
<maven.compiler.target>1.8</maven.compiler.target>
5656
<maven.version>>=3.0</maven.version>
57-
<java.version>>=1.8</java.version>
57+
<!--<java.version>>=1.8</java.version>-->
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>
@@ -268,13 +268,13 @@
268268
<jvmArg>-XX:MaxPermSize=${MaxPermGen}</jvmArg>
269269
<jvmArg>-XX:ReservedCodeCacheSize=${CodeCacheSize}</jvmArg>
270270
</jvmArgs>
271-
<javacArgs>
272-
<javacArg>-source</javacArg>
273-
<javacArg>${java.version}</javacArg>
274-
<javacArg>-target</javacArg>
275-
<javacArg>${java.version}</javacArg>
276-
<javacArg>-Xlint:all,-serial,-path</javacArg>
277-
</javacArgs>
271+
<!--<javacArgs>-->
272+
<!--<javacArg>-source</javacArg>-->
273+
<!--<javacArg>${java.version}</javacArg>-->
274+
<!--<javacArg>-target</javacArg>-->
275+
<!--<javacArg>${java.version}</javacArg>-->
276+
<!--<javacArg>-Xlint:all,-serial,-path</javacArg>-->
277+
<!--</javacArgs>-->
278278

279279
</configuration>
280280
</execution>
@@ -307,6 +307,9 @@
307307
<groupId>org.scalatest</groupId>
308308
<artifactId>scalatest-maven-plugin</artifactId>
309309
<version>1.0</version>
310+
<configuration>
311+
<tagsToExclude>net.sansa_stack.test.conformance.IntegrationTestSuite</tagsToExclude>
312+
</configuration>
310313
</plugin>
311314

312315
<!-- Gitflow -->
@@ -336,9 +339,9 @@
336339
<requireMavenVersion>
337340
<version>${maven.version}</version>
338341
</requireMavenVersion>
339-
<requireJavaVersion>
340-
<version>${java.version}</version>
341-
</requireJavaVersion>
342+
<!--<requireJavaVersion>-->
343+
<!--<version>${java.version}</version>-->
344+
<!--</requireJavaVersion>-->
342345
<bannedDependencies>
343346
<excludes>
344347
<!--

‎sansa-inference-common/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<parent>
55
<artifactId>sansa-inference-parent_2.11</artifactId>
66
<groupId>net.sansa-stack</groupId>
7-
<version>0.1.0-SNAPSHOT</version>
7+
<version>0.1.0</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<groupId>net.sansa-stack</groupId>
1111
<artifactId>sansa-inference-common_${scala.binary.version}</artifactId>
12-
<version>0.1.0-SNAPSHOT</version>
12+
<version>0.1.0</version>
1313
<name>Inference API - Common</name>
1414
<description>A set of common objects used in the Inference API</description>
1515

@@ -83,8 +83,8 @@
8383
<build>
8484
<sourceDirectory>src/main/scala</sourceDirectory>
8585
<testSourceDirectory>src/test/scala</testSourceDirectory>
86-
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
87-
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
86+
<!--<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>-->
87+
<!--<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>-->
8888
<plugins>
8989
<plugin>
9090
<!-- see http://davidb.github.com/scala-maven-plugin -->

‎sansa-inference-flink/pom.xml‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ under the License.
2323
<parent>
2424
<groupId>net.sansa-stack</groupId>
2525
<artifactId>sansa-inference-parent_2.11</artifactId>
26-
<version>0.1.0-SNAPSHOT</version>
26+
<version>0.1.0</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929
<groupId>net.sansa-stack</groupId>
3030
<artifactId>sansa-inference-flink_${scala.binary.version}</artifactId>
31-
<version>0.1.0-SNAPSHOT</version>
31+
<version>0.1.0</version>
3232

3333
<name>Inference API - Flink</name>
3434
<description>Apache Flink based inference layer for RDF and OWL</description>
@@ -115,8 +115,8 @@ under the License.
115115
except flink and its transitive dependencies. The resulting fat-jar can be executed
116116
on a cluster. Change the value of Program-Class if your program entry point changes. -->
117117
<build>
118-
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
119-
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
118+
<!--<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>-->
119+
<!--<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>-->
120120
<plugins>
121121
<!-- We use the maven-shade plugin to create a fat jar that contains all dependencies
122122
except flink and it's transitive dependencies. The resulting fat-jar can be executed
@@ -284,6 +284,29 @@ under the License.
284284
</executions>
285285
</plugin>
286286

287+
288+
<!-- disable surefire -->
289+
<plugin>
290+
<groupId>org.apache.maven.plugins</groupId>
291+
<artifactId>maven-surefire-plugin</artifactId>
292+
<version>2.19.1</version>
293+
<configuration>
294+
<useFile>false</useFile>
295+
<disableXmlReport>true</disableXmlReport>
296+
<!--<forkCount>1</forkCount>-->
297+
<!--<reuseForks>false</reuseForks>-->
298+
299+
<!-- If you have classpath issue like NoDefClassError,... -->
300+
<!-- useManifestOnlyJar>false</useManifestOnlyJar -->
301+
<threadCountSuites>4</threadCountSuites>
302+
<includes>
303+
<include>**/*Test.*</include>
304+
<include>**/*Suite.*</include>
305+
</includes>
306+
<skipTests>true</skipTests>
307+
</configuration>
308+
</plugin>
309+
287310
<!-- Adding scala source directories to build path -->
288311
<plugin>
289312
<groupId>org.codehaus.mojo</groupId>

‎sansa-inference-flink/src/test/scala/net/sansa_stack/inference/flink/conformance/FlinkBug.scala‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎sansa-inference-flink/src/test/scala/net/sansa_stack/inference/flink/conformance/FlinkBugTest.scala‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎sansa-inference-flink/src/test/scala/net/sansa_stack/inference/flink/conformance/OWLHorstConformanceTest.scala‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package net.sansa_stack.inference.flink.conformance
22

33
import net.sansa_stack.inference.flink.data.RDFGraphWriter
4-
import net.sansa_stack.test.conformance.OWLHorstConformanceTestBase
4+
import net.sansa_stack.test.conformance.{IntegrationTestSuite, OWLHorstConformanceTestBase}
55
import org.apache.flink.api.scala._
66
import org.apache.jena.rdf.model.Model
77
import net.sansa_stack.inference.data.RDFTriple
88
import net.sansa_stack.inference.flink.data.{RDFGraph, RDFGraphWriter}
9+
import org.scalatest.Ignore
910

1011
import scala.collection.mutable
1112

@@ -15,6 +16,7 @@ import scala.collection.mutable
1516
* @author Lorenz Buehmann
1617
*
1718
*/
19+
@IntegrationTestSuite
1820
class OWLHorstConformanceTest extends OWLHorstConformanceTestBase with SharedOWLHorstReasonerContext{
1921

2022
override def computeInferredModel(triples: mutable.HashSet[RDFTriple]): Model = {

‎sansa-inference-flink/src/test/scala/net/sansa_stack/inference/flink/conformance/RDFSConformanceTest.scala‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package net.sansa_stack.inference.flink.conformance
22

33
import net.sansa_stack.inference.flink.data.RDFGraphWriter
4-
import net.sansa_stack.test.conformance.RDFSConformanceTestBase
4+
import net.sansa_stack.test.conformance.{IntegrationTestSuite, RDFSConformanceTestBase}
55
import org.apache.jena.rdf.model.Model
66
import net.sansa_stack.inference.data.RDFTriple
77
import net.sansa_stack.inference.flink.data.RDFGraph
88
import org.apache.flink.api.scala._
9+
import org.scalatest.Ignore
910

1011
import scala.collection.mutable
1112

@@ -15,6 +16,7 @@ import scala.collection.mutable
1516
* @author Lorenz Buehmann
1617
*
1718
*/
19+
@IntegrationTestSuite
1820
class RDFSConformanceTest extends RDFSConformanceTestBase with SharedRDFSReasonerContext{
1921

2022
override def computeInferredModel(triples: mutable.HashSet[RDFTriple]): Model = {

‎sansa-inference-spark/pom.xml‎

Lines changed: 65 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<parent>
55
<groupId>net.sansa-stack</groupId>
66
<artifactId>sansa-inference-parent_2.11</artifactId>
7-
<version>0.1.0-SNAPSHOT</version>
7+
<version>0.1.0</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<groupId>net.sansa-stack</groupId>
1111
<artifactId>sansa-inference-spark_${scala.binary.version}</artifactId>
12-
<version>0.1.0-SNAPSHOT</version>
12+
<version>0.1.0</version>
1313

1414
<name>Inference API - Spark</name>
1515
<description>Apache Spark based inference layer for RDF and OWL</description>
@@ -142,8 +142,8 @@
142142
<build>
143143
<sourceDirectory>src/main/scala</sourceDirectory>
144144
<testSourceDirectory>src/test/scala</testSourceDirectory>
145-
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
146-
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
145+
<!--<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>-->
146+
<!--<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>-->
147147
<plugins>
148148
<plugin>
149149
<groupId>net.alchim31.maven</groupId>
@@ -247,6 +247,7 @@
247247
<exclude>org.apache.spark:spark-core_${scala.binary.version}</exclude>
248248
<exclude>org.apache.spark:spark-sql_${scala.binary.version}</exclude>
249249
<exclude>org.apache.spark:spark-graphx_${scala.binary.version}</exclude>
250+
<exclude>org.apache.spark:*</exclude>
250251
<exclude>org.eclipse.jetty:jetty-server</exclude>
251252
<exclude>org.eclipse.jetty:jetty-continuation</exclude>
252253
<exclude>org.eclipse.jetty:jetty-http</exclude>
@@ -261,6 +262,66 @@
261262
<exclude>org.scala-lang:scala-library</exclude>
262263
<exclude>org.scala-lang:scala-compiler</exclude>
263264
<exclude>org.scala-lang:scala-reflect</exclude>
265+
<exclude>commons-cli:commons-cli</exclude>
266+
<exclude>commons-codec:commons-codec</exclude>
267+
<exclude>commons-collections:commons-collections</exclude>
268+
<exclude>commons-configuration:commons-configuration</exclude>
269+
<exclude>commons-digester:commons-digester</exclude>
270+
<exclude>commons-httpclient:commons-httpclient</exclude>
271+
<exclude>commons-io:commons-io</exclude>
272+
<exclude>commons-lang:commons-lang</exclude>
273+
<exclude>commons-logging:commons-logging</exclude>
274+
<exclude>commons-net:commons-net</exclude>
275+
<exclude>io.dropwizard.metrics:metrics*</exclude>
276+
<exckude>io.netty:netty*</exckude>
277+
<exclude>javax.activation:activation</exclude>
278+
<exclude>javax.annotation:javax.annotation-api</exclude>
279+
<exclude>javax.servlet:javax.servlet-api</exclude>
280+
<exclude>javax.servlet.jsp:jsp-api</exclude>
281+
<exclude>javax.servlet:servlet-api</exclude>
282+
<exclude>javax.validation:validation-api</exclude>
283+
<exclude>javax.ws.rs:javax.ws.rs-api</exclude>
284+
<exclude>javax.xml.bind:jaxb-api</exclude>
285+
<exclude>javax.xml.stream:stax-api</exclude>
286+
<exclude>jdk.tools:jdk.tools</exclude>
287+
<exclude>net.java.dev.jets3t:jets3t</exclude>
288+
<exclude>net.jpountz.lz4:lz4</exclude>
289+
<exclude>net.razorvine:pyrolite</exclude>
290+
<exclude>net.sf.py4j:py4j</exclude>
291+
<exclude>org.antlr:antlr4-runtime</exclude>
292+
<exclude>org.apache.avro:avro*</exclude>
293+
<exclude>org.apache.commons:commons-lang3</exclude>
294+
<exclude>org.apache.commons:commons-math3</exclude>
295+
<exclude>org.apache.commons:commons-compress</exclude>
296+
<exclude>org.apache.curator:curator*</exclude>
297+
<exclude>org.apache.directory.api:*</exclude>
298+
<exclude>org.apache.directory.server:*</exclude>
299+
<exclude>org.apache.hadoop:*</exclude>
300+
<exclude>org.apache.htrace:htrace-core</exclude>
301+
<exclude>org.apache.httpcomponents:*</exclude>
302+
<exclude>org.apache.ivy:ivy</exclude>
303+
<exclude>org.apache.mesos:mesos</exclude>
304+
<exclude>org.apache.parquet:parquet*</exclude>
305+
<exclude>org.apache.xbean:xbean-asm5-shaded</exclude>
306+
<exclude>org.apache.zookeeper:zookeeper</exclude>
307+
<exclude>org.codehaus.jackson:jackson-*</exclude>
308+
<exclude>org.codehaus.janino:*</exclude>
309+
<exclude>org.codehaus.jettison:jettison</exclude>
310+
<exclude>org.fusesource.leveldbjni:leveldbjni-all</exclude>
311+
<exckude>org.glassfish.hk2*</exckude>
312+
<exclude>org.glassfish.jersey*</exclude>
313+
<exclude>org.javassist:javassist</exclude>
314+
<exclude>org.json4s:json4s*</exclude>
315+
<exclude>org.mortbay.jetty:jetty*</exclude>
316+
<exclude>org.objenesis:objenesis</exclude>
317+
<exclude>org.roaringbitmap:RoaringBitmap</exclude>
318+
<exclude>org.scala-lang:*</exclude>
319+
<exclude>org.slf4j:jul-to-slf4j</exclude>
320+
<exclude>org.slf4j:jcl-over-slf4j</exclude>
321+
<exclude>org.spark-project.spark:unused</exclude>
322+
<exclude>org.xerial.snappy:snappy-java</exclude>
323+
<exclude>oro:oro</exclude>
324+
<exclude>xmlenc:xmlenc</exclude>
264325
</excludes>
265326

266327
</artifactSet>

0 commit comments

Comments
 (0)