Repository: spark
Updated Branches:
  refs/heads/master c46aaf47f -> 1cb2629f1


[HOTFIX] Rename release-profile to release

when publishing releases. We named it as 'release-profile' because that is
the Maven convention. However, it turns out this special name causes several
other things to kick-in when we are creating releases that are not desirable.
For instance, it triggers the javadoc plugin to run, which actually fails
in our current build set-up.

The fix is just to rename this to a different profile to have no
collateral damage associated with its use.


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

Branch: refs/heads/master
Commit: 1cb2629f1aa466f92246828c562ea6f35c89ab87
Parents: c46aaf4
Author: Patrick Wendell <patr...@databricks.com>
Authored: Mon Jul 6 22:14:24 2015 -0700
Committer: Patrick Wendell <patr...@databricks.com>
Committed: Mon Jul 6 22:17:30 2015 -0700

----------------------------------------------------------------------
 dev/create-release/create-release.sh | 4 ++--
 pom.xml                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/1cb2629f/dev/create-release/create-release.sh
----------------------------------------------------------------------
diff --git a/dev/create-release/create-release.sh 
b/dev/create-release/create-release.sh
index cfe2cd4..30190dc 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 -Prelease-profile\
+  build/mvn -DskipTests -Pyarn -Phive -Prelease\
     -Phive-thriftserver -Phadoop-2.2 -Pspark-ganglia-lgpl -Pkinesis-asl \
     clean install
 
   ./dev/change-version-to-2.11.sh
   
-  build/mvn -DskipTests -Pyarn -Phive -Prelease-profile\
+  build/mvn -DskipTests -Pyarn -Phive -Prelease\
     -Dscala-2.11 -Phadoop-2.2 -Pspark-ganglia-lgpl -Pkinesis-asl \
     clean install
 

http://git-wip-us.apache.org/repos/asf/spark/blob/1cb2629f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fbcc915..27dd4f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1835,7 +1835,7 @@
           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>
+      <id>release</id>
       <properties>
         <!--
             The maven shade plugin has a bug where enabling the 
`createDependencyReducedPom`


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

Reply via email to