[takari-lifecycle] Non-bootstrap bulid

[Mikolaj Izdebski]

commit de2462234689ccbab82dff7976f1550e0da5db7f
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Mar 12 20:17:43 2015 +0100

    Non-bootstrap bulid

 takari-lifecycle.spec | 39 +++++----------------------------------
 1 file changed, 5 insertions(+), 34 deletions(-)
---
diff --git a/takari-lifecycle.spec b/takari-lifecycle.spec
index bcec935..b9bb570 100644
--- a/takari-lifecycle.spec
+++ b/takari-lifecycle.spec
@@ -1,8 +1,6 @@
-%bcond_without bootstrap
-
 Name:           takari-lifecycle
 Version:        1.10.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Optimized replacement for the Maven default lifecycle
 # Everything is under EPL, but one file (AetherUtils.java) is under both EPL and ASL 2.0
 License:        EPL and ASL 2.0
@@ -22,6 +20,7 @@ BuildRequires:  mvn(com.google.guava:guava)
 BuildRequires:  mvn(io.takari:incrementalbuild)
 BuildRequires:  mvn(io.takari.m2e.workspace:org.eclipse.m2e.workspace.cli)
 BuildRequires:  mvn(io.takari:takari-archiver)
+BuildRequires:  mvn(io.takari:takari:pom:)
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-exec)
@@ -54,11 +53,6 @@ BuildRequires:  mvn(org.sonatype.sisu:sisu-guice::no_aop:)
 BuildRequires:  mvn(xmlunit:xmlunit)
 
 
-%if ! %{with bootstrap}
-BuildRequires:  mvn(io.takari:takari:pom:)
-%endif
-
-
 %description
 Takari Maven Lifecycle includes an optimized replacement for the Maven
 default lifecycle.  The Takari Lifecycle Plugin is a Maven plugin with
@@ -89,32 +83,6 @@ ln -sf %{_javadir}/commons-lang.jar takari-lifecycle-plugin/src/test/jars/common
 %pom_remove_plugin -r :animal-sniffer-maven-plugin
 %pom_remove_plugin -r :license-maven-plugin
 
-%if %{with bootstrap}
-%pom_remove_parent
-%pom_xpath_set pom:project/pom:packaging maven-plugin takari-lifecycle-plugin
-%pom_add_plugin :maven-compiler-plugin '
-<configuration>
-<source>1.7</source>
-<target>1.7</target>
-</configuration>'
-%pom_add_plugin org.apache.maven.plugins:maven-plugin-plugin takari-lifecycle-plugin '
-<executions>
-<execution>
-<id>mojo-descriptor</id>
-<configuration>
-<phase>process-classes</phase>
-<packagingTypes>
-<packaging>maven-plugin</packaging>
-</packagingTypes>
-</configuration>
-<goals>
-<goal>descriptor</goal>
-</goals>
-</execution>
-</executions>
-'
-%endif
-
 # eclipse should provide the alias
 %pom_remove_dep -r :org.eclipse.jdt.compiler.apt
 
@@ -134,6 +102,9 @@ ln -sf %{_javadir}/commons-lang.jar takari-lifecycle-plugin/src/test/jars/common
 
 
 %changelog
+* Thu Mar 12 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.10.2-4
+- Non-bootstrap bulid
+
 * Thu Mar 12 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.10.2-3
 - Replace bundled test dependency with symlink to system JAR
 - Add Apache license text