diff --git a/spark/core/pom.xml b/spark/core/pom.xml index 3674129b2..bbc568fb0 100644 --- a/spark/core/pom.xml +++ b/spark/core/pom.xml @@ -24,6 +24,32 @@ zingg-common-client ${zingg.version} + + zingg + zingg-common-core + tests + test-jar + ${zingg.version} + test + + + org.junit.jupiter + junit-jupiter-engine + 5.8.1 + test + + + org.junit.jupiter + junit-jupiter-api + 5.8.1 + test + + + org.junit.jupiter + junit-jupiter-params + 5.8.1 + test + @@ -54,6 +80,18 @@ ${scala.version} + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + + test-jar + + + + diff --git a/spark/spark-test/src/test/java/zingg/spark/core/executor/JunitSparkLabeller.java b/spark/core/src/test/java/zingg/spark/core/executor/JunitSparkLabeller.java similarity index 100% rename from spark/spark-test/src/test/java/zingg/spark/core/executor/JunitSparkLabeller.java rename to spark/core/src/test/java/zingg/spark/core/executor/JunitSparkLabeller.java diff --git a/spark/spark-test/src/test/java/zingg/spark/core/executor/TestSparkExecutors.java b/spark/core/src/test/java/zingg/spark/core/executor/TestSparkExecutors.java similarity index 100% rename from spark/spark-test/src/test/java/zingg/spark/core/executor/TestSparkExecutors.java rename to spark/core/src/test/java/zingg/spark/core/executor/TestSparkExecutors.java diff --git a/spark/spark-test/src/test/resources/zingg/spark/core/executor/configSparkIntTest.json b/spark/core/src/test/resources/zingg/spark/core/executor/configSparkIntTest.json similarity index 100% rename from spark/spark-test/src/test/resources/zingg/spark/core/executor/configSparkIntTest.json rename to spark/core/src/test/resources/zingg/spark/core/executor/configSparkIntTest.json diff --git a/spark/spark-test/src/test/resources/zingg/spark/core/executor/test.csv b/spark/core/src/test/resources/zingg/spark/core/executor/test.csv similarity index 100% rename from spark/spark-test/src/test/resources/zingg/spark/core/executor/test.csv rename to spark/core/src/test/resources/zingg/spark/core/executor/test.csv diff --git a/spark/pom.xml b/spark/pom.xml index 3f7444b54..2ea784073 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -11,7 +11,6 @@ core client - spark-test diff --git a/spark/spark-test/pom.xml b/spark/spark-test/pom.xml deleted file mode 100644 index 54c2255b9..000000000 --- a/spark/spark-test/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - 4.0.0 - - zingg - zingg-spark - ${zingg.version} - - zingg-spark-test - jar - - - zingg - zingg-spark-core - ${zingg.version} - - - zingg - zingg-spark-client - ${zingg.version} - - - zingg - zingg-common-core - ${zingg.version} - - - zingg - zingg-common-client - ${zingg.version} - - - zingg - zingg-common-core - tests - test-jar - ${zingg.version} - test - - - org.junit.jupiter - junit-jupiter-engine - 5.8.1 - test - - - org.junit.jupiter - junit-jupiter-api - 5.8.1 - test - - - org.junit.jupiter - junit-jupiter-params - 5.8.1 - test - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - - - - test-jar - - - - - - -