[takari-pom] Add default for annotation processors config

Mikolaj Izdebski mizdebsk at fedoraproject.org
Thu Mar 12 19:09:33 UTC 2015


commit ae6b73f7189e4c824a6e0add0d7ab78f1c378616
Author: Michael Simacek <msimacek at redhat.com>
Date:   Fri Mar 6 19:44:37 2015 +0100

    Add default for annotation processors config

 takari-pom.spec | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/takari-pom.spec b/takari-pom.spec
index ded2b30..dca367a 100644
--- a/takari-pom.spec
+++ b/takari-pom.spec
@@ -1,27 +1,33 @@
 Name:           takari-pom
 Version:        15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Takari parent POM
 License:        EPL
 URL:            https://github.com/takari/takari-pom/
 BuildArch:      noarch
 
-Source0:        https://github.com/takari/takari-pom/archive/takari-%{version}.tar.gz
+Source0:        https://github.com/takari/%{name}/archive/takari-%{version}.tar.gz
 # Requested upstream to include license text:
 # https://github.com/tesla/tesla-pom/pull/1
 Source1:        http://www.eclipse.org/legal/epl-v10.html
 
 BuildRequires:  maven-local
+BuildRequires:  mvn(io.takari.maven.plugins:takari-lifecycle-plugin)
+
 
 %description
 Takari is a next generation development infrastructure framework.  This
 package provides Takari POM file to by used by Apache Maven.
 
 %prep
-%setup -q -n takari-pom-takari-%{version}
+%setup -q -n %{name}-takari-%{version}
 cp -p %{SOURCE1} .
 %mvn_alias : io.tesla:tesla
 
+# takari expects no annotations processors on classpath by default, but we
+# always have some in /usr/share/java
+%pom_xpath_inject 'pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId="takari-lifecycle-plugin"]/pom:configuration' '<proc>none</proc>'
+
 %build
 %mvn_build
 
@@ -32,6 +38,8 @@ cp -p %{SOURCE1} .
 %doc epl-v10.html
 
 %changelog
+* Fri Mar 06 2015 Michael Simacek <msimacek at redhat.com> - 15-2
+- Add default for annotation processors config
+
 * Fri Feb 20 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 15-1
 - Initial packaging
-


More information about the scm-commits mailing list