[WAYANG-40] change spark version depending on the profile of scala
Signed-off-by: bertty <berttycontreras@gmail.com>
diff --git a/.travis.yml b/.travis.yml
index 5c2543a..bf473fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,10 +28,10 @@
on_success: never
on_failure: never
on_start: false
-#cache:
-# directories:
-# - .autoconf
-# - $HOME/.m2
+cache:
+ directories:
+ - .autoconf
+ - $HOME/.m2
before_install:
- echo "${GENERATE_DOCS}"
@@ -86,7 +86,8 @@
# - chmod +x ./docs/script/cibuild
script:
#- jdk_switcher use openjdk8
- - bin/change-scala-version.sh 2.12.12 && mvn clean install -Pdistro,scala-12 "${mvn_opts[@]}" &> result.log
+ - bin/change-scala-version.sh 2.11.12 && mvn clean install -Pdistro,scala-11 "${mvn_opts[@]}" &> result.log
+ - bin/change-scala-version.sh 2.12.12 && mvn clean install -Pdistro,scala-12 "${mvn_opts[@]}" &>> result.log
- cat /home/travis/build/apache/incubator-wayang/target/rat.txt || echo "file doesn't exist"
- tail -n 2000 result.log
diff --git a/pom.xml b/pom.xml
index f780094..9d30091 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,8 +113,6 @@
<hadoop.version>2.7.7</hadoop.version>
<!-- To be overridden by individual modules -->
<java-module-name>org.apache.wayang.default</java-module-name>
- <scala.version>2.11.12</scala.version>
- <scala.mayor.version>2.11</scala.mayor.version>
<code.coverage.project.folder>${basedir}/</code.coverage.project.folder>
<code.coverage.overall.data.folder>${basedir}/target/aggregate.exec</code.coverage.overall.data.folder>
</properties>
@@ -579,6 +577,7 @@
<properties>
<scala.version>2.11.12</scala.version>
<scala.mayor.version>2.11</scala.mayor.version>
+ <spark.version>2.4.8</spark.version>
</properties>
</profile>
@@ -587,6 +586,7 @@
<properties>
<scala.version>2.12.12</scala.version>
<scala.mayor.version>2.12</scala.mayor.version>
+ <spark.version>3.1.2</spark.version>
</properties>
</profile>
@@ -595,6 +595,7 @@
<properties>
<scala.version>2.13.3</scala.version>
<scala.mayor.version>2.13</scala.mayor.version>
+ <spark.version>3.1.2</spark.version>
</properties>
</profile>
diff --git a/wayang-api/wayang-api-python/pom.xml b/wayang-api/wayang-api-python/pom.xml
index 5fa5dc8..d9e1a19 100644
--- a/wayang-api/wayang-api-python/pom.xml
+++ b/wayang-api/wayang-api-python/pom.xml
@@ -36,6 +36,5 @@
<properties>
<java-module-name>org.apache.wayang.api</java-module-name>
- <spark.version>3.1.2</spark.version>
</properties>
</project>
diff --git a/wayang-api/wayang-api-scala-java/pom.xml b/wayang-api/wayang-api-scala-java/pom.xml
index ed16583..2b78346 100644
--- a/wayang-api/wayang-api-scala-java/pom.xml
+++ b/wayang-api/wayang-api-scala-java/pom.xml
@@ -34,8 +34,6 @@
<properties>
<java-module-name>org.apache.wayang.api</java-module-name>
- <spark.version>3.1.2</spark.version>
- <scala.mayor.version>2.12</scala.mayor.version>
</properties>
<dependencyManagement>
diff --git a/wayang-platforms/wayang-spark/pom.xml b/wayang-platforms/wayang-spark/pom.xml
index 7266a7b..1e9e3e7 100644
--- a/wayang-platforms/wayang-spark/pom.xml
+++ b/wayang-platforms/wayang-spark/pom.xml
@@ -36,8 +36,6 @@
<properties>
<java-module-name>org.apache.wayang.platform.spark</java-module-name>
- <spark.version>3.1.2</spark.version>
- <scala.mayor.version>2.12</scala.mayor.version>
</properties>
diff --git a/wayang-plugins/wayang-iejoin/pom.xml b/wayang-plugins/wayang-iejoin/pom.xml
index 8bfb314..ac0c73d 100644
--- a/wayang-plugins/wayang-iejoin/pom.xml
+++ b/wayang-plugins/wayang-iejoin/pom.xml
@@ -24,8 +24,6 @@
<properties>
<java-module-name>org.apache.wayang.extensions.iejoin</java-module-name>
- <spark.version>3.1.2</spark.version>
- <scala.mayor.version>2.12</scala.mayor.version>
</properties>
<dependencies>
diff --git a/wayang-profiler/pom.xml b/wayang-profiler/pom.xml
index 95de519..caaef08 100644
--- a/wayang-profiler/pom.xml
+++ b/wayang-profiler/pom.xml
@@ -34,8 +34,6 @@
<properties>
<java-module-name>org.apache.wayang.profiler</java-module-name>
- <spark.version>3.1.2</spark.version>
- <scala.mayor.version>2.12</scala.mayor.version>
</properties>
<dependencyManagement>
@@ -99,7 +97,7 @@
</dependency>
<dependency>
<groupId>org.graphchi</groupId>
- <artifactId>graphchi-java_${scala.mayor.version}</artifactId>
+ <artifactId>graphchi-java_2.11</artifactId>
<version>0.2.2</version>
<scope>test</scope>
<exclusions>
diff --git a/wayang-tests-integration/pom.xml b/wayang-tests-integration/pom.xml
index 583886c..a9e0c65 100644
--- a/wayang-tests-integration/pom.xml
+++ b/wayang-tests-integration/pom.xml
@@ -35,8 +35,6 @@
<properties>
<java-module-name>org.apache.wayang.test.integration</java-module-name>
<graphchi.version>0.2.2</graphchi.version>
- <spark.version>3.1.2</spark.version>
- <scala.mayor.version>2.12</scala.mayor.version>
<flink.version>1.7.1</flink.version>
<giraph.version>1.2.0-hadoop2</giraph.version>
</properties>
@@ -280,8 +278,8 @@
</dependency>
<dependency>
<groupId>org.graphchi</groupId>
- <artifactId>graphchi-java_${scala.mayor.version}</artifactId>
- <version>${graphchi.version}</version>
+ <artifactId>graphchi-java_2.11</artifactId>
+ <version>0.2.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
