[tycho] Add Requires on plugins present in Maven super POM

Roland Grunberg rgrunber at fedoraproject.org
Thu Jun 6 14:48:56 UTC 2013


commit 6b397f648d4954d8f76bdea96dd5f59c8e5c5821
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Jun 6 10:58:08 2013 +0200

    Add Requires on plugins present in Maven super POM
    
    - Resolves: rhbz#971301

 tycho.spec |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 3a57460..e0e4ce9 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -9,7 +9,7 @@
 
 Name:           tycho
 Version:        0.18.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -55,6 +55,8 @@ BuildRequires:  maven-local
 BuildRequires:  maven-clean-plugin
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-dependency-plugin
+# Temporarily added to avoid bootstrap build
+BuildRequires:  maven-deploy-plugin
 BuildRequires:  maven-install-plugin
 BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-javadoc-plugin
@@ -68,6 +70,7 @@ BuildRequires:  maven-surefire-provider-junit4
 BuildRequires:  objectweb-asm4
 BuildRequires:  plexus-containers-component-metadata
 BuildRequires:  decentxml
+BuildRequires:  easymock3
 BuildRequires:  ecj
 %if ! %{bootstrap}
 BuildRequires:  osgi(org.eclipse.jdt)
@@ -88,6 +91,19 @@ Requires:       ecj
 Requires:       osgi(org.eclipse.platform)
 %endif
 
+# Tycho always tries to resolve all build plugins, even if they are
+# not needed during Maven lifecycle.  This means that Tycho will try
+# to resolve plugins like clean, deploy or site, which aren't normally
+# used during package build.  See rhbz#971301
+Requires:       maven-clean-plugin
+Requires:       maven-compiler-plugin
+Requires:       maven-deploy-plugin
+Requires:       maven-install-plugin
+Requires:       maven-jar-plugin
+Requires:       maven-resources-plugin
+Requires:       maven-site-plugin
+Requires:       maven-surefire-plugin
+
 
 %description
 Tycho is a set of Maven plugins and extensions for building Eclipse
@@ -268,6 +284,10 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jun 6 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.18.0-2
+- Add Requires on plugins present in Maven super POM
+- Resolves: rhbz#971301
+
 * Tue May 28 2013 Roland Grunberg <rgrunber at redhat.com> 0.18.0-1
 - Update to 0.18.0 Release.
 


More information about the scm-commits mailing list