dist profile on sansa-stack-spark now yields correct filename for jar…

… with dependencies. experimenting with paranamer dependency....
SANSA-Stack · Dec 15, 2020 · 6b1fa60 · 6b1fa60
1 parent 0a0c490
commit 6b1fa60
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -112,6 +112,7 @@
 		<module>sansa-inference</module>
 		<module>sansa-ml</module>
 		<module>sansa-examples</module>
+		<module>sansa-integration-tests</module>
 	</modules>
 
 
@@ -199,6 +200,14 @@
 				<version>${project.version}</version>
 			</dependency>
 
+			<!-- Fix for https://stackoverflow.com/questions/64453555/error-with-sansa-unable-to-create-rdd-from-nt-file -->
+<!--
+			<dependency>
+				<groupId>com.thoughtworks.paranamer</groupId>
+				<artifactId>paranamer</artifactId>
+				<version>2.8</version>
+			</dependency>
+-->
 
 			<!-- Kryo -->
 			<!-- Note: don't use versions above 0.43 for now, for whatever reason they depend on Kryo 5.0.0 RC1 which is
@@ -1043,6 +1052,12 @@
 				<version>20180130</version>
 			</dependency>
 
+			<dependency>
+				<groupId>it.unimi.dsi</groupId>
+				<artifactId>fastutil</artifactId>
+				<version>8.1.0</version>
+			</dependency>
+
 			<!-- FasterXML -->
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>

diff --git a/...tegration-tests/src/test/java/net/sansa_stack/integration/test/SansaIntegrationTests.java b/...tegration-tests/src/test/java/net/sansa_stack/integration/test/SansaIntegrationTests.java
@@ -56,12 +56,15 @@ public InputStream openStream() throws IOException {
     @Test
     public void testSparkSubmit() throws Exception {
         String url = "spark://localhost:7077";
-        String jar = "../sansa-examples/sansa-examples-spark/target/sansa-examples-spark_2.12-0.7.2-SNAPSHOT-jar-with-dependencies.jar";
+
+        String jar = "../sansa-stack/sansa-stack-spark/target/sansa-stack-spark_2.12-0.7.2-SNAPSHOT-jar-with-dependencies.jar";
+//        String jar = "../sansa-examples/sansa-examples-spark/target/sansa-examples-spark_2.12-0.7.2-SNAPSHOT-jar-with-dependencies.jar";
 
         // TODO mkdir /tmp/spark-events
 
         String[] args = new String[] {
-                "--class", "net.sansa_stack.examples.spark.query.Sparklify",
+                //"--class", "net.sansa_stack.examples.spark.query.Sparklify",
+                "--class", "net.sansa_stack.query.spark.sparqlify.server.MainSansaSparqlServer",
                 "--master", url,
                 "--num-executors", "2",
                 "--executor-memory", "1G",

diff --git a/sansa-rdf/sansa-rdf-spark/pom.xml b/sansa-rdf/sansa-rdf-spark/pom.xml
@@ -48,10 +48,16 @@
             <artifactId>spark-mllib_${scala.binary.version}</artifactId>
         </dependency>
 
-        <dependency>
+		<!--
+		<dependency>
+			<groupId>com.thoughtworks.paranamer</groupId>
+			<artifactId>paranamer</artifactId>
+		</dependency>
+		-->
+
+		<dependency>
             <groupId>it.unimi.dsi</groupId>
             <artifactId>fastutil</artifactId>
-            <version>8.1.0</version>
         </dependency>
 
         <!-- Test -->

diff --git a/sansa-stack/sansa-stack-spark/pom.xml b/sansa-stack/sansa-stack-spark/pom.xml
@@ -75,6 +75,7 @@
                                     <goal>shade</goal>
                                 </goals>
                                 <configuration>
+                                    <outputFile>${project.build.directory}/${project.artifactId}-${project.version}-jar-with-dependencies.jar</outputFile>
 <!--                                    <minimizeJar>true</minimizeJar>-->
                                     <artifactSet>
                                         <excludes>