This commit is contained in:
Daniel Li 2016-01-05 15:38:11 -08:00
Родитель a40308b4b5
Коммит d06c51ce5e
3 изменённых файлов: 22 добавлений и 5 удалений

Просмотреть файл

@ -1,10 +1,11 @@
<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/maven-v4_0_0.xsd"> <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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.microsoft.spark</groupId> <groupId>com.microsoft.sparkclr</groupId>
<artifactId>spark-clr</artifactId> <artifactId>spark-clr_2.10</artifactId>
<version>1.5.2-SNAPSHOT</version> <version>1.5.2-SNAPSHOT</version>
<name>${project.artifactId}</name> <name>SparkCLR Project</name>
<description>C# language binding and extensions to Apache Spark</description> <description>C# language binding and extensions to Apache Spark</description>
<url>https://github.com/Microsoft/sparkclr</url>
<inceptionYear>2015</inceptionYear> <inceptionYear>2015</inceptionYear>
<licenses> <licenses>
<license> <license>
@ -14,6 +15,21 @@
</license> </license>
</licenses> </licenses>
<developers>
<developer>
<name>SparkCLR Team</name>
<email>sparkclrdev@microsoft.com</email>
<organization>Microsoft</organization>
<organizationUrl>http://www.microsoft.com</organizationUrl>
</developer>
</developers>
<scm>
<connection>scm:git:git@github.com:Microsoft/SparkCLR.git</connection>
<developerConnection>scm:git:git@github.com:Microsoft/SparkCLR.git</developerConnection>
<url>git@github.com:Microsoft/SparkCLR.git</url>
</scm>
<properties> <properties>
<maven.compiler.source>1.5</maven.compiler.source> <maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target> <maven.compiler.target>1.5</maven.compiler.target>
@ -95,6 +111,7 @@
<plugin> <plugin>
<groupId>org.scala-tools</groupId> <groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId> <artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>

Просмотреть файл

@ -25,7 +25,7 @@ if "%SPARK_ASSEMBLY_JAR%"=="0" (
exit /b 1 exit /b 1
) )
set SPARKCLR_JAR=spark-clr-1.5.2-SNAPSHOT.jar set SPARKCLR_JAR=spark-clr_2.10-1.5.2-SNAPSHOT.jar
set SPARKCLR_CLASSPATH=%SPARKCLR_HOME%\lib\%SPARKCLR_JAR% set SPARKCLR_CLASSPATH=%SPARKCLR_HOME%\lib\%SPARKCLR_JAR%
if not "%SPARKCSV_JARS%" == "" ( if not "%SPARKCSV_JARS%" == "" (
SET SPARKCLR_CLASSPATH=%SPARKCLR_CLASSPATH%;%SPARKCSV_JARS% SET SPARKCLR_CLASSPATH=%SPARKCLR_CLASSPATH%;%SPARKCSV_JARS%

Просмотреть файл

@ -54,7 +54,7 @@ then
exit 1 exit 1
fi fi
export SPARKCLR_JAR=spark-clr-1.5.2-SNAPSHOT.jar export SPARKCLR_JAR=spark-clr_2.10-1.5.2-SNAPSHOT.jar
export SPARKCLR_CLASSPATH="$SPARKCLR_HOME/lib/$SPARKCLR_JAR" export SPARKCLR_CLASSPATH="$SPARKCLR_HOME/lib/$SPARKCLR_JAR"
[ ! "$SPARKCSV_JARS" = "" ] && export SPARKCLR_CLASSPATH="$SPARKCLR_CLASSPATH:$SPARKCSV_JARS" [ ! "$SPARKCSV_JARS" = "" ] && export SPARKCLR_CLASSPATH="$SPARKCLR_CLASSPATH:$SPARKCSV_JARS"
export LAUNCH_CLASSPATH="$SPARK_ASSEMBLY_JAR:$SPARKCLR_CLASSPATH" export LAUNCH_CLASSPATH="$SPARK_ASSEMBLY_JAR:$SPARKCLR_CLASSPATH"