mizdebsk pushed to takari-lifecycle (master). "Update to upstream version 1.11.3"

[notifications at fedoraproject.org]

>From 868d6126a15beecfa721d443b4a5b5a50ea741e8 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed, 22 Apr 2015 07:47:32 +0200
Subject: Update to upstream version 1.11.3


diff --git a/.gitignore b/.gitignore
index 15d4281..26d91b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /takari-lifecycle-1.10.2.tar.gz
 /LICENSE-2.0.txt
+/takari-lifecycle-1.11.3.tar.gz
diff --git a/0001-Use-DefaultProblemFactory.patch b/0001-Use-DefaultProblemFactory.patch
index ff7fdd6..2f3ea45 100644
--- a/0001-Use-DefaultProblemFactory.patch
+++ b/0001-Use-DefaultProblemFactory.patch
@@ -1,4 +1,4 @@
-From ef32255dad2566f12236914046b91fbcc571e45a Mon Sep 17 00:00:00 2001
+From 0e8de22f8387e0971344013a232a7d7db77d22f7 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek at redhat.com>
 Date: Fri, 6 Mar 2015 17:05:38 +0100
 Subject: [PATCH] Use DefaultProblemFactory
@@ -8,10 +8,10 @@ Subject: [PATCH] Use DefaultProblemFactory
  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 2427f5e..c4df92b 100644
+index 0e900a2..ef643f8 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
-@@ -60,7 +60,7 @@ import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+@@ -48,7 +48,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;
@@ -19,16 +19,16 @@ index 2427f5e..c4df92b 100644
 +import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
  
  import com.google.common.base.Stopwatch;
- 
-@@ -177,7 +177,7 @@ public class CompilerJdt extends AbstractCompiler implements ICompilerRequestor
-     compilerOptions.verbose = isVerbose();
+ 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;
 -    IProblemFactory problemFactory = ProblemFactory.getProblemFactory(Locale.getDefault());
 +    IProblemFactory problemFactory = new DefaultProblemFactory(Locale.getDefault());
-     Classpath namingEnvironment = createClasspath();
-     Compiler compiler = new Compiler(namingEnvironment, errorHandlingPolicy, compilerOptions, this, problemFactory);
-     compiler.options.produceReferenceInfo = true;
+ 
+     Multimap<File, File> sourceOutputs = HashMultimap.create();
+ 
 -- 
 2.1.0
 
diff --git a/sources b/sources
index acb993d..5990d8a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4ec0b554d7ab9a073a6cff2f087b42f6  takari-lifecycle-1.10.2.tar.gz
+b765309b6a0d990818e0f730912ce47b  takari-lifecycle-1.11.3.tar.gz
 3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
diff --git a/takari-lifecycle.spec b/takari-lifecycle.spec
index b9bb570..f3dc9d6 100644
--- a/takari-lifecycle.spec
+++ b/takari-lifecycle.spec
@@ -1,6 +1,6 @@
 Name:           takari-lifecycle
-Version:        1.10.2
-Release:        4%{?dist}
+Version:        1.11.3
+Release:        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
@@ -30,9 +30,12 @@ BuildRequires:  mvn(org.apache.maven:maven-compat)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven:maven-repository-metadata)
 BuildRequires:  mvn(org.apache.maven:maven-settings)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-file)
+BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-classworlds)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.eclipse.aether:aether-api)
@@ -42,7 +45,6 @@ BuildRequires:  mvn(org.eclipse.aether:aether-spi)
 BuildRequires:  mvn(org.eclipse.aether:aether-transport-wagon)
 BuildRequires:  mvn(org.eclipse.aether:aether-util)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
-BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
 BuildRequires:  mvn(org.eclipse.tycho:org.eclipse.jdt.core)
 BuildRequires:  mvn(org.eclipse.tycho:org.eclipse.osgi)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
@@ -102,6 +104,9 @@ ln -sf %{_javadir}/commons-lang.jar takari-lifecycle-plugin/src/test/jars/common
 
 
 %changelog
+* Wed Apr 22 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.11.3-1
+- Update to upstream version 1.11.3
+
 * Thu Mar 12 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.10.2-4
 - Non-bootstrap bulid
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/takari-lifecycle.git/commit/?h=master&id=868d6126a15beecfa721d443b4a5b5a50ea741e8