diff --git a/javapackages/macros.fjava b/javapackages/macros.fjava index 0ee4b73..8f116b1 100644 --- a/javapackages/macros.fjava +++ b/javapackages/macros.fjava @@ -199,8 +199,7 @@ fi \ # directory containing pom.xml. If POM location is not given then pom.xml from # current working directory is used. # -%pom_remove_dep() %{expand: %{__pom_call}remove_dep %* -} +%pom_remove_dep() %{expand: %{__pom_call}remove_dep %*} # %pom_remove_plugin - remove Maven plugin invocation from POM file @@ -218,8 +217,7 @@ fi \ # directory containing pom.xml. If POM location is not given then pom.xml from # current working directory is used. # -%pom_remove_plugin() %{expand: %{__pom_call}remove_plugin %* -} +%pom_remove_plugin() %{expand: %{__pom_call}remove_plugin %*} # %pom_disable_module - disable given project module in POM file @@ -236,8 +234,7 @@ fi \ # directory containing pom.xml. If POM location is not given then pom.xml from # current working directory is used. # -%pom_disable_module() %{expand: %{__pom_call}disable_module %* -} +%pom_disable_module() %{expand: %{__pom_call}disable_module %*} # %pom_xpath_remove - remove an XML node from POM file @@ -261,8 +258,7 @@ fi \ # because it selects nodes from pom namespace, but "environment/os" won't find # anything because it looks for nodes that don't belong to any XML namespace. # -%pom_xpath_remove() %{expand: %{__pom_call}xpath_remove %* -} +%pom_xpath_remove() %{expand: %{__pom_call}xpath_remove %*} # %pom_xpath_inject - inject XML code into POM file @@ -280,8 +276,7 @@ fi \ # directory containing pom.xml. If POM location is not given then pom.xml from # current working directory is used. # -%pom_xpath_inject() %{expand: %{__pom_call}xpath_inject %* -} +%pom_xpath_inject() %{expand: %{__pom_call}xpath_inject %*} # %pom_xpath_replace - replace XML node from POM file with given XML code @@ -299,8 +294,7 @@ fi \ # directory containing pom.xml. If POM location is not given then pom.xml from # current working directory is used. # -%pom_xpath_replace() %{expand: %{__pom_call}xpath_replace %* -} +%pom_xpath_replace() %{expand: %{__pom_call}xpath_replace %*} # %pom_xpath_set - set text contents of XML node from POM file @@ -318,8 +312,7 @@ fi \ # directory containing pom.xml. If POM location is not given then pom.xml from # current working directory is used. # -%pom_xpath_set() %{expand: %{__pom_call}xpath_set %* -} +%pom_xpath_set() %{expand: %{__pom_call}xpath_set %*} # %pom_add_parent - add parent POM reference to POM file @@ -342,8 +335,7 @@ fi \ # usually not the expected behavior, so if you want to replace existing parent # POM reference, consider using %pom_set_parent macro instead. # -%pom_add_parent() %{expand: %{__pom_call}add_parent %* -} +%pom_add_parent() %{expand: %{__pom_call}add_parent %*} # %pom_remove_parent - remove parent POM reference from POM file @@ -356,8 +348,7 @@ fi \ # directory containing pom.xml. If POM location is not given then pom.xml from # current working directory is used. # -%pom_remove_parent() %{expand: %{__pom_call}remove_parent %* -} +%pom_remove_parent() %{expand: %{__pom_call}remove_parent %*} # %pom_set_parent - set parent POM reference in POM file @@ -372,8 +363,7 @@ fi \ # invocation of %pom_add_parent. See documentation for these macros for more # information about parameters. # -%pom_set_parent() %{expand: %{__pom_call}set_parent %* -} +%pom_set_parent() %{expand: %{__pom_call}set_parent %*} # %pom_add_dep[_mgmt] - add dependency to POM file @@ -400,10 +390,8 @@ fi \ # Extra XML is additional XML code to be added into the node. This # parameter can be ommited, in which case no extra XML is appended. # -%pom_add_dep() %{expand: %{__pom_call}add_dep %* -} -%pom_add_dep_mgmt() %{expand: %{__pom_call}add_dep_mgmt %* -} +%pom_add_dep() %{expand: %{__pom_call}add_dep %*} +%pom_add_dep_mgmt() %{expand: %{__pom_call}add_dep_mgmt %*} # %pom_add_plugin - add plugin invocation to POM file @@ -426,5 +414,4 @@ fi \ # Extra XML is additional XML code to be added into the node. This # parameter can be ommited, in which case no extra XML is appended. # -%pom_add_plugin() %{expand: %{__pom_call}add_plugin %* -} +%pom_add_plugin() %{expand: %{__pom_call}add_plugin %*}