Эх сурвалжийг харах

[spark] Make the livy-assembly.jar not include the maven version

Erick Tryzelaar 10 жил өмнө
parent
commit
92cef00

+ 1 - 1
apps/spark/Makefile

@@ -29,7 +29,7 @@ JAVA_LIB = $(SPARK_ROOT)/java-lib
 LIVY_DIR = $(SPARK_ROOT)/java
 LIVY_DIR = $(SPARK_ROOT)/java
 LIVY_TARGET_DIR = $(LIVY_DIR)/livy-assembly/target/scala-2.10
 LIVY_TARGET_DIR = $(LIVY_DIR)/livy-assembly/target/scala-2.10
 LIVY_ASSEMBLY_JAR = livy-assembly-$(MAVEN_VERSION).jar
 LIVY_ASSEMBLY_JAR = livy-assembly-$(MAVEN_VERSION).jar
-LIVY_JAR = $(JAVA_LIB)/$(LIVY_ASSEMBLY)
+LIVY_JAR = $(JAVA_LIB)/livy-assembly.jar
 
 
 HAVE_JAVA_SRC = $(wildcard $(LIVY_DIR))
 HAVE_JAVA_SRC = $(wildcard $(LIVY_DIR))
 
 

+ 1 - 1
apps/spark/src/spark/conf.py

@@ -46,7 +46,7 @@ LIVY_ASSEMBLY_JAR = Config(
   key="livy_assembly_jar",
   key="livy_assembly_jar",
   help=_t("Path to livy-assembly.jar"),
   help=_t("Path to livy-assembly.jar"),
   private=True,
   private=True,
-  default=os.path.join(os.path.dirname(__file__), "..", "..", "java-lib", "livy-assembly-3.7.0-SNAPSHOT.jar"))
+  default=os.path.join(os.path.dirname(__file__), "..", "..", "java-lib", "livy-assembly.jar"))
 
 
 LIVY_SERVER_HOST = Config(
 LIVY_SERVER_HOST = Config(
   key="livy_server_host",
   key="livy_server_host",