From e094bd832417118773e04c36fe356768a41da868 Mon Sep 17 00:00:00 2001 From: Gezim Sejdiu Date: Sun, 16 Jun 2019 00:15:58 +0200 Subject: [PATCH 1/5] Configured for sansa-parent --- pom.xml | 1133 ++++++++------------------------ sansa-inference-common/pom.xml | 2 - sansa-inference-flink/pom.xml | 2 - sansa-inference-spark/pom.xml | 2 - sansa-inference-tests/pom.xml | 2 - 5 files changed, 279 insertions(+), 862 deletions(-) diff --git a/pom.xml b/pom.xml index aab5acb..addb92a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,856 +1,281 @@ - - 4.0.0 - net.sansa-stack - sansa-inference-parent_2.11 - 0.5.1-SNAPSHOT - pom - Inference API - Parent - - An inference layer for RDF and OWL - - - Smart Data Analytics (SDA) Research Group - http://sda.tech/ - - - 2016 - - http://sansa-stack.net/ - - - - Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - scm:git:https://github.com/SANSA-Stack/SANSA-Inference.git - https://github.com/SANSA-Stack/SANSA-Inference - scm:git:https://github.com/SANSA-Stack/SANSA-Inference.git - - - - - - lorenz - Lorenz Buehmann - buehmann@informatik.uni-leipzig.de - AKSW, Department of Computer Science, University of Leipzig - http://www.aksw.org - - developer - - 0 - - - - - GitHub - https://github.com/SANSA-Stack/SANSA-Inference - - - - sansa-inference-common - sansa-inference-flink - sansa-inference-spark - sansa-inference-tests - - - - 1.8 - 1.8 - >=3.0 - UTF-8 - UTF-8 - 2.11.12 - 2.11 - 2.4.0 - 1.7.0 - 3.9.0 - 0.5.1-SNAPSHOT - ${sansa.stack.version} - ${sansa.stack.version} - 0.4.2-SNAPSHOT - 1 - ${jena.version}-${jsa.subversion} - 64m - 512m - 512m - AKSW - 5.1.5 - ${project.basedir}/scalastyle-config.xml - - - - 3.1 - - - - - - - ${project.groupId} - sansa-rdf-spark_${scala.binary.version} - ${sansa.rdf.version} - - - - net.jpountz.lz4 - lz4 - - - - - ${project.groupId} - sansa-rdf-partition-core - ${sansa.rdf.version} - - - - net.sansa-stack - sansa-owl-spark_${scala.binary.version} - ${sansa.owl.version} - - - - ${project.groupId} - sansa-query-spark-sparqlify - ${sansa.query.version} - - - org.aksw.jena-sparql-api - jena-sparql-api-server-standalone - ${jsa.version} - - - xml-apis - xml-apis - - - org.eclipse.jetty - jetty-xml - - - - - - - org.scala-lang - scala-library - ${scala.version} - - - - org.apache.hadoop - hadoop-client - 2.7.0 - - - - - org.apache.spark - spark-core_${scala.binary.version} - ${spark.version} - - - org.apache.spark - spark-sql_${scala.binary.version} - ${spark.version} - - - org.apache.spark - spark-streaming_${scala.binary.version} - ${spark.version} - - - org.apache.spark - spark-streaming-kafka-0-10_${scala.binary.version} - ${spark.version} - - - - - org.apache.flink - flink-scala_${scala.binary.version} - ${flink.version} - - - org.apache.flink - flink-streaming-scala_${scala.binary.version} - ${flink.version} - - - org.apache.flink - flink-clients_${scala.binary.version} - ${flink.version} - - - - - org.apache.jena - jena-core - ${jena.version} - - - org.apache.jena - jena-arq - ${jena.version} - - - org.apache.jena - jena-tdb - ${jena.version} - - - org.apache.jena - jena-cmds - ${jena.version} - - - - - net.sourceforge.owlapi - owlapi-api - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-apibinding - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-impl - ${owlapi.version} - - - net.sourceforge.owlapi - owlapi-parsers - ${owlapi.version} - - - - - org.scala-graph - graph-core_${scala.binary.version} - 1.12.5 - - - org.scala-graph - graph-dot_${scala.binary.version} - 1.11.5 - - - org.jgrapht - jgrapht-core - 1.2.0 - - - org.jgrapht - jgrapht-io - 1.2.0 - - - org.jgrapht - jgrapht-ext - 1.2.0 - - - org.gephi - gephi-toolkit - 0.9.2 - - - - - org.apache.calcite - calcite-core - 1.16.0 - - - - - junit - junit - 4.12 - test - - - org.scalatest - scalatest_${scala.binary.version} - 3.0.4 - test - - - org.specs2 - specs2-core_${scala.binary.version} - 4.2.0 - test - - - org.specs2 - specs2-junit_${scala.binary.version} - 4.2.0 - test - - - - - com.typesafe.scala-logging - scala-logging_${scala.binary.version} - 3.9.0 - - - - - com.google.guava - guava - 22.0 - - - - - com.chuusai - shapeless_${scala.binary.version} - 2.3.3 - - - - - com.github.scopt - scopt_${scala.binary.version} - 3.7.0 - - - - - com.typesafe - config - 1.3.3 - - - - - org.apache.hadoop - hadoop-common - 2.9.0 - - - - org.apache.commons - commons-compress - 1.18 - - - - - - - org.scalatest - scalatest_${scala.binary.version} - test - - - - - - - - - net.alchim31.maven - scala-maven-plugin - 3.3.1 - - - - compile - testCompile - - - ${scala.version} - incremental - true - - -unchecked - -deprecation - -feature - -dependencyfile - ${project.build.directory}/.scala_dependencies - -Xmax-classfile-name - 128 - - - -Xms1024m - -Xmx1024m - -XX:PermSize=${PermGen} - -XX:MaxPermSize=${MaxPermGen} - -XX:ReservedCodeCacheSize=${CodeCacheSize} - - - - - - - - - - - - - - ${scala.version} - incremental - - - - - maven-compiler-plugin - 3.7.0 - - ${maven.compiler.source} - ${maven.compiler.target} - ${project.build.sourceEncoding} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20.1 - - - - - org.scalatest - scalatest-maven-plugin - 2.0.0 - - net.sansa_stack.test.conformance.IntegrationTestSuite - - - - - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.8.0 - - - false - false - - - master - develop - feature/ - release/ - hotfix/ - support/ - v - origin - - false - - - - - org.codehaus.mojo - versions-maven-plugin - 2.5 - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M1 - - - enforce-versions - - enforce - - - - - ${maven.version} - - - - - - - - org.jboss.netty - org.codehaus.groovy - - true - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - add-source - generate-sources - - add-source - - - - src/main/scala_${scala.binary.version} - - - - - - - com.versioneye - versioneye-maven-plugin - 3.11.4 - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.0-M1 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.0 - - - - maven-resources-plugin - 3.0.2 - - - - maven-assembly-plugin - 3.1.0 - - - - maven-dependency-plugin - 3.0.2 - - - - - - - - com.versioneye - versioneye-maven-plugin - - - - - org.scalastyle - scalastyle-maven-plugin - 1.0.0 - - false - true - true - false - ${project.basedir}/src/main/scala - ${project.basedir}/src/test/scala - - ${scalastyle.config.path} - ${project.basedir}/scalastyle-output.xml - UTF-8 - - - - - check - - - - - - - - - - - maven.aksw.internal - AKSW Release Repository - http://maven.aksw.org/archiva/repository/internal - - - maven.aksw.snapshots - AKSW Snapshot Repository - http://maven.aksw.org/archiva/repository/snapshots - - - - - - oss-sonatype - oss-sonatype - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - - apache-snapshot - Apache repository (snapshots) - https://repository.apache.org/content/repositories/snapshots/ - - true - - - - maven.aksw.snapshots - AKSW Snapshot Repository - http://maven.aksw.org/archiva/repository/snapshots - - false - - - true - - - - - - - scala-2.10 - - scala-2.10 - - - 2.10.6 - 2.10 - ${scala.version} - org.scala-lang - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-versions - - enforce - - - - - - *:*_2.11 - - - - - - - - - - - - scala-2.11 - - !scala-2.10 - - - 2.11.8 - 2.11 - 2.12.1 - jline - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-versions - - enforce - - - - - - *:*_2.10 - - - - - - - - - - - - - - - release - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - net.alchim31.maven - scala-maven-plugin - 3.2.2 - - - - compile - testCompile - - - ${scala.version} - incremental - true - - -unchecked - -deprecation - -feature - -dependencyfile - ${project.build.directory}/.scala_dependencies - -Xmax-classfile-name - 128 - - - -Xms1024m - -Xmx1024m - -XX:PermSize=${PermGen} - -XX:MaxPermSize=${MaxPermGen} - -XX:ReservedCodeCacheSize=${CodeCacheSize} - - - - - - - - - - - - - attach-javadocs - - doc-jar - - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - verify - attach-sources - - jar - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - AKSW - ${gpg.keyname} - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://oss.sonatype.org/ - true - - - - - - - - - root-dir - - - ${project.basedir}/../../scalastyle-config.xml - - - - ${project.basedir}/../scalastyle-config.xml - - - + + 4.0.0 + + + net.sansa-stack + sansa-parent + 0.5.1-SNAPSHOT + + + sansa-inference-parent_2.11 + pom + Inference API - Parent + + An inference layer for RDF and OWL + + + Smart Data Analytics (SDA) Research Group + http://sda.tech/ + + + 2016 + + http://sansa-stack.net/ + + + + Apache License 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + scm:git:https://github.com/SANSA-Stack/SANSA-Inference.git + https://github.com/SANSA-Stack/SANSA-Inference + scm:git:https://github.com/SANSA-Stack/SANSA-Inference.git + + + + + + lorenz + Lorenz Buehmann + buehmann@informatik.uni-leipzig.de + AKSW, Department of Computer Science, University of Leipzig + http://www.aksw.org + + developer + + 0 + + + + + GitHub + https://github.com/SANSA-Stack/SANSA-Inference + + + + sansa-inference-common + sansa-inference-flink + sansa-inference-spark + sansa-inference-tests + + + + + + + + ${project.groupId} + sansa-rdf-spark_${scala.binary.version} + ${sansa.rdf.version} + + + + net.jpountz.lz4 + lz4 + + + + + + net.sansa-stack + sansa-owl-spark_${scala.binary.version} + ${sansa.owl.version} + + + + ${project.groupId} + sansa-query-spark-sparqlify + ${sansa.query.version} + + + + + + + + maven.aksw.internal + AKSW Release Repository + http://maven.aksw.org/archiva/repository/internal + + + maven.aksw.snapshots + AKSW Snapshot Repository + http://maven.aksw.org/archiva/repository/snapshots + + + + + + oss-sonatype + oss-sonatype + https://oss.sonatype.org/content/repositories/snapshots/ + + true + + + + apache-snapshot + Apache repository (snapshots) + https://repository.apache.org/content/repositories/snapshots/ + + true + + + + maven.aksw.snapshots + AKSW Snapshot Repository + http://maven.aksw.org/archiva/repository/snapshots + + false + + + true + + + + + + + + + release + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + net.alchim31.maven + scala-maven-plugin + 3.2.2 + + + + compile + testCompile + + + ${scala.version} + incremental + true + + -unchecked + -deprecation + -feature + -dependencyfile + ${project.build.directory}/.scala_dependencies + -Xmax-classfile-name + 128 + + + -Xms1024m + -Xmx1024m + -XX:PermSize=${PermGen} + -XX:MaxPermSize=${MaxPermGen} + -XX:ReservedCodeCacheSize=${CodeCacheSize} + + + + + + + + + + + + + attach-javadocs + + doc-jar + + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + verify + attach-sources + + jar + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + AKSW + ${gpg.keyname} + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org/ + true + + + + + + + + + root-dir + + + ${project.basedir}/../../scalastyle-config.xml + + + + ${project.basedir}/../scalastyle-config.xml + + + diff --git a/sansa-inference-common/pom.xml b/sansa-inference-common/pom.xml index 38bbb81..e9201eb 100644 --- a/sansa-inference-common/pom.xml +++ b/sansa-inference-common/pom.xml @@ -7,9 +7,7 @@ 0.5.1-SNAPSHOT ../pom.xml - net.sansa-stack sansa-inference-common_${scala.binary.version} - 0.5.1-SNAPSHOT Inference API - Common A set of common objects used in the Inference API diff --git a/sansa-inference-flink/pom.xml b/sansa-inference-flink/pom.xml index c037344..967060e 100644 --- a/sansa-inference-flink/pom.xml +++ b/sansa-inference-flink/pom.xml @@ -26,9 +26,7 @@ under the License. 0.5.1-SNAPSHOT ../pom.xml - net.sansa-stack sansa-inference-flink_${scala.binary.version} - 0.5.1-SNAPSHOT Inference API - Flink Apache Flink based inference layer for RDF and OWL diff --git a/sansa-inference-spark/pom.xml b/sansa-inference-spark/pom.xml index 5a3257d..7d4d692 100644 --- a/sansa-inference-spark/pom.xml +++ b/sansa-inference-spark/pom.xml @@ -7,9 +7,7 @@ 0.5.1-SNAPSHOT ../pom.xml - net.sansa-stack sansa-inference-spark_${scala.binary.version} - 0.5.1-SNAPSHOT Inference API - Spark Apache Spark based inference layer for RDF and OWL diff --git a/sansa-inference-tests/pom.xml b/sansa-inference-tests/pom.xml index 613d9a9..8cc02d9 100644 --- a/sansa-inference-tests/pom.xml +++ b/sansa-inference-tests/pom.xml @@ -7,9 +7,7 @@ 0.5.1-SNAPSHOT ../pom.xml - net.sansa-stack sansa-inference-tests_${scala.binary.version} - 0.5.1-SNAPSHOT Inference API - Tests Contains common data and utils for inference API testing From e89e5de53eb5e8062989a08394c5a7e7804705a1 Mon Sep 17 00:00:00 2001 From: Claus Stadler Date: Mon, 17 Jun 2019 03:04:43 +0200 Subject: [PATCH 2/5] Added eclipse git ignores --- .gitignore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitignore b/.gitignore index ef9a45f..b1af6aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.class *.log +*.swp # sbt specific .cache @@ -20,5 +21,19 @@ project/plugins/project/ scalastyle-output.xml +# eclipse conf file +.settings +.classpath +.project +.manager +.scala_dependencies +.cashe +.cache-main +.cache-tests +.classpath +#.coveralls.yml +deptree.txt + + # Protege files catalog-v001.xml From 620c38840f5a83d48cbc9ba302b7e598df06801b Mon Sep 17 00:00:00 2001 From: Lorenz Buehmann Date: Tue, 18 Jun 2019 10:14:41 +0200 Subject: [PATCH 3/5] Do not overwrite Scala version from Parent module. --- sansa-inference-spark/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sansa-inference-spark/pom.xml b/sansa-inference-spark/pom.xml index 7d4d692..7236d18 100644 --- a/sansa-inference-spark/pom.xml +++ b/sansa-inference-spark/pom.xml @@ -14,7 +14,7 @@ compile - 2.11.11 + 0.3.1-SNAPSHOT From b2a702f6644ddae5a77aed3ce7910d6d1f7bf213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20B=C3=BChmann?= Date: Tue, 18 Jun 2019 09:26:42 +0000 Subject: [PATCH 4/5] Update .travis.yml JDK 8 as target --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9374038..572a313 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,9 @@ cache: directories: - $HOME/.m2 scala: - - 2.11.11 + - 2.11.12 +jdk: + - oraclejdk8 script: - mvn scalastyle:check - - mvn test \ No newline at end of file + - mvn test From 8fd67b6e037d7089e4e6a225002fdc9e823758f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20B=C3=BChmann?= Date: Tue, 18 Jun 2019 09:32:01 +0000 Subject: [PATCH 5/5] Update .travis.yml Oraclejdk8 not available on Travis CI with Xenial --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 572a313..cd65925 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ cache: scala: - 2.11.12 jdk: - - oraclejdk8 + - openjdk8 script: - mvn scalastyle:check - mvn test