spark git commit: [SPARK-14279][BUILD] Pick the spark version from pom

2016-06-07 Thread vanzin 
Repository: spark
Updated Branches:
  refs/heads/branch-2.0 f1439b90c -> 7a7ec0547


[SPARK-14279][BUILD] Pick the spark version from pom

Changes are already merged in master 
(https://github.com/apache/spark/pull/13061) . This one's for branch-2.0

Author: Dhruve Ashar 

Closes #13530 from dhruve/impr/branch-2.0/SPARK-14279.


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

Branch: refs/heads/branch-2.0
Commit: 7a7ec05477a80a5c92427290f0b85ab80b23a613
Parents: f1439b9
Author: Dhruve Ashar 
Authored: Tue Jun 7 14:10:20 2016 -0700
Committer: Marcelo Vanzin 
Committed: Tue Jun 7 14:10:20 2016 -0700

--
 build/spark-build-info  | 38 ++
 core/pom.xml| 31 +++
 .../org/apache/spark/deploy/SparkSubmit.scala   |  7 ++-
 .../main/scala/org/apache/spark/package.scala   | 55 +++-
 pom.xml |  6 ++-
 project/SparkBuild.scala| 21 ++--
 6 files changed, 150 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/7a7ec054/build/spark-build-info
--
diff --git a/build/spark-build-info b/build/spark-build-info
new file mode 100755
index 000..ad0ec67
--- /dev/null
+++ b/build/spark-build-info
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This script generates the build info for spark and places it into the 
spark-version-info.properties file.
+# Arguments:
+#   build_tgt_directory - The target directory where properties file would be 
created. [./core/target/extra-resources]
+#   spark_version - The current version of spark
+
+RESOURCE_DIR="$1"
+mkdir -p "$RESOURCE_DIR"
+SPARK_BUILD_INFO="${RESOURCE_DIR}"/spark-version-info.properties
+
+echo_build_properties() {
+  echo version=$1
+  echo user=$USER
+  echo revision=$(git rev-parse HEAD)
+  echo branch=$(git rev-parse --abbrev-ref HEAD)
+  echo date=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+  echo url=$(git config --get remote.origin.url)
+}
+
+echo_build_properties $2 > "$SPARK_BUILD_INFO"

http://git-wip-us.apache.org/repos/asf/spark/blob/7a7ec054/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index 45f8bfc..f5fdb40 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -337,9 +337,40 @@
   
 
target/scala-${scala.binary.version}/classes
 
target/scala-${scala.binary.version}/test-classes
+
+  
+${project.basedir}/src/main/resources
+  
+  
+
+${project.build.directory}/extra-resources
+true
+  
+
 
   
 org.apache.maven.plugins
+maven-antrun-plugin
+
+  
+generate-resources
+
+  
+  
+
+  
+  
+
+  
+
+
+  run
+
+  
+
+  
+  
+org.apache.maven.plugins
 maven-dependency-plugin

spark git commit: [SPARK-14279][BUILD] Pick the spark version from pom

2016-06-06 Thread vanzin 
Repository: spark
Updated Branches:
  refs/heads/master 00ad4f054 -> fa4bc8ea8


[SPARK-14279][BUILD] Pick the spark version from pom

## What changes were proposed in this pull request?
Change the way spark picks up version information. Also embed the build 
information to better identify the spark version running.

More context can be found here : https://github.com/apache/spark/pull/12152

## How was this patch tested?
Ran the mvn and sbt builds to verify the version information was being 
displayed correctly on executing spark-submit --version 

![image](https://cloud.githubusercontent.com/assets/7732317/15197251/f7c673a2-1795-11e6-8b2f-88f2a70cf1c1.png)

Author: Dhruve Ashar 

Closes #13061 from dhruve/impr/SPARK-14279.


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

Branch: refs/heads/master
Commit: fa4bc8ea8bab1277d1482da370dac79947cac719
Parents: 00ad4f0
Author: Dhruve Ashar 
Authored: Mon Jun 6 09:42:50 2016 -0700
Committer: Marcelo Vanzin 
Committed: Mon Jun 6 09:42:50 2016 -0700

--
 build/spark-build-info  | 38 ++
 core/pom.xml| 31 +++
 .../org/apache/spark/deploy/SparkSubmit.scala   |  7 ++-
 .../main/scala/org/apache/spark/package.scala   | 55 +++-
 pom.xml |  6 ++-
 project/SparkBuild.scala| 21 ++--
 6 files changed, 150 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/fa4bc8ea/build/spark-build-info
--
diff --git a/build/spark-build-info b/build/spark-build-info
new file mode 100755
index 000..ad0ec67
--- /dev/null
+++ b/build/spark-build-info
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This script generates the build info for spark and places it into the 
spark-version-info.properties file.
+# Arguments:
+#   build_tgt_directory - The target directory where properties file would be 
created. [./core/target/extra-resources]
+#   spark_version - The current version of spark
+
+RESOURCE_DIR="$1"
+mkdir -p "$RESOURCE_DIR"
+SPARK_BUILD_INFO="${RESOURCE_DIR}"/spark-version-info.properties
+
+echo_build_properties() {
+  echo version=$1
+  echo user=$USER
+  echo revision=$(git rev-parse HEAD)
+  echo branch=$(git rev-parse --abbrev-ref HEAD)
+  echo date=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+  echo url=$(git config --get remote.origin.url)
+}
+
+echo_build_properties $2 > "$SPARK_BUILD_INFO"

http://git-wip-us.apache.org/repos/asf/spark/blob/fa4bc8ea/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index 45f8bfc..f5fdb40 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -337,9 +337,40 @@
   
 
target/scala-${scala.binary.version}/classes
 
target/scala-${scala.binary.version}/test-classes
+
+  
+${project.basedir}/src/main/resources
+  
+  
+
+${project.build.directory}/extra-resources
+true
+  
+
 
   
 org.apache.maven.plugins
+maven-antrun-plugin
+
+  
+generate-resources
+
+  
+  
+
+  
+  
+
+  
+
+
+  run
+
+  
+
+  
+  
+org.apache.maven.plugins
 maven-dependency-plugin