diff --git a/.gitignore b/.gitignore index 78189ea..8064b71 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ sonatype-plexus-compiler-plexus-compiler-1.8.3-0-gef6142f.tar.gz /plexus-compiler-2.4.tar.gz /plexus-compiler-2.7.tar.gz /plexus-compiler-2.8.1.tar.gz +/plexus-compiler-2.8.2.tar.gz diff --git a/0001-Copy-input-map-in-setCustomCompilerArguments-AsMap.patch b/0001-Copy-input-map-in-setCustomCompilerArguments-AsMap.patch deleted file mode 100644 index eb3ce04..0000000 --- a/0001-Copy-input-map-in-setCustomCompilerArguments-AsMap.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3a9c9a0bea7794c04ddbb8ac0520839c0f3d1cd0 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Tue, 1 Nov 2016 11:17:02 +0100 -Subject: [PATCH] Copy input map in setCustomCompilerArguments[AsMap] - ---- - .../plexus/compiler/CompilerConfiguration.java | 18 ++++-------------- - 1 file changed, 4 insertions(+), 14 deletions(-) - -diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java -index 69fc810..d4c4c03 100644 ---- a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java -+++ b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java -@@ -426,14 +426,7 @@ public class CompilerConfiguration - @Deprecated - public void setCustomCompilerArguments( LinkedHashMap customCompilerArguments ) - { -- if ( customCompilerArguments == null ) -- { -- this.customCompilerArguments = new ArrayList>(); -- } -- else -- { -- this.customCompilerArguments = customCompilerArguments.entrySet(); -- } -+ setCustomCompilerArgumentsAsMap( customCompilerArguments ); - } - - /** -@@ -454,13 +447,10 @@ public class CompilerConfiguration - - public void setCustomCompilerArgumentsAsMap( Map customCompilerArguments ) - { -- if ( customCompilerArguments == null ) -- { -- this.customCompilerArguments = new ArrayList>(); -- } -- else -+ this.customCompilerArguments = new ArrayList>(); -+ if ( customCompilerArguments != null ) - { -- this.customCompilerArguments = customCompilerArguments.entrySet(); -+ this.customCompilerArguments.addAll( customCompilerArguments.entrySet() ); - } - } - --- -2.7.4 - diff --git a/plexus-compiler.spec b/plexus-compiler.spec index ad28293..15c2172 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -2,8 +2,8 @@ Name: plexus-compiler Epoch: 0 -Version: 2.8.1 -Release: 5%{?dist} +Version: 2.8.2 +Release: 1%{?dist} Summary: Compiler call initiators for Plexus # extras subpackage has a bit different licensing # parts of compiler-api are ASL2.0/MIT @@ -15,9 +15,6 @@ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT -# https://github.com/codehaus-plexus/plexus-compiler/pull/25 -Patch0: 0001-Copy-input-map-in-setCustomCompilerArguments-AsMap.patch - BuildRequires: maven-local BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:) @@ -59,8 +56,6 @@ API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -%patch0 -p1 - cp %{SOURCE1} LICENSE cp %{SOURCE2} LICENSE.MIT @@ -103,6 +98,9 @@ cp %{SOURCE2} LICENSE.MIT %doc LICENSE LICENSE.MIT %changelog +* Mon Sep 11 2017 Mikolaj Izdebski - 0:2.8.2-1 +- Update to upstream version 2.8.2 + * Thu Jul 27 2017 Fedora Release Engineering - 0:2.8.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 8e66944..7e34ea2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7ac901f1dcb6e1636207e3d981bd154c plexus-compiler-2.8.1.tar.gz -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +SHA512 (plexus-compiler-2.8.2.tar.gz) = 2d1555a1b344a34f613d2ca6f80a074ab6f9ea28408e908964a1f0de3403dd3a6687da80c2f6107a2f3278c65c2b3c545b7a706ed04c462b34cb6933b9576a9f +SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8