You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/02/12 13:36:31 UTC
spark git commit: SPARK-5727 [BUILD] Remove Debian packaging
Repository: spark
Updated Branches:
refs/heads/master a38e23c30 -> 9a3ea49f7
SPARK-5727 [BUILD] Remove Debian packaging
(for master / 1.4 only)
Author: Sean Owen <so...@cloudera.com>
Closes #4526 from srowen/SPARK-5727.2 and squashes the following commits:
83ba49c [Sean Owen] Remove Debian packaging
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9a3ea49f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9a3ea49f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9a3ea49f
Branch: refs/heads/master
Commit: 9a3ea49f74b9a41dba527a7e995735f488fe0847
Parents: a38e23c
Author: Sean Owen <so...@cloudera.com>
Authored: Thu Feb 12 12:36:26 2015 +0000
Committer: Sean Owen <so...@cloudera.com>
Committed: Thu Feb 12 12:36:26 2015 +0000
----------------------------------------------------------------------
assembly/pom.xml | 129 ----------------------------------
assembly/src/deb/RELEASE | 2 -
assembly/src/deb/control/control | 8 ---
docs/building-spark.md | 10 ---
repl/pom.xml | 2 -
5 files changed, 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/9a3ea49f/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c1bcdbb..fa9f56e 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -36,10 +36,6 @@
<spark.jar.dir>scala-${scala.binary.version}</spark.jar.dir>
<spark.jar.basename>spark-assembly-${project.version}-hadoop${hadoop.version}.jar</spark.jar.basename>
<spark.jar>${project.build.directory}/${spark.jar.dir}/${spark.jar.basename}</spark.jar>
- <deb.pkg.name>spark</deb.pkg.name>
- <deb.install.path>/usr/share/spark</deb.install.path>
- <deb.user>root</deb.user>
- <deb.bin.filemode>755</deb.bin.filemode>
</properties>
<dependencies>
@@ -218,131 +214,6 @@
</build>
</profile>
<profile>
- <id>deb</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <echo>
- NOTE: Debian packaging is deprecated and is scheduled to be removed in Spark 1.4.
- </echo>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- <configuration>
- <shortRevisionLength>8</shortRevisionLength>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.vafer</groupId>
- <artifactId>jdeb</artifactId>
- <version>0.11</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>jdeb</goal>
- </goals>
- <configuration>
- <deb>${project.build.directory}/${deb.pkg.name}_${project.version}-${buildNumber}_all.deb</deb>
- <attach>false</attach>
- <compression>gzip</compression>
- <dataSet>
- <data>
- <src>${spark.jar}</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <user>${deb.user}</user>
- <group>${deb.user}</group>
- <prefix>${deb.install.path}/jars</prefix>
- </mapper>
- </data>
- <data>
- <src>${basedir}/src/deb/RELEASE</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <user>${deb.user}</user>
- <group>${deb.user}</group>
- <prefix>${deb.install.path}</prefix>
- </mapper>
- </data>
- <data>
- <src>${basedir}/../conf</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <user>${deb.user}</user>
- <group>${deb.user}</group>
- <prefix>${deb.install.path}/conf</prefix>
- <filemode>${deb.bin.filemode}</filemode>
- </mapper>
- </data>
- <data>
- <src>${basedir}/../bin</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <user>${deb.user}</user>
- <group>${deb.user}</group>
- <prefix>${deb.install.path}/bin</prefix>
- <filemode>${deb.bin.filemode}</filemode>
- </mapper>
- </data>
- <data>
- <src>${basedir}/../sbin</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <user>${deb.user}</user>
- <group>${deb.user}</group>
- <prefix>${deb.install.path}/sbin</prefix>
- <filemode>${deb.bin.filemode}</filemode>
- </mapper>
- </data>
- <data>
- <src>${basedir}/../python</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
- <user>${deb.user}</user>
- <group>${deb.user}</group>
- <prefix>${deb.install.path}/python</prefix>
- <filemode>${deb.bin.filemode}</filemode>
- </mapper>
- </data>
- </dataSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>kinesis-asl</id>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/spark/blob/9a3ea49f/assembly/src/deb/RELEASE
----------------------------------------------------------------------
diff --git a/assembly/src/deb/RELEASE b/assembly/src/deb/RELEASE
deleted file mode 100644
index aad50ee..0000000
--- a/assembly/src/deb/RELEASE
+++ /dev/null
@@ -1,2 +0,0 @@
-compute-classpath.sh uses the existence of this file to decide whether to put the assembly jar on the
-classpath or instead to use classfiles in the source tree.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/spark/blob/9a3ea49f/assembly/src/deb/control/control
----------------------------------------------------------------------
diff --git a/assembly/src/deb/control/control b/assembly/src/deb/control/control
deleted file mode 100644
index a6b4471..0000000
--- a/assembly/src/deb/control/control
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: [[deb.pkg.name]]
-Version: [[version]]-[[buildNumber]]
-Section: misc
-Priority: extra
-Architecture: all
-Maintainer: Matei Zaharia <ma...@gmail.com>
-Description: [[name]]
-Distribution: development
http://git-wip-us.apache.org/repos/asf/spark/blob/9a3ea49f/docs/building-spark.md
----------------------------------------------------------------------
diff --git a/docs/building-spark.md b/docs/building-spark.md
index d3824fb..088da7d 100644
--- a/docs/building-spark.md
+++ b/docs/building-spark.md
@@ -159,16 +159,6 @@ Thus, the full flow for running continuous-compilation of the `core` submodule m
For help in setting up IntelliJ IDEA or Eclipse for Spark development, and troubleshooting, refer to the
[wiki page for IDE setup](https://cwiki.apache.org/confluence/display/SPARK/Contributing+to+Spark#ContributingtoSpark-IDESetup).
-# Building Spark Debian Packages
-
-_NOTE: Debian packaging is deprecated and is scheduled to be removed in Spark 1.4._
-
-The Maven build includes support for building a Debian package containing the assembly 'fat-jar', PySpark, and the necessary scripts and configuration files. This can be created by specifying the following:
-
- mvn -Pdeb -DskipTests clean package
-
-The debian package can then be found under assembly/target. We added the short commit hash to the file name so that we can distinguish individual packages built for SNAPSHOT versions.
-
# Running Java 8 Test Suites
Running only Java 8 tests and nothing else.
http://git-wip-us.apache.org/repos/asf/spark/blob/9a3ea49f/repl/pom.xml
----------------------------------------------------------------------
diff --git a/repl/pom.xml b/repl/pom.xml
index 3d4adf8..b883344 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -33,8 +33,6 @@
<properties>
<sbt.project.name>repl</sbt.project.name>
- <deb.install.path>/usr/share/spark</deb.install.path>
- <deb.user>root</deb.user>
<extra.source.dir>scala-2.10/src/main/scala</extra.source.dir>
<extra.testsource.dir>scala-2.10/src/test/scala</extra.testsource.dir>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org