diff --git a/.gitignore b/.gitignore index cf2bb60..f8e809a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /takari-lifecycle-1.11.11.tar.gz /takari-lifecycle-1.12.0.tar.gz /takari-lifecycle-1.12.1.tar.gz +/takari-lifecycle-1.12.2.tar.gz diff --git a/0001-Use-DefaultProblemFactory.patch b/0001-Use-DefaultProblemFactory.patch index f933126..c10cceb 100644 --- a/0001-Use-DefaultProblemFactory.patch +++ b/0001-Use-DefaultProblemFactory.patch @@ -1,4 +1,4 @@ -From 89b2767c7e9da6f6735fc827797933211ca36a70 Mon Sep 17 00:00:00 2001 +From baca07449e96b6cea530678c1a802f99aec6d62e Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 15 Feb 2016 09:40:07 +0100 Subject: [PATCH 1/3] Use DefaultProblemFactory diff --git a/0002-Port-to-mustache-java-0.9.1.patch b/0002-Port-to-mustache-java-0.9.1.patch index 0460d6c..b6aee61 100644 --- a/0002-Port-to-mustache-java-0.9.1.patch +++ b/0002-Port-to-mustache-java-0.9.1.patch @@ -1,17 +1,17 @@ -From ff3cddd94763238d22ce04d0289432720324ffaa Mon Sep 17 00:00:00 2001 +From 848777e0498776330665c6e8b0bb292b6ce6771a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Nov 2015 10:20:21 +0100 Subject: [PATCH 2/3] Port to mustache-java 0.9.1 --- - .../main/java/io/takari/resources/filtering/ResourcesProcessor.java | 4 ++-- + .../java/io/takari/resources/filtering/FilterResourcesProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/takari-lifecycle-plugin/src/main/java/io/takari/resources/filtering/ResourcesProcessor.java b/takari-lifecycle-plugin/src/main/java/io/takari/resources/filtering/ResourcesProcessor.java -index 32f8040..aefbefc 100644 ---- a/takari-lifecycle-plugin/src/main/java/io/takari/resources/filtering/ResourcesProcessor.java -+++ b/takari-lifecycle-plugin/src/main/java/io/takari/resources/filtering/ResourcesProcessor.java -@@ -127,12 +127,12 @@ public class ResourcesProcessor { +diff --git a/takari-lifecycle-plugin/src/main/java/io/takari/resources/filtering/FilterResourcesProcessor.java b/takari-lifecycle-plugin/src/main/java/io/takari/resources/filtering/FilterResourcesProcessor.java +index 2c3ac07..cc6561e 100644 +--- a/takari-lifecycle-plugin/src/main/java/io/takari/resources/filtering/FilterResourcesProcessor.java ++++ b/takari-lifecycle-plugin/src/main/java/io/takari/resources/filtering/FilterResourcesProcessor.java +@@ -118,12 +118,12 @@ class FilterResourcesProcessor extends AbstractResourceProcessor { // performs full-name map lookup before falling back to dot-notation parsing private static class MapReflectionObjectHandler extends ReflectionObjectHandler { @Override diff --git a/0003-Use-commons-codec-instead-of-takari-hash-in-tests.patch b/0003-Use-commons-codec-instead-of-takari-hash-in-tests.patch index 1df3fb3..5a64aab 100644 --- a/0003-Use-commons-codec-instead-of-takari-hash-in-tests.patch +++ b/0003-Use-commons-codec-instead-of-takari-hash-in-tests.patch @@ -1,4 +1,4 @@ -From dcf1cafc9112954fa1f1c9990e72b966cf4dc03f Mon Sep 17 00:00:00 2001 +From 1919ecfac26e4c13b5734ce626a67bde9601df96 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 18 Jul 2016 18:33:48 +0200 Subject: [PATCH 3/3] Use commons-codec instead of takari-hash in tests diff --git a/sources b/sources index 7bdbc49..496f8fb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -cbae9987e69bfbb545c3644c26b86f92 takari-lifecycle-1.12.1.tar.gz +c17c9950f507f1b90390614d8faf8c75 takari-lifecycle-1.12.2.tar.gz 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt diff --git a/takari-lifecycle.spec b/takari-lifecycle.spec index 6cea517..4e3e315 100644 --- a/takari-lifecycle.spec +++ b/takari-lifecycle.spec @@ -1,6 +1,6 @@ %bcond_with bootstrap Name: takari-lifecycle -Version: 1.12.1 +Version: 1.12.2 Release: 1%{?with_bootstrap:.boot}%{?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 @@ -138,6 +138,9 @@ ln -sf %{_javadir}/commons-lang.jar takari-lifecycle-plugin/src/test/jars/common %changelog +* Mon Oct 31 2016 Michael Simacek - 1.12.2-1 +- Update to upstream version 1.12.2 + * Mon Sep 19 2016 Michael Simacek - 1.12.1-1 - Update to upstream version 1.12.1