diff --git a/.gitignore b/.gitignore index 26d91b4..22bf69d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /takari-lifecycle-1.10.2.tar.gz /LICENSE-2.0.txt /takari-lifecycle-1.11.3.tar.gz +/takari-lifecycle-1.11.11.tar.gz diff --git a/0001-Use-DefaultProblemFactory.patch b/0001-Use-DefaultProblemFactory.patch index e784112..edff3ed 100644 --- a/0001-Use-DefaultProblemFactory.patch +++ b/0001-Use-DefaultProblemFactory.patch @@ -1,17 +1,17 @@ -From 0e8de22f8387e0971344013a232a7d7db77d22f7 Mon Sep 17 00:00:00 2001 +From 48371c5a82695cdb8e024a8e5eb6a816e23cd6b0 Mon Sep 17 00:00:00 2001 From: Michael Simacek -Date: Fri, 6 Mar 2015 17:05:38 +0100 -Subject: [PATCH 1/2] Use DefaultProblemFactory +Date: Mon, 15 Feb 2016 09:40:07 +0100 +Subject: [PATCH] Use DefaultProblemFactory --- .../main/java/io/takari/maven/plugins/compile/jdt/CompilerJdt.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/takari-lifecycle-plugin/src/main/java/io/takari/maven/plugins/compile/jdt/CompilerJdt.java b/takari-lifecycle-plugin/src/main/java/io/takari/maven/plugins/compile/jdt/CompilerJdt.java -index 0e900a2..ef643f8 100644 +index d89489b..3356239 100644 --- a/takari-lifecycle-plugin/src/main/java/io/takari/maven/plugins/compile/jdt/CompilerJdt.java +++ b/takari-lifecycle-plugin/src/main/java/io/takari/maven/plugins/compile/jdt/CompilerJdt.java -@@ -48,7 +48,7 @@ import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; +@@ -47,7 +47,7 @@ import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; import org.eclipse.jdt.internal.compiler.impl.IrritantSet; import org.eclipse.jdt.internal.compiler.problem.DefaultProblem; import org.eclipse.jdt.internal.compiler.util.SuffixConstants; @@ -20,14 +20,14 @@ index 0e900a2..ef643f8 100644 import com.google.common.base.Stopwatch; import com.google.common.collect.HashMultimap; -@@ -195,7 +195,7 @@ public class CompilerJdt extends AbstractCompiler implements ICompilerRequestor - compilerOptions.suppressWarnings = true; - compilerOptions.setShowWarnings(isShowWarnings()); - compilerOptions.docCommentSupport = true; +@@ -510,7 +510,7 @@ public class CompilerJdt extends AbstractCompiler implements ICompilerRequestor + + Classpath namingEnvironment = strategy.createClasspath(); + IErrorHandlingPolicy errorHandlingPolicy = DefaultErrorHandlingPolicies.exitAfterAllProblems(); - IProblemFactory problemFactory = ProblemFactory.getProblemFactory(Locale.getDefault()); + IProblemFactory problemFactory = new DefaultProblemFactory(Locale.getDefault()); - - Multimap sourceOutputs = HashMultimap.create(); + Compiler compiler = new Compiler(namingEnvironment, errorHandlingPolicy, compilerOptions, this, problemFactory); + compiler.options.produceReferenceInfo = true; -- 2.5.0 diff --git a/sources b/sources index 5990d8a..adf481a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b765309b6a0d990818e0f730912ce47b takari-lifecycle-1.11.3.tar.gz +070756994f9a8f9cb3525c3722d478d2 takari-lifecycle-1.11.11.tar.gz 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt diff --git a/takari-lifecycle.spec b/takari-lifecycle.spec index 1a2b99d..bbef8a8 100644 --- a/takari-lifecycle.spec +++ b/takari-lifecycle.spec @@ -1,6 +1,6 @@ Name: takari-lifecycle -Version: 1.11.3 -Release: 4%{?dist} +Version: 1.11.11 +Release: 0.1%{?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 @@ -78,6 +78,32 @@ This package provides %{summary}. cp %{SOURCE1} . + +# Bootstrap build +%pom_remove_parent +%pom_xpath_set pom:project/pom:packaging maven-plugin takari-lifecycle-plugin +%pom_add_plugin :maven-compiler-plugin ' + +1.7 +1.7 +' +%pom_add_plugin org.apache.maven.plugins:maven-plugin-plugin takari-lifecycle-plugin ' + + +mojo-descriptor + +process-classes + +maven-plugin + + + +descriptor + + + +' + # Replace bundled test dependency with symlink to system JAR ln -sf %{_javadir}/commons-lang.jar takari-lifecycle-plugin/src/test/jars/commons-lang-2.0.jar @@ -106,6 +132,10 @@ ln -sf %{_javadir}/commons-lang.jar takari-lifecycle-plugin/src/test/jars/common %changelog +* Mon Feb 15 2016 Michael Simacek - 1.11.11-0.1 +- Update to upstream version 1.11.11 +- Bootstrap build + * Fri Feb 05 2016 Fedora Release Engineering - 1.11.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild