Fixed repl maven build to produce artifacts with the appropriate hadoop classifier and extracted repl fat-jar and debian packaging into a separate project to make Maven happy
This commit is contained in:
Thomas Dudziak
parent
b82a6dd2c7
commit
4af6cad37a
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -31,3 +31,4 @@ project/plugins/src_managed/
|
||||||
logs/
|
logs/
|
||||||
log/
|
log/
|
||||||
spark-tests.log
|
spark-tests.log
|
||||||
|
dependency-reduced-pom.xml
|
||||||
|
|
|
||||||
5
pom.xml
5
pom.xml
|
|
@ -39,9 +39,10 @@
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>core</module>
|
<module>core</module>
|
||||||
<module>repl</module>
|
|
||||||
<module>examples</module>
|
|
||||||
<module>bagel</module>
|
<module>bagel</module>
|
||||||
|
<module>examples</module>
|
||||||
|
<module>repl</module>
|
||||||
|
<module>repl-bin</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
|
|
||||||
231
repl-bin/pom.xml
Normal file
231
repl-bin/pom.xml
Normal file
|
|
@ -0,0 +1,231 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<parent>
|
||||||
|
<groupId>org.spark-project</groupId>
|
||||||
|
<artifactId>parent</artifactId>
|
||||||
|
<version>0.7.0-SNAPSHOT</version>
|
||||||
|
<relativePath>../pom.xml</relativePath>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<groupId>org.spark-project</groupId>
|
||||||
|
<artifactId>spark-repl-bin</artifactId>
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
<name>Spark Project REPL binary packaging</name>
|
||||||
|
<url>http://spark-project.org/</url>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<deb.install.path>/usr/share/spark</deb.install.path>
|
||||||
|
<deb.user>root</deb.user>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<shadedArtifactAttached>false</shadedArtifactAttached>
|
||||||
|
<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-shaded-${classifier}.jar</outputFile>
|
||||||
|
<artifactSet>
|
||||||
|
<includes>
|
||||||
|
<include>*:*</include>
|
||||||
|
</includes>
|
||||||
|
</artifactSet>
|
||||||
|
<filters>
|
||||||
|
<filter>
|
||||||
|
<artifact>*:*</artifact>
|
||||||
|
<excludes>
|
||||||
|
<exclude>META-INF/*.SF</exclude>
|
||||||
|
<exclude>META-INF/*.DSA</exclude>
|
||||||
|
<exclude>META-INF/*.RSA</exclude>
|
||||||
|
</excludes>
|
||||||
|
</filter>
|
||||||
|
</filters>
|
||||||
|
</configuration>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>shade</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<transformers>
|
||||||
|
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
|
||||||
|
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
||||||
|
<resource>reference.conf</resource>
|
||||||
|
</transformer>
|
||||||
|
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
||||||
|
<mainClass>spark.repl.Main</mainClass>
|
||||||
|
</transformer>
|
||||||
|
</transformers>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>hadoop1</id>
|
||||||
|
<properties>
|
||||||
|
<classifier>hadoop1</classifier>
|
||||||
|
</properties>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.spark-project</groupId>
|
||||||
|
<artifactId>spark-core</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>hadoop1</classifier>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.spark-project</groupId>
|
||||||
|
<artifactId>spark-bagel</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>hadoop1</classifier>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.spark-project</groupId>
|
||||||
|
<artifactId>spark-examples</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>hadoop1</classifier>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.spark-project</groupId>
|
||||||
|
<artifactId>spark-repl</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>hadoop1</classifier>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.hadoop</groupId>
|
||||||
|
<artifactId>hadoop-core</artifactId>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>hadoop2</id>
|
||||||
|
<properties>
|
||||||
|
<classifier>hadoop2</classifier>
|
||||||
|
</properties>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.spark-project</groupId>
|
||||||
|
<artifactId>spark-core</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>hadoop2</classifier>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.spark-project</groupId>
|
||||||
|
<artifactId>spark-bagel</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>hadoop2</classifier>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.spark-project</groupId>
|
||||||
|
<artifactId>spark-examples</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>hadoop2</classifier>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.spark-project</groupId>
|
||||||
|
<artifactId>spark-repl</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<classifier>hadoop2</classifier>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.hadoop</groupId>
|
||||||
|
<artifactId>hadoop-core</artifactId>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.hadoop</groupId>
|
||||||
|
<artifactId>hadoop-client</artifactId>
|
||||||
|
<scope>runtime</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>deb</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>buildnumber-maven-plugin</artifactId>
|
||||||
|
<version>1.1</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}/${project.artifactId}-${classifier}_${project.version}-${buildNumber}_all.deb</deb>
|
||||||
|
<attach>false</attach>
|
||||||
|
<compression>gzip</compression>
|
||||||
|
<dataSet>
|
||||||
|
<data>
|
||||||
|
<src>${project.build.directory}/${project.artifactId}-${project.version}-shaded-${classifier}.jar</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}/src/deb/bin</src>
|
||||||
|
<type>directory</type>
|
||||||
|
<mapper>
|
||||||
|
<type>perm</type>
|
||||||
|
<user>${deb.user}</user>
|
||||||
|
<group>${deb.user}</group>
|
||||||
|
<prefix>${deb.install.path}</prefix>
|
||||||
|
<filemode>744</filemode>
|
||||||
|
</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>744</filemode>
|
||||||
|
</mapper>
|
||||||
|
</data>
|
||||||
|
</dataSet>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
</project>
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
Package: spark-repl
|
Package: [[artifactId]]
|
||||||
Version: [[version]]-[[buildNumber]]
|
Version: [[version]]-[[buildNumber]]
|
||||||
Section: misc
|
Section: misc
|
||||||
Priority: extra
|
Priority: extra
|
||||||
146
repl/pom.xml
146
repl/pom.xml
|
|
@ -99,46 +99,17 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-core</artifactId>
|
<artifactId>hadoop-core</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
<classifier>hadoop1</classifier>
|
||||||
<shadedClassifierName>shaded-hadoop1</shadedClassifierName>
|
|
||||||
<filters>
|
|
||||||
<filter>
|
|
||||||
<artifact>*:*</artifact>
|
|
||||||
<excludes>
|
|
||||||
<exclude>META-INF/*.SF</exclude>
|
|
||||||
<exclude>META-INF/*.DSA</exclude>
|
|
||||||
<exclude>META-INF/*.RSA</exclude>
|
|
||||||
</excludes>
|
|
||||||
</filter>
|
|
||||||
</filters>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>shade</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<transformers>
|
|
||||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
|
|
||||||
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
|
||||||
<resource>reference.conf</resource>
|
|
||||||
</transformer>
|
|
||||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
|
||||||
<mainClass>spark.repl.Main</mainClass>
|
|
||||||
</transformer>
|
|
||||||
</transformers>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
@ -172,125 +143,22 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-core</artifactId>
|
<artifactId>hadoop-core</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-client</artifactId>
|
<artifactId>hadoop-client</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
<classifier>hadoop2</classifier>
|
||||||
<shadedClassifierName>shaded-hadoop2</shadedClassifierName>
|
|
||||||
<filters>
|
|
||||||
<filter>
|
|
||||||
<artifact>*:*</artifact>
|
|
||||||
<excludes>
|
|
||||||
<exclude>META-INF/*.SF</exclude>
|
|
||||||
<exclude>META-INF/*.DSA</exclude>
|
|
||||||
<exclude>META-INF/*.RSA</exclude>
|
|
||||||
</excludes>
|
|
||||||
</filter>
|
|
||||||
</filters>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>shade</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<transformers>
|
|
||||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
|
|
||||||
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
|
||||||
<resource>reference.conf</resource>
|
|
||||||
</transformer>
|
|
||||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
|
||||||
<mainClass>spark.repl.Main</mainClass>
|
|
||||||
</transformer>
|
|
||||||
</transformers>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>deb</id>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>buildnumber-maven-plugin</artifactId>
|
|
||||||
<version>1.1</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}/${project.artifactId}-${classifier}_${project.version}-${buildNumber}_all.deb</deb>
|
|
||||||
<attach>false</attach>
|
|
||||||
<compression>gzip</compression>
|
|
||||||
<dataSet>
|
|
||||||
<data>
|
|
||||||
<src>${project.build.directory}/${project.artifactId}-${project.version}-shaded-${classifier}.jar</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}/src/deb/bin</src>
|
|
||||||
<type>directory</type>
|
|
||||||
<mapper>
|
|
||||||
<type>perm</type>
|
|
||||||
<user>${deb.user}</user>
|
|
||||||
<group>${deb.user}</group>
|
|
||||||
<prefix>${deb.install.path}</prefix>
|
|
||||||
<filemode>744</filemode>
|
|
||||||
</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>744</filemode>
|
|
||||||
</mapper>
|
|
||||||
</data>
|
|
||||||
</dataSet>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue