[thermostat/f19] Remove plugins we don't need and add missing BR maven-javadoc-plugin.
jerboaa
jerboaa at fedoraproject.org
Fri Mar 15 18:36:05 UTC 2013
commit c5cbeb1ab036dfc88ff5ad7ae042e5e3f4132ef0
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date: Fri Mar 15 19:35:14 2013 +0100
Remove plugins we don't need and add missing BR maven-javadoc-plugin.
thermostat.spec | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index 280b8f6..4897e2a 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -1,13 +1,13 @@
# Uncomment to build from snapshot out of hg. See also Release and Source0
#%global hgrev d6145521e208
# Set to true for mvn-rpmbuild resolver debug output
-%global maven_debug_flag false
+%global maven_debug_flag true
Name: thermostat
Version: 0.6.0
# If building from snapshot out of hg, uncomment and adjust below value as appropriate
#Release: 0.28.20121123hg%{hgrev}%{?dist}
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: A monitoring and serviceability tool for OpenJDK
License: GPLv2+ with exceptions
URL: http://icedtea.classpath.org/thermostat/
@@ -49,6 +49,7 @@ BuildRequires: maven-war-plugin
BuildRequires: maven-clean-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-plugin-bundle
+BuildRequires: maven-javadoc-plugin
BuildRequires: libgnome-keyring-devel
BuildRequires: felix-framework
@@ -153,6 +154,12 @@ tomcat's webapps directory.
%pom_remove_plugin org.jacoco:jacoco-maven-plugin
%pom_remove_plugin org.jacoco:jacoco-maven-plugin web/war
+# Remove pmd plugin
+%pom_remove_plugin org.apache.maven.plugins:maven-pmd-plugin
+
+# Remove m2e's lifecyle plugin
+%pom_remove_plugin org.eclipse.m2e:lifecycle-mapping
+
# Disable dev and integation-tests modules
%pom_disable_module dev
%pom_disable_module integration-tests
@@ -380,6 +387,10 @@ popd
%{_datadir}/tomcat/webapps/%{name}
%changelog
+* Fri Mar 15 2013 Severin Gehwolf <sgehwolf at redhat.com> 0.6.0-12
+- Remove plugins we don't need via pom macros.
+- Add missing BR maven-javadoc-plugin.
+
* Fri Mar 15 2013 Severin Gehwolf <sgehwolf at redhat.com> 0.6.0-11
- Fix webapp so as to allow symlinking deps.
- Add default users for webstorage.
More information about the scm-commits
mailing list