spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject spark git commit: [SPARK-9507] [BUILD] Remove dependency reduced POM hack now that shade plugin is updated
Date Fri, 31 Jul 2015 21:06:46 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.3 f941482b0 -> 047a61365


[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

(cherry picked from commit 6e5fd613ea4b9aa0ab485ba681277a51a4367168)
Signed-off-by: Sean Owen <sowen@cloudera.com>

# Conflicts:
#	dev/create-release/create-release.sh
#	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/047a6136
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/047a6136
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/047a6136

Branch: refs/heads/branch-1.3
Commit: 047a61365fa795f8e646b61049cde038d074a78c
Parents: f941482
Author: Sean Owen <sowen@cloudera.com>
Authored: Fri Jul 31 21:51:55 2015 +0100
Committer: Sean Owen <sowen@cloudera.com>
Committed: Fri Jul 31 22:05:57 2015 +0100

----------------------------------------------------------------------
 dev/create-release/create-release.sh |  8 ++++----
 pom.xml                              | 29 +++++------------------------
 2 files changed, 9 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/047a6136/dev/create-release/create-release.sh
----------------------------------------------------------------------
diff --git a/dev/create-release/create-release.sh b/dev/create-release/create-release.sh
index 0979d5e..120914f 100755
--- a/dev/create-release/create-release.sh
+++ b/dev/create-release/create-release.sh
@@ -117,13 +117,13 @@ if [[ ! "$@" =~ --skip-publish ]]; then
   echo "Created Nexus staging repository: $staged_repo_id"
 
   build/mvn -DskipTests -Dhadoop.version=2.2.0 -Dyarn.version=2.2.0 \
-    -Pyarn -Phive -Phive-thriftserver -Phadoop-2.2 -Pspark-ganglia-lgpl -Pkinesis-asl -Prelease-profile
\
+    -Pyarn -Phive -Phive-thriftserver -Phadoop-2.2 -Pspark-ganglia-lgpl -Pkinesis-asl \
     clean install
 
   ./dev/change-version-to-2.11.sh
-  
+
   build/mvn -DskipTests -Dhadoop.version=2.2.0 -Dyarn.version=2.2.0 \
-    -Dscala-2.11 -Pyarn -Phive -Phadoop-2.2 -Pspark-ganglia-lgpl -Pkinesis-asl -Prelease-profile
\
+    -Dscala-2.11 -Pyarn -Phive -Phadoop-2.2 -Pspark-ganglia-lgpl -Pkinesis-asl \
     clean install
 
   ./dev/change-version-to-2.10.sh
@@ -197,7 +197,7 @@ if [[ ! "$@" =~ --skip-package ]]; then
     NAME=$1
     FLAGS=$2
     cp -r spark spark-$RELEASE_VERSION-bin-$NAME
-    
+
     cd spark-$RELEASE_VERSION-bin-$NAME
 
     # TODO There should probably be a flag to make-distribution to allow 2.11 support

http://git-wip-us.apache.org/repos/asf/spark/blob/047a6136/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bcc2f51..099b002 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,6 @@
     <codehaus.jackson.version>1.8.8</codehaus.jackson.version>
     <fasterxml.jackson.version>2.4.4</fasterxml.jackson.version>
     <snappy.version>1.1.1.7</snappy.version>
-    <create.dependency.reduced.pom>false</create.dependency.reduced.pom>
 
     <!--
       Dependency scopes that can be overridden by enabling certain profiles. These profiles
are
@@ -1313,6 +1312,11 @@
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.10.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>2.4.1</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -1365,11 +1369,8 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.2</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
-->
@@ -1751,26 +1752,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-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


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message