This is an automated email from the ASF dual-hosted git repository.
bertty pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git
The following commit(s) were added to refs/heads/main by this push:
new 017941b [RELEASE][PREPARATION] minor correction in errors not critical
017941b is described below
commit 017941b34782f3c6086e3cea2a7388c9e4b277b6
Author: Bertty Contreras-Rojas <[email protected]>
AuthorDate: Wed Oct 13 19:41:35 2021 +0200
[RELEASE][PREPARATION] minor correction in errors not critical
Signed-off-by: bertty <[email protected]>
---
pom.xml | 16 +++---
wayang-api/wayang-api-scala-java/pom.xml | 17 ------
.../wayang-api-scala-java_2.11/pom.xml | 25 +++++++++
.../wayang-api-scala-java_2.12/pom.xml | 25 +++++++++
wayang-benchmark/pom.xml | 10 ----
wayang-benchmark/wayang-benchmark_2.11/pom.xml | 23 ++++++++
wayang-benchmark/wayang-benchmark_2.12/pom.xml | 23 ++++++++
wayang-platforms/wayang-flink/pom.xml | 26 ---------
.../wayang-flink/wayang-flink_2.11/pom.xml | 27 +++++++++-
.../wayang-flink/wayang-flink_2.12/pom.xml | 27 +++++++++-
wayang-platforms/wayang-spark/pom.xml | 16 ------
.../wayang-spark/wayang-spark_2.11/pom.xml | 35 ++++++++++++
.../wayang-spark/wayang-spark_2.12/pom.xml | 18 +++++++
wayang-plugins/wayang-iejoin/pom.xml | 10 ----
.../wayang-iejoin/wayang-iejoin_2.11/pom.xml | 17 ++++++
.../wayang-iejoin/wayang-iejoin_2.12/pom.xml | 17 ++++++
wayang-profiler/pom.xml | 10 ----
wayang-profiler/wayang-profiler_2.11/pom.xml | 15 ++++++
wayang-profiler/wayang-profiler_2.12/pom.xml | 17 ++++++
wayang-tests-integration/pom.xml | 60 ---------------------
.../wayang-tests-integration_2.11/pom.xml | 60 +++++++++++++++++++++
.../wayang-tests-integration_2.12/pom.xml | 62 ++++++++++++++++++++++
22 files changed, 397 insertions(+), 159 deletions(-)
diff --git a/pom.xml b/pom.xml
index 05ad640..d3436ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -523,7 +523,7 @@
<configuration>
<sources>
<source>src/main/java</source>
-
<source>src/main/java_${scala.mayor.version}</source>
+ <source>src/main/java_2.11</source>
</sources>
</configuration>
</execution>
@@ -542,7 +542,7 @@
</resource>
<resource>
<directory>
-
src/main/resources_${scala.mayor.version}
+ src/main/resources_2.11
</directory>
</resource>
</resources>
@@ -557,7 +557,7 @@
<configuration>
<sources>
<source>src/test/java</source>
-
<source>src/test/java_${scala.mayor.version}</source>
+ <source>src/test/java_2.11</source>
</sources>
</configuration>
</execution>
@@ -576,7 +576,7 @@
</resource>
<resource>
<directory>
-
src/test/resources_${scala.mayor.version}
+ src/test/resources_2.11
</directory>
</resource>
</resources>
@@ -615,7 +615,7 @@
<configuration>
<sources>
<source>src/main/java</source>
-
<source>src/main/java_${scala.mayor.version}</source>
+ <source>src/main/java_2.12</source>
</sources>
</configuration>
</execution>
@@ -634,7 +634,7 @@
</resource>
<resource>
<directory>
-
src/main/resources_${scala.mayor.version}
+ src/main/resources_2.12
</directory>
</resource>
</resources>
@@ -649,7 +649,7 @@
<configuration>
<sources>
<source>src/test/java</source>
-
<source>src/test/java_${scala.mayor.version}</source>
+ <source>src/test/java_2.12</source>
</sources>
</configuration>
</execution>
@@ -668,7 +668,7 @@
</resource>
<resource>
<directory>
-
src/test/resources_${scala.mayor.version}
+ src/test/resources_2.12
</directory>
</resource>
</resources>
diff --git a/wayang-api/wayang-api-scala-java/pom.xml
b/wayang-api/wayang-api-scala-java/pom.xml
index cc6e2b4..98cbad0 100644
--- a/wayang-api/wayang-api-scala-java/pom.xml
+++ b/wayang-api/wayang-api-scala-java/pom.xml
@@ -78,28 +78,11 @@
</dependency>
<dependency>
<groupId>org.apache.wayang</groupId>
- <artifactId>wayang-spark_${scala.mayor.version}</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_${scala.mayor.version}</artifactId>
- <version>${spark.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.wayang</groupId>
<artifactId>wayang-sqlite3</artifactId>
<version>0.6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>test</scope>
diff --git
a/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.11/pom.xml
b/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.11/pom.xml
index 8130302..2d49454 100644
--- a/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.11/pom.xml
+++ b/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.11/pom.xml
@@ -29,4 +29,29 @@
<artifactId>wayang-api-scala-java_2.11</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-spark_2.11</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.11</artifactId>
+ <version>${spark.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-graphx_2.11</artifactId>
+ <version>${spark.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git
a/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.12/pom.xml
b/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.12/pom.xml
index 2336ea2..e1e289b 100644
--- a/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.12/pom.xml
+++ b/wayang-api/wayang-api-scala-java/wayang-api-scala-java_2.12/pom.xml
@@ -29,5 +29,30 @@
<artifactId>wayang-api-scala-java_2.12</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-spark_2.12</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.12</artifactId>
+ <version>${spark.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-graphx_2.12</artifactId>
+ <version>${spark.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/wayang-benchmark/pom.xml b/wayang-benchmark/pom.xml
index 7ba00ca..bde6523 100644
--- a/wayang-benchmark/pom.xml
+++ b/wayang-benchmark/pom.xml
@@ -46,21 +46,11 @@
</dependency>
<dependency>
<groupId>org.apache.wayang</groupId>
- <artifactId>wayang-api-scala-java_${scala.mayor.version}</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wayang</groupId>
<artifactId>wayang-java</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.wayang</groupId>
- <artifactId>wayang-spark_${scala.mayor.version}</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wayang</groupId>
<artifactId>wayang-postgres</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
diff --git a/wayang-benchmark/wayang-benchmark_2.11/pom.xml
b/wayang-benchmark/wayang-benchmark_2.11/pom.xml
index b7080b0..0d863bb 100644
--- a/wayang-benchmark/wayang-benchmark_2.11/pom.xml
+++ b/wayang-benchmark/wayang-benchmark_2.11/pom.xml
@@ -29,4 +29,27 @@
<artifactId>wayang-benchmark_2.11</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-api-scala-java_2.11</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-spark_2.11</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.11</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-graphx_2.11</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/wayang-benchmark/wayang-benchmark_2.12/pom.xml
b/wayang-benchmark/wayang-benchmark_2.12/pom.xml
index 400088f..94eb66d 100644
--- a/wayang-benchmark/wayang-benchmark_2.12/pom.xml
+++ b/wayang-benchmark/wayang-benchmark_2.12/pom.xml
@@ -29,5 +29,28 @@
<artifactId>wayang-benchmark_2.12</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-api-scala-java_2.12</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-spark_2.12</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.12</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-graphx_2.12</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/wayang-platforms/wayang-flink/pom.xml
b/wayang-platforms/wayang-flink/pom.xml
index 789896b..a8ea7c3 100644
--- a/wayang-platforms/wayang-flink/pom.xml
+++ b/wayang-platforms/wayang-flink/pom.xml
@@ -40,8 +40,6 @@
<flink.version>1.7.1</flink.version>
</properties>
-
-
<dependencies>
<dependency>
<groupId>org.apache.wayang</groupId>
@@ -87,30 +85,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.mayor.version}</artifactId>
- <version>${flink.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
-
<artifactId>flink-hadoop-compatibility_${scala.mayor.version}</artifactId>
- <version>${flink.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.4.1</version>
diff --git a/wayang-platforms/wayang-flink/wayang-flink_2.11/pom.xml
b/wayang-platforms/wayang-flink/wayang-flink_2.11/pom.xml
index 528cbca..a917f86 100644
--- a/wayang-platforms/wayang-flink/wayang-flink_2.11/pom.xml
+++ b/wayang-platforms/wayang-flink/wayang-flink_2.11/pom.xml
@@ -29,5 +29,30 @@
<artifactId>wayang-flink_2.11</artifactId>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-clients_2.11</artifactId>
+ <version>${flink.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-hadoop-compatibility_2.11</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/wayang-platforms/wayang-flink/wayang-flink_2.12/pom.xml
b/wayang-platforms/wayang-flink/wayang-flink_2.12/pom.xml
index 6d7d6da..cb796a7 100644
--- a/wayang-platforms/wayang-flink/wayang-flink_2.12/pom.xml
+++ b/wayang-platforms/wayang-flink/wayang-flink_2.12/pom.xml
@@ -29,5 +29,30 @@
<artifactId>wayang-flink_2.12</artifactId>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-clients_2.12</artifactId>
+ <version>${flink.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-hadoop-compatibility_2.12</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/wayang-platforms/wayang-spark/pom.xml
b/wayang-platforms/wayang-spark/pom.xml
index f26a918..9891442 100644
--- a/wayang-platforms/wayang-spark/pom.xml
+++ b/wayang-platforms/wayang-spark/pom.xml
@@ -58,22 +58,6 @@
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_${scala.mayor.version}</artifactId>
- <version>${spark.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-graphx_${scala.mayor.version}</artifactId>
- <version>${spark.version}</version>
- </dependency>
- <dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.2.1</version>
diff --git a/wayang-platforms/wayang-spark/wayang-spark_2.11/pom.xml
b/wayang-platforms/wayang-spark/wayang-spark_2.11/pom.xml
index c3f5359..50859a6 100644
--- a/wayang-platforms/wayang-spark/wayang-spark_2.11/pom.xml
+++ b/wayang-platforms/wayang-spark/wayang-spark_2.11/pom.xml
@@ -29,5 +29,40 @@
<artifactId>wayang-spark_2.11</artifactId>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-spark</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.11</artifactId>
+ <version>${spark.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-graphx_2.11</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/wayang-platforms/wayang-spark/wayang-spark_2.12/pom.xml
b/wayang-platforms/wayang-spark/wayang-spark_2.12/pom.xml
index 151d50e..49c15af 100644
--- a/wayang-platforms/wayang-spark/wayang-spark_2.12/pom.xml
+++ b/wayang-platforms/wayang-spark/wayang-spark_2.12/pom.xml
@@ -29,5 +29,23 @@
<artifactId>wayang-spark_2.12</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.12</artifactId>
+ <version>${spark.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-graphx_2.12</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/wayang-plugins/wayang-iejoin/pom.xml
b/wayang-plugins/wayang-iejoin/pom.xml
index 44b601c..a4ab701 100644
--- a/wayang-plugins/wayang-iejoin/pom.xml
+++ b/wayang-plugins/wayang-iejoin/pom.xml
@@ -43,16 +43,6 @@
<artifactId>wayang-java</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.wayang</groupId>
- <artifactId>wayang-spark_${scala.mayor.version}</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_${scala.mayor.version}</artifactId>
- <version>${spark.version}</version>
- </dependency>
</dependencies>
diff --git a/wayang-plugins/wayang-iejoin/wayang-iejoin_2.11/pom.xml
b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.11/pom.xml
index ab6d919..1ec3af0 100644
--- a/wayang-plugins/wayang-iejoin/wayang-iejoin_2.11/pom.xml
+++ b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.11/pom.xml
@@ -29,5 +29,22 @@
<artifactId>wayang-iejoin_2.11</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-spark_2.11</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.11</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-graphx_2.11</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/wayang-plugins/wayang-iejoin/wayang-iejoin_2.12/pom.xml
b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.12/pom.xml
index 8102f60..18bcb69 100644
--- a/wayang-plugins/wayang-iejoin/wayang-iejoin_2.12/pom.xml
+++ b/wayang-plugins/wayang-iejoin/wayang-iejoin_2.12/pom.xml
@@ -29,5 +29,22 @@
<artifactId>wayang-iejoin_2.12</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-spark_2.12</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.12</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-graphx_2.12</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/wayang-profiler/pom.xml b/wayang-profiler/pom.xml
index 92bf05a..bf9fd3a 100644
--- a/wayang-profiler/pom.xml
+++ b/wayang-profiler/pom.xml
@@ -57,11 +57,6 @@
</dependency>
<dependency>
<groupId>org.apache.wayang</groupId>
- <artifactId>wayang-spark_${scala.mayor.version}</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wayang</groupId>
<artifactId>wayang-java</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
@@ -76,11 +71,6 @@
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_${scala.mayor.version}</artifactId>
- <version>${spark.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.wayang</groupId>
<artifactId>wayang-utils-profile-db</artifactId>
<version>0.6.0-SNAPSHOT</version>
diff --git a/wayang-profiler/wayang-profiler_2.11/pom.xml
b/wayang-profiler/wayang-profiler_2.11/pom.xml
index f54292f..8e4558a 100644
--- a/wayang-profiler/wayang-profiler_2.11/pom.xml
+++ b/wayang-profiler/wayang-profiler_2.11/pom.xml
@@ -32,6 +32,21 @@
<dependencies>
<dependency>
<groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-spark_2.11</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.11</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-graphx_2.11</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
<artifactId>wayang-graphchi_2.11</artifactId>
<version>0.6.0-SNAPSHOT</version>
<scope>test</scope>
diff --git a/wayang-profiler/wayang-profiler_2.12/pom.xml
b/wayang-profiler/wayang-profiler_2.12/pom.xml
index 7cc9db7..9b198e0 100644
--- a/wayang-profiler/wayang-profiler_2.12/pom.xml
+++ b/wayang-profiler/wayang-profiler_2.12/pom.xml
@@ -29,5 +29,22 @@
<artifactId>wayang-profiler_2.12</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-spark_2.12</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.12</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-graphx_2.12</artifactId>
+ <version>${spark.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/wayang-tests-integration/pom.xml b/wayang-tests-integration/pom.xml
index 1d79153..085bf94 100644
--- a/wayang-tests-integration/pom.xml
+++ b/wayang-tests-integration/pom.xml
@@ -49,12 +49,6 @@
</dependency>
<dependency>
<groupId>org.apache.wayang</groupId>
- <artifactId>wayang-flink_${scala.mayor.version}</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.wayang</groupId>
<artifactId>wayang-sqlite3</artifactId>
<version>0.6.0-SNAPSHOT</version>
<scope>test</scope>
@@ -72,40 +66,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.wayang</groupId>
- <artifactId>wayang-spark_${scala.mayor.version}</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.wayang</groupId>
-
<artifactId>wayang-api-scala-java_${scala.mayor.version}</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Spark is a provided dependency and thus not transitively injected
via wayang-spark. -->
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_${scala.mayor.version}</artifactId>
- <version>${spark.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-graphx_${scala.mayor.version}</artifactId>
- <version>${spark.version}</version>
- <scope>test</scope>
- </dependency>
-
<!-- depencies of flink -->
<dependency>
<groupId>org.apache.flink</groupId>
@@ -127,26 +87,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.mayor.version}</artifactId>
- <version>${flink.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/wayang-tests-integration/wayang-tests-integration_2.11/pom.xml
b/wayang-tests-integration/wayang-tests-integration_2.11/pom.xml
index 039f7bd..ca0f939 100644
--- a/wayang-tests-integration/wayang-tests-integration_2.11/pom.xml
+++ b/wayang-tests-integration/wayang-tests-integration_2.11/pom.xml
@@ -32,6 +32,66 @@
<dependencies>
<dependency>
<groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-flink_2.11</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-spark_2.11</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-api-scala-java_2.11</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Spark is a provided dependency and thus not transitively injected via
wayang-spark. -->
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.11</artifactId>
+ <version>${spark.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-graphx_2.11</artifactId>
+ <version>${spark.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- depencies of flink -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-clients_2.11</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
<artifactId>wayang-graphchi_2.11</artifactId>
<version>0.6.0-SNAPSHOT</version>
<scope>test</scope>
diff --git a/wayang-tests-integration/wayang-tests-integration_2.12/pom.xml
b/wayang-tests-integration/wayang-tests-integration_2.12/pom.xml
index c4ae533..f2b5ca2 100644
--- a/wayang-tests-integration/wayang-tests-integration_2.12/pom.xml
+++ b/wayang-tests-integration/wayang-tests-integration_2.12/pom.xml
@@ -29,5 +29,67 @@
<artifactId>wayang-tests-integration_2.12</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-flink_2.12</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-spark_2.12</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wayang</groupId>
+ <artifactId>wayang-api-scala-java_2.12</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Spark is a provided dependency and thus not transitively injected via
wayang-spark. -->
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.12</artifactId>
+ <version>${spark.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-graphx_2.12</artifactId>
+ <version>${spark.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- depencies of flink -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-clients_2.12</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
</project>
