[takari-incrementalbuild] Non-bootstrap bulid

Mikolaj Izdebski mizdebsk at fedoraproject.org
Thu Mar 12 19:20:52 UTC 2015


commit d3677d577c7c52fe32a3bd686a69668fce252ead
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Mar 12 20:19:52 2015 +0100

    Non-bootstrap bulid

 takari-incrementalbuild.spec | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/takari-incrementalbuild.spec b/takari-incrementalbuild.spec
index 93824d4..2f28567 100644
--- a/takari-incrementalbuild.spec
+++ b/takari-incrementalbuild.spec
@@ -1,9 +1,8 @@
-%bcond_without bootstrap
 %global artifact_name io.takari.incrementalbuild
 
 Name:           takari-incrementalbuild
 Version:        0.10.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Takari Incremental Build
 License:        EPL
 URL:            http://takari.io
@@ -16,6 +15,7 @@ Patch0:         0001-Workaround-for-mtime-truncation.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.guava:guava)
+BuildRequires:  mvn(io.takari:takari:pom:)
 BuildRequires:  mvn(javax.enterprise:cdi-api)
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(junit:junit)
@@ -35,11 +35,6 @@ BuildRequires:  mvn(org.sonatype.plugins:sisu-maven-plugin)
 BuildRequires:  mvn(org.sonatype.sisu:sisu-guice)
 
 
-%if ! %{with bootstrap}
-BuildRequires:  mvn(io.takari:takari:pom:)
-%endif
-
-
 %description
 Incremental build support library for Apache Maven.
 
@@ -66,16 +61,6 @@ cp -a %{SOURCE1} .
 
 %pom_remove_plugin -r :animal-sniffer-maven-plugin
 
-%if %{with bootstrap}
-%pom_remove_parent
-%pom_xpath_set pom:project/pom:packaging jar incrementalbuild incrementalbuild-workspace
-%pom_add_plugin :maven-compiler-plugin '
-<configuration>
-<source>1.7</source>
-<target>1.7</target>
-</configuration>'
-%endif
-
 # XXX optional
 %pom_remove_dep -r :takari-plugin-testing
 rm -rf incrementalbuild/src/main/java/io/takari/incrementalbuild/maven/testing
@@ -94,6 +79,9 @@ rm -rf incrementalbuild/src/main/java/io/takari/incrementalbuild/maven/testing
 %license epl-v10.html
 
 %changelog
+* Thu Mar 12 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.10.0-3
+- Non-bootstrap bulid
+
 * Fri Mar 06 2015 Michael Simacek <msimacek at redhat.com> - 0.10.0-2
 - Working build
 


More information about the scm-commits mailing list