[thermostat/f20] Fix thermostat to build with xmvn 1.1.0
jerboaa
jerboaa at fedoraproject.org
Fri Oct 25 17:17:43 UTC 2013
commit bd4c8e580e00bb7543c8615c80252cf47f8a5bb2
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date: Thu Oct 24 17:40:44 2013 +0200
Fix thermostat to build with xmvn 1.1.0
thermostat.spec | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index 827e472..f04f901 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -265,6 +265,21 @@ rm distribution/config/commands/webservice.properties
%pom_remove_dep org.eclipse.jetty:jetty-server distribution
%pom_remove_dep org.eclipse.jetty:jetty-webapp distribution
+# Remove system scope and systemPath for com.sun:tools dependencies.
+# xmvn complains about those at install time.
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:scope" agent/core
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:scope" common/core
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:scope" thread/collector
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:scope" vm-heap-analysis/command
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:scope" vm-heap-analysis/client-swing
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:scope" vm-heap-analysis/client-core
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:systemPath" agent/core
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:systemPath" common/core
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:systemPath" thread/collector
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:systemPath" vm-heap-analysis/command
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:systemPath" vm-heap-analysis/client-swing
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:systemPath" vm-heap-analysis/client-core
+
# Skip automatic installation of the war module.
# We install it manually. Without this "config" %mvn_build -f
# fails. See RHBZ#963838
More information about the scm-commits
mailing list