spark git commit: [SPARK-8027] [SPARKR] Add maven profile to build R package docs
Repository: spark
Updated Branches:
refs/heads/master 89f642a0e - cae9306c4
[SPARK-8027] [SPARKR] Add maven profile to build R package docs
Also use that profile in create-release.sh
cc pwendell -- Note that this means that we need `knitr` and `roxygen`
installed on the machines used for building the release. Let me know if you
need help with that.
Author: Shivaram Venkataraman shiva...@cs.berkeley.edu
Closes #6567 from shivaram/SPARK-8027 and squashes the following commits:
8dc8ecf [Shivaram Venkataraman] Add maven profile to build R package docs Also
use that profile in create-release.sh
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/cae9306c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/cae9306c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/cae9306c
Branch: refs/heads/master
Commit: cae9306c4f437c722baa57593fe83f4b7d82dbff
Parents: 89f642a
Author: Shivaram Venkataraman shiva...@cs.berkeley.edu
Authored: Mon Jun 1 21:21:45 2015 -0700
Committer: Shivaram Venkataraman shiva...@cs.berkeley.edu
Committed: Mon Jun 1 21:21:45 2015 -0700
--
core/pom.xml | 23 +++
dev/create-release/create-release.sh | 16
2 files changed, 31 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/cae9306c/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index 5c02be8..a021842 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -481,6 +481,29 @@
/plugins
/build
/profile
+profile
+ idsparkr-docs/id
+ build
+plugins
+ plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdexec-maven-plugin/artifactId
+executions
+ execution
+idsparkr-pkg-docs/id
+phasecompile/phase
+goals
+ goalexec/goal
+/goals
+ /execution
+/executions
+configuration
+
executable..${path.separator}R${path.separator}create-docs${script.extension}/executable
+/configuration
+ /plugin
+/plugins
+ /build
+/profile
/profiles
/project
http://git-wip-us.apache.org/repos/asf/spark/blob/cae9306c/dev/create-release/create-release.sh
--
diff --git a/dev/create-release/create-release.sh
b/dev/create-release/create-release.sh
index 54274a8..0b14a61 100755
--- a/dev/create-release/create-release.sh
+++ b/dev/create-release/create-release.sh
@@ -228,14 +228,14 @@ if [[ ! $@ =~ --skip-package ]]; then
# We increment the Zinc port each time to avoid OOM's and other craziness if
multiple builds
# share the same Zinc server.
- make_binary_release hadoop1 -Psparkr -Phadoop-1 -Phive
-Phive-thriftserver 3030
- make_binary_release hadoop1-scala2.11 -Psparkr -Phadoop-1 -Phive
-Dscala-2.11 3031
- make_binary_release cdh4 -Psparkr -Phadoop-1 -Phive -Phive-thriftserver
-Dhadoop.version=2.0.0-mr1-cdh4.2.0 3032
- make_binary_release hadoop2.3 -Psparkr -Phadoop-2.3 -Phive
-Phive-thriftserver -Pyarn 3033
- make_binary_release hadoop2.4 -Psparkr -Phadoop-2.4 -Phive
-Phive-thriftserver -Pyarn 3034
- make_binary_release mapr3 -Pmapr3 -Psparkr -Phive -Phive-thriftserver
3035
- make_binary_release mapr4 -Pmapr4 -Psparkr -Pyarn -Phive
-Phive-thriftserver 3036
- make_binary_release hadoop2.4-without-hive -Psparkr -Phadoop-2.4 -Pyarn
3037
+ make_binary_release hadoop1 -Psparkr -Psparkr-docs -Phadoop-1 -Phive
-Phive-thriftserver 3030
+ make_binary_release hadoop1-scala2.11 -Psparkr -Psparkr-docs -Phadoop-1
-Phive -Dscala-2.11 3031
+ make_binary_release cdh4 -Psparkr -Psparkr-docs -Phadoop-1 -Phive
-Phive-thriftserver -Dhadoop.version=2.0.0-mr1-cdh4.2.0 3032
+ make_binary_release hadoop2.3 -Psparkr -Psparkr-docs -Phadoop-2.3 -Phive
-Phive-thriftserver -Pyarn 3033
+ make_binary_release hadoop2.4 -Psparkr -Psparkr-docs -Phadoop-2.4 -Phive
-Phive-thriftserver -Pyarn 3034
+ make_binary_release mapr3 -Pmapr3 -Psparkr -Psparkr-docs -Phive
-Phive-thriftserver 3035
+ make_binary_release mapr4 -Pmapr4 -Psparkr -Psparkr-docs -Pyarn -Phive
-Phive-thriftserver 3036
+ make_binary_release hadoop2.4-without-hive -Psparkr -Psparkr-docs
-Phadoop-2.4 -Pyarn 3037
wait
rm -rf spark-$RELEASE_VERSION-bin-*/
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [SPARK-8027] [SPARKR] Add maven profile to build R package docs
Repository: spark
Updated Branches:
refs/heads/branch-1.4 8ac23762e - d542a35ad
[SPARK-8027] [SPARKR] Add maven profile to build R package docs
Also use that profile in create-release.sh
cc pwendell -- Note that this means that we need `knitr` and `roxygen`
installed on the machines used for building the release. Let me know if you
need help with that.
Author: Shivaram Venkataraman shiva...@cs.berkeley.edu
Closes #6567 from shivaram/SPARK-8027 and squashes the following commits:
8dc8ecf [Shivaram Venkataraman] Add maven profile to build R package docs Also
use that profile in create-release.sh
(cherry picked from commit cae9306c4f437c722baa57593fe83f4b7d82dbff)
Signed-off-by: Shivaram Venkataraman shiva...@cs.berkeley.edu
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d542a35a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d542a35a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d542a35a
Branch: refs/heads/branch-1.4
Commit: d542a35ad74a9e530d0160adf9d10ff7c3075d0d
Parents: 8ac2376
Author: Shivaram Venkataraman shiva...@cs.berkeley.edu
Authored: Mon Jun 1 21:21:45 2015 -0700
Committer: Shivaram Venkataraman shiva...@cs.berkeley.edu
Committed: Mon Jun 1 21:21:55 2015 -0700
--
core/pom.xml | 23 +++
dev/create-release/create-release.sh | 16
2 files changed, 31 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/d542a35a/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index e58efe4..1f903fc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -475,6 +475,29 @@
/plugins
/build
/profile
+profile
+ idsparkr-docs/id
+ build
+plugins
+ plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdexec-maven-plugin/artifactId
+executions
+ execution
+idsparkr-pkg-docs/id
+phasecompile/phase
+goals
+ goalexec/goal
+/goals
+ /execution
+/executions
+configuration
+
executable..${path.separator}R${path.separator}create-docs${script.extension}/executable
+/configuration
+ /plugin
+/plugins
+ /build
+/profile
/profiles
/project
http://git-wip-us.apache.org/repos/asf/spark/blob/d542a35a/dev/create-release/create-release.sh
--
diff --git a/dev/create-release/create-release.sh
b/dev/create-release/create-release.sh
index 54274a8..0b14a61 100755
--- a/dev/create-release/create-release.sh
+++ b/dev/create-release/create-release.sh
@@ -228,14 +228,14 @@ if [[ ! $@ =~ --skip-package ]]; then
# We increment the Zinc port each time to avoid OOM's and other craziness if
multiple builds
# share the same Zinc server.
- make_binary_release hadoop1 -Psparkr -Phadoop-1 -Phive
-Phive-thriftserver 3030
- make_binary_release hadoop1-scala2.11 -Psparkr -Phadoop-1 -Phive
-Dscala-2.11 3031
- make_binary_release cdh4 -Psparkr -Phadoop-1 -Phive -Phive-thriftserver
-Dhadoop.version=2.0.0-mr1-cdh4.2.0 3032
- make_binary_release hadoop2.3 -Psparkr -Phadoop-2.3 -Phive
-Phive-thriftserver -Pyarn 3033
- make_binary_release hadoop2.4 -Psparkr -Phadoop-2.4 -Phive
-Phive-thriftserver -Pyarn 3034
- make_binary_release mapr3 -Pmapr3 -Psparkr -Phive -Phive-thriftserver
3035
- make_binary_release mapr4 -Pmapr4 -Psparkr -Pyarn -Phive
-Phive-thriftserver 3036
- make_binary_release hadoop2.4-without-hive -Psparkr -Phadoop-2.4 -Pyarn
3037
+ make_binary_release hadoop1 -Psparkr -Psparkr-docs -Phadoop-1 -Phive
-Phive-thriftserver 3030
+ make_binary_release hadoop1-scala2.11 -Psparkr -Psparkr-docs -Phadoop-1
-Phive -Dscala-2.11 3031
+ make_binary_release cdh4 -Psparkr -Psparkr-docs -Phadoop-1 -Phive
-Phive-thriftserver -Dhadoop.version=2.0.0-mr1-cdh4.2.0 3032
+ make_binary_release hadoop2.3 -Psparkr -Psparkr-docs -Phadoop-2.3 -Phive
-Phive-thriftserver -Pyarn 3033
+ make_binary_release hadoop2.4 -Psparkr -Psparkr-docs -Phadoop-2.4 -Phive
-Phive-thriftserver -Pyarn 3034
+ make_binary_release mapr3 -Pmapr3 -Psparkr -Psparkr-docs -Phive
-Phive-thriftserver 3035
+ make_binary_release mapr4 -Pmapr4 -Psparkr -Psparkr-docs -Pyarn -Phive
-Phive-thriftserver 3036
+ make_binary_release hadoop2.4-without-hive -Psparkr -Psparkr-docs
-Phadoop-2.4 -Pyarn 3037
wait
rm -rf spark-$RELEASE_VERSION-bin-*/
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail:
