Skip to content

[ZEPPELIN-3351] Fix build error with 'spark-2.3' profile #2880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
woowahan-jaehoon wants to merge 4 commits into from
Closed

[ZEPPELIN-3351] Fix build error with 'spark-2.3' profile #2880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65f9e1d
fix for spark 2.3 and remove unused import
woowahan-jaehoon Mar 19, 2018
f6c487e
fix wrong properties for spark2.3
woowahan-jaehoon Mar 19, 2018
4369495
Replace spark-2.3 download url
woowahan-jaehoon Mar 19, 2018
a70c871
Remove Scala-2.10 module for spark 2.3
woowahan-jaehoon Mar 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 74 additions & 6 deletions spark/interpreter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark-scala-2.10</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-interpreter</artifactId>
Expand Down Expand Up @@ -578,4 +572,78 @@
</plugins>
</build>

<profiles>
<profile>
<id>spark-2.3</id>
</profile>

<profile>
<id>spark-2.2</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark-scala-2.10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

<profile>
<id>spark-2.1</id>
<dependencies>
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark-scala-2.10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

<profile>
<id>spark-2.0</id>
<dependencies>
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark-scala-2.10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

<profile>
<id>spark-1.6</id>
<dependencies>
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark-scala-2.10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

<profile>
<id>spark-1.5</id>
<dependencies>
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark-scala-2.10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

<profile>
<id>spark-1.4</id>
<dependencies>
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark-scala-2.10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
1 change: 0 additions & 1 deletion spark/interpreter/src/main/java/org/apache/zeppelin/spark/NewSparkInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.scheduler.SparkListenerJobStart;
import org.apache.spark.sql.SQLContext;
import org.apache.spark.ui.jobs.JobProgressListener;
import org.apache.zeppelin.interpreter.BaseZeppelinContext;
import org.apache.zeppelin.interpreter.DefaultInterpreterProperty;
import org.apache.zeppelin.interpreter.Interpreter;
Expand Down
27 changes: 25 additions & 2 deletions spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
<modules>
<module>interpreter</module>
<module>spark-scala-parent</module>
<module>scala-2.10</module>
<module>scala-2.11</module>
<module>spark-dependencies</module>
<module>spark-shims</module>
Expand Down Expand Up @@ -198,7 +197,13 @@
<properties>
<spark.version>2.3.0</spark.version>
<protobuf.version>2.5.0</protobuf.version>
<spark.py4j.version>0.10.6</spark.py4j.version>
<py4j.version>0.10.6</py4j.version>
<spark.src.download.url>
http://www-us.apache.org/dist/spark/${spark.archive}/${spark.archive}.tgz
</spark.src.download.url>
<spark.bin.download.url>
http://www-us.apache.org/dist/spark/${spark.archive}/${spark.archive}-bin-without-hadoop.tgz
</spark.bin.download.url>
Copy link
Member

@felixcheung felixcheung Mar 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a pre-existing problem but we really need to change to use the asf mirrors instead - we can't release with this...

Copy link
Contributor

@zjffdu zjffdu Mar 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, this is tracked. But I afraid it could not be fixed in 0.8.
@woowahan-jaehoon Zeppelin 0.8 can still run spark 2.3 without this PR. The spark-2.3 profile only affect that it would make spark 2.3 as the embedded version of spark. As @felixcheung mentioned, we can make this change after the download url is fixed

Copy link
Contributor Author

@woowahan-jaehoon woowahan-jaehoon Mar 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, how did you solved download issue?
Just using CDN?

</properties>
</profile>

Expand All @@ -211,6 +216,9 @@
<spark.version>2.2.0</spark.version>
<py4j.version>0.10.4</py4j.version>
</properties>
<modules>
<module>scala-2.10</module>
</modules>
</profile>

<profile>
Expand All @@ -219,6 +227,9 @@
<spark.version>2.1.0</spark.version>
<py4j.version>0.10.4</py4j.version>
</properties>
<modules>
<module>scala-2.10</module>
</modules>
</profile>

<profile>
Expand All @@ -227,6 +238,9 @@
<spark.version>2.0.2</spark.version>
<py4j.version>0.10.3</py4j.version>
</properties>
<modules>
<module>scala-2.10</module>
</modules>
</profile>

<profile>
Expand All @@ -235,6 +249,9 @@
<spark.version>1.6.3</spark.version>
<py4j.version>0.9</py4j.version>
</properties>
<modules>
<module>scala-2.10</module>
</modules>
</profile>

<profile>
Expand All @@ -243,6 +260,9 @@
<spark.version>1.5.2</spark.version>
<py4j.version>0.8.2.1</py4j.version>
</properties>
<modules>
<module>scala-2.10</module>
</modules>
</profile>

<profile>
Expand All @@ -251,6 +271,9 @@
<spark.version>1.4.1</spark.version>
<py4j.version>0.8.2.1</py4j.version>
</properties>
<modules>
<module>scala-2.10</module>
</modules>
</profile>

</profiles>
Expand Down