Browse Source

Add maven options parameters

Bruno Mahé 14 years ago
parent
commit
44cfedf85c
3 changed files with 12 additions and 12 deletions
  1. 2 2
      Makefile
  2. 2 2
      apps/beeswax/Makefile
  3. 8 8
      desktop/libs/hadoop/Makefile

+ 2 - 2
Makefile

@@ -146,7 +146,7 @@ crepo: $(THIRDPARTY_JS_DIR)/manifest.json $(THIRDPARTY_JS_DIR)/*.hash
 # Install parent POM
 ###################################
 parent-pom:
-	cd $(ROOT)/maven && mvn install
+	cd $(ROOT)/maven && mvn install $(MAVEN_OPTIONS)
 
 .PHONY: parent-pom
 
@@ -273,7 +273,7 @@ ext-clean:
 ###############################################
 
 java-test:
-	mvn -f desktop/libs/hadoop/java/pom.xml test
+	mvn -f desktop/libs/hadoop/java/pom.xml test $(MAVEN_OPTIONS)
 
 test: java-test
 	DESKTOP_DEBUG=1 $(ENV_PYTHON) $(BLD_DIR_BIN)/hue test fast --with-xunit

+ 2 - 2
apps/beeswax/Makefile

@@ -45,11 +45,11 @@ ifneq (,$(HAVE_JAVA_SRC))
 # If we have the source, remove the java-lib
 clean::
 	rm -Rf $(BEESWAX_JAVA_LIB)
-	cd $(BEESWAX_JAVA_DIR) && mvn clean || :
+	cd $(BEESWAX_JAVA_DIR) && mvn clean $(MAVEN_OPTIONS) || :
 
 $(BEESWAX): $(shell find $(BEESWAX_JAVA_DIR) -type f)
 	@echo "--- Building Desktop beeswax"
-	cd $(BEESWAX_JAVA_DIR) && mvn clean install -DskipTests
+	cd $(BEESWAX_JAVA_DIR) && mvn clean install -DskipTests $(MAVEN_OPTIONS)
 	@mkdir -p $(BEESWAX_JAVA_LIB)
 	@cp $(BLD_DIR_BEESWAX)/beeswax-server-$(MAVEN_VERSION).jar $@
 

+ 8 - 8
desktop/libs/hadoop/Makefile

@@ -69,12 +69,12 @@ ifneq (,$(wildcard $(PLUGIN_JAVA_DIR)))
 $(DESKTOP_PLUGIN_JAR): $(shell find $(PLUGIN_JAVA_DIR) -type f)
 	mkdir -p $(PLUGIN_JAVA_LIB)
 	@echo "--- Building Hadoop plugins"
-	cd $(PLUGIN_JAVA_DIR) && mvn clean install -DskipTests
+	cd $(PLUGIN_JAVA_DIR) && mvn clean install -DskipTests $(MAVEN_OPTIONS)
 	cp $(BLD_DIR_PLUGINS)/hue-plugins-$(MAVEN_VERSION).jar $(DESKTOP_PLUGIN_JAR)
 
 clean::
 	rm -rf $(PLUGIN_JAVA_LIB)
-	cd $(PLUGIN_JAVA_DIR) && mvn clean ||:
+	cd $(PLUGIN_JAVA_DIR) && mvn clean $(MAVEN_OPTIONS) ||:
 else
 $(DESKTOP_PLUGIN_JAR):
 	$(error Cannot build hadoop plugin without source)
@@ -85,12 +85,12 @@ ifneq (,$(wildcard $(STATIC_GROUP_MAPPING_SRC)))
 $(STATIC_GROUP_MAPPING): $(shell find $(STATIC_GROUP_MAPPING_SRC) -type f)
 	mkdir -p $(STATIC_GROUP_MAPPING_LIB)
 	@echo "--- Building static UserGroupMappingService"
-	cd $(STATIC_GROUP_MAPPING_DIR) && mvn clean install -DskipTests
+	cd $(STATIC_GROUP_MAPPING_DIR) && mvn clean install -DskipTests $(MAVEN_OPTIONS)
 	cp $(STATIC_GROUP_MAPPING_BUILD)/static-group-mapping-$(MAVEN_VERSION).jar $(STATIC_GROUP_MAPPING)
 
 clean::
 	rm -rf $(STATIC_GROUP_MAPPING_LIB)
-	cd $(STATIC_GROUP_MAPPING_DIR) && mvn clean ||:
+	cd $(STATIC_GROUP_MAPPING_DIR) && mvn clean $(MAVEN_OPTIONS) ||:
 else
 $(STATIC_GROUP_MAPPING):
 	$(error Cannot build static-group-mapping jar without source)
@@ -101,12 +101,12 @@ ifneq (,$(wildcard $(SUDO_SHELL_SRC)))
 $(SUDO_SHELL): $(shell find $(SUDO_SHELL_SRC) -type f)
 	mkdir -p $(SUDO_SHELL_LIB)
 	@echo "--- Building sudo fsshell tool"
-	cd $(SUDO_SHELL_DIR) && mvn clean install -DskipTests
+	cd $(SUDO_SHELL_DIR) && mvn clean install -DskipTests $(MAVEN_OPTIONS)
 	cp $(SUDO_SHELL_BUILD)/sudo-shell-$(MAVEN_VERSION).jar $(SUDO_SHELL)
 
 clean::
 	rm -rf $(SUDO_SHELL_LIB)
-	cd $(SUDO_SHELL_DIR) && mvn clean ||:
+	cd $(SUDO_SHELL_DIR) && mvn clean $(MAVEN_OPTIONS) ||:
 else
 $(SUDO_SHELL):
 	$(error cannot build sudo-shell jar without source)
@@ -117,12 +117,12 @@ ifneq (,$(wildcard $(CREDENTIALS_MERGER_SRC)))
 $(CREDENTIALS_MERGER): $(shell find $(CREDENTIALS_MERGER_SRC) -type f)
 	mkdir -p $(CREDENTIALS_MERGER_LIB)
 	@echo "--- Building credentials merger tool"
-	cd $(CREDENTIALS_MERGER_DIR) && mvn clean install -DskipTests
+	cd $(CREDENTIALS_MERGER_DIR) && mvn clean install -DskipTests $(MAVEN_OPTIONS)
 	cp $(CREDENTIALS_MERGER_BUILD)/credentials-merger-$(MAVEN_VERSION).jar $(CREDENTIALS_MERGER)
 
 clean::
 	rm -rf $(CREDENTIALS_MERGER_LIB)
-	cd $(CREDENTIALS_MERGER_DIR) && mvn clean ||:
+	cd $(CREDENTIALS_MERGER_DIR) && mvn clean $(MAVEN_OPTIONS) ||:
 else
 $(CREDENTAILS_MERGER):
 	$(error cannot build credentials merger jar without source)