Skip to content

[HUDI-585] Optimize the steps of building with scala-2.12 #1293

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

Merged
leesf merged 4 commits into from
Feb 5, 2020
Merged

[HUDI-585] Optimize the steps of building with scala-2.12 #1293

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
e50b5a6
[HUDI-585] Optimize the steps of building with scala-2.12
lamberken Jan 30, 2020
9c9c803
Remove change-scala-version.sh from LICENSE
lamberken Jan 30, 2020
1db4b3b
Fix build error
lamberken Feb 2, 2020
3370f12
revert scala-2.11
lamberken Feb 5, 2020
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
2 changes: 0 additions & 2 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,6 @@ This product includes code from Apache Spark

* org.apache.hudi.AvroConversionHelper copied from classes in org/apache/spark/sql/avro package

* dev/change-scala-version.sh copied from https://github.com/apache/spark/blob/branch-2.4/dev/change-scala-version.sh

Copyright: 2014 and onwards The Apache Software Foundation
Home page: http://spark.apache.org/
License: http://www.apache.org/licenses/LICENSE-2.0
Expand Down
6 changes: 2 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,10 @@ mvn clean javadoc:aggregate -Pjavadocs

### Build with Scala 2.12

The default Scala version supported is 2.11. To build for Scala 2.12 version, after code checkout run dev/change-scala-version.sh
and build using `scala-2.12` profile
The default Scala version supported is 2.11. To build for Scala 2.12 version, build using `scala-2.12` profile

```
dev/change-scala-version 2.12
mvn clean package -DskipTests -DskipITs -Pscala-2.12
mvn clean package -DskipTests -DskipITs -Dscala-2.12
```

## Quickstart
Expand Down
66 changes: 0 additions & 66 deletions dev/change-scala-version.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion hudi-spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>hudi-spark_2.11</artifactId>
<artifactId>hudi-spark_${scala.binary.version}</artifactId>
<packaging>jar</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion hudi-utilities/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>hudi-utilities_2.11</artifactId>
<artifactId>hudi-utilities_${scala.binary.version}</artifactId>
<packaging>jar</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion packaging/hudi-spark-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hudi-spark-bundle_2.11</artifactId>
<artifactId>hudi-spark-bundle_${scala.binary.version}</artifactId>
<packaging>jar</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion packaging/hudi-utilities-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hudi-utilities-bundle_2.11</artifactId>
<artifactId>hudi-utilities-bundle_${scala.binary.version}</artifactId>
<packaging>jar</packaging>

<properties>
Expand Down
5 changes: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,6 +1060,11 @@
<scala.version>2.12.10</scala.version>
<scala.binary.version>2.12</scala.binary.version>
</properties>
<activation>
<property>
<name>scala-2.12</name>
</property>
</activation>
<build>
<plugins>
<plugin>
Expand Down