diff options
| -rwxr-xr-x | dev/create-release/create-release.sh | 4 | ||||
| -rw-r--r-- | pom.xml | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/dev/create-release/create-release.sh b/dev/create-release/create-release.sh index 54274a83f6..cfe2cd4752 100755 --- a/dev/create-release/create-release.sh +++ b/dev/create-release/create-release.sh @@ -118,13 +118,13 @@ if [[ ! "$@" =~ --skip-publish ]]; then rm -rf $SPARK_REPO - build/mvn -DskipTests -Pyarn -Phive \ + build/mvn -DskipTests -Pyarn -Phive -Prelease-profile\ -Phive-thriftserver -Phadoop-2.2 -Pspark-ganglia-lgpl -Pkinesis-asl \ clean install ./dev/change-version-to-2.11.sh - build/mvn -DskipTests -Pyarn -Phive \ + build/mvn -DskipTests -Pyarn -Phive -Prelease-profile\ -Dscala-2.11 -Phadoop-2.2 -Pspark-ganglia-lgpl -Pkinesis-asl \ clean install @@ -161,6 +161,8 @@ <fasterxml.jackson.version>2.4.4</fasterxml.jackson.version> <snappy.version>1.1.1.7</snappy.version> <netlib.java.version>1.1.2</netlib.java.version> + <!-- For maven shade plugin (see SPARK-8819) --> + <create.dependency.reduced.pom>false</create.dependency.reduced.pom> <test.java.home>${java.home}</test.java.home> @@ -1440,6 +1442,8 @@ <version>2.3</version> <configuration> <shadedArtifactAttached>false</shadedArtifactAttached> + <!-- Work around MSHADE-148. See SPARK-8819. --> + <createDependencyReducedPom>${create.dependency.reduced.pom}</createDependencyReducedPom> <artifactSet> <includes> <!-- At a minimum we must include this to force effective pom generation --> @@ -1826,6 +1830,26 @@ </properties> </profile> + <profile> + <!-- + Use this profile only for making Spark releases. Note that due to SPARK-8819, + you must use maven version 3.2.x or before to avoid running into MSHADE-148. + --> + <id>release-profile</id> + <properties> + <!-- + The maven shade plugin has a bug where enabling the `createDependencyReducedPom` + property causes maven to go into an infinite loop (MSHADE-148). This is only an + issue for the Spark build if the maven version is 3.3.x or newer (SPARK-8819). + + However, since disabling this property has the side effect of not resolving + variables in the released pom files (SPARK-8781), we need to enable this during + releases. + --> + <create.dependency.reduced.pom>true</create.dependency.reduced.pom> + </properties> + </profile> + <!-- These empty profiles are available in some sub-modules. Declare them here so that maven does not complain when they're provided on the command line for a sub-module |