diff options
| -rw-r--r-- | assembly/pom.xml | 129 | ||||
| -rw-r--r-- | assembly/src/deb/RELEASE | 2 | ||||
| -rw-r--r-- | assembly/src/deb/control/control | 8 | ||||
| -rw-r--r-- | docs/building-spark.md | 10 | ||||
| -rw-r--r-- | repl/pom.xml | 2 |
5 files changed, 0 insertions, 151 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index c1bcdbb664..fa9f56e556 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> diff --git a/assembly/src/deb/RELEASE b/assembly/src/deb/RELEASE deleted file mode 100644 index aad50ee73a..0000000000 --- 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 diff --git a/assembly/src/deb/control/control b/assembly/src/deb/control/control deleted file mode 100644 index a6b4471d48..0000000000 --- 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 <matei.zaharia@gmail.com> -Description: [[name]] -Distribution: development diff --git a/docs/building-spark.md b/docs/building-spark.md index d3824fb61e..088da7da49 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. diff --git a/repl/pom.xml b/repl/pom.xml index 3d4adf8fd5..b883344bf0 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> |