diff options
| author | Sean Owen <sowen@cloudera.com> | 2015-07-31 21:51:55 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-07-31 21:51:55 +0100 |
| commit | 6e5fd613ea4b9aa0ab485ba681277a51a4367168 (patch) | |
| tree | 80f3866775edf9ef344d342cd49c404b5d399ae3 /pom.xml | |
| parent | 873ab0f9692d8ea6220abdb8d9200041068372a8 (diff) | |
| download | spark-6e5fd613ea4b9aa0ab485ba681277a51a4367168.tar.gz spark-6e5fd613ea4b9aa0ab485ba681277a51a4367168.tar.bz2 spark-6e5fd613ea4b9aa0ab485ba681277a51a4367168.zip | |
[SPARK-9507] [BUILD] Remove dependency reduced POM hack now that shade plugin is updated
Update to shade plugin 2.4.1, which removes the need for the dependency-reduced-POM workaround and the 'release' profile. Fix management of shade plugin version so children inherit it; bump assembly plugin version while here
See https://issues.apache.org/jira/browse/SPARK-8819
I verified that `mvn clean package -DskipTests` works with Maven 3.3.3.
pwendell are you up for trying this for the 1.5.0 release?
Author: Sean Owen <sowen@cloudera.com>
Closes #7826 from srowen/SPARK-9507 and squashes the following commits:
e0b0fd2 [Sean Owen] Update to shade plugin 2.4.1, which removes the need for the dependency-reduced-POM workaround and the 'release' profile. Fix management of shade plugin version so children inherit it; bump assembly plugin version while here
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 33 |
1 files changed, 6 insertions, 27 deletions
@@ -160,9 +160,6 @@ <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> <!-- @@ -1376,7 +1373,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.5.3</version> + <version>2.5.5</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.4.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -1470,11 +1472,8 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <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 --> @@ -1836,26 +1835,6 @@ </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</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 |