From 75d1b8c1f64a998424805f1048f4c3824a551f41 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 11 Sep 2020 09:48:14 +0200 Subject: [PATCH] Update to upstream version 2.8.8 --- .gitignore | 1 + plexus-compiler.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1405854..4903943 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ sonatype-plexus-compiler-plexus-compiler-1.8.3-0-gef6142f.tar.gz /plexus-compiler-2.8.1.tar.gz /plexus-compiler-2.8.2.tar.gz /plexus-compiler-2.8.5.tar.gz +/plexus-compiler-2.8.8.tar.gz diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 7f3d6e2..75a6506 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -1,6 +1,6 @@ Name: plexus-compiler -Version: 2.8.5 -Release: 3%{?dist} +Version: 2.8.8 +Release: 1%{?dist} Summary: Compiler call initiators for Plexus # extras subpackage has a bit different licensing # parts of compiler-api are ASL2.0/MIT @@ -18,7 +18,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) - %description Plexus Compiler adds support for using various compilers from a unified api. Support for javac is available in main package. For @@ -50,6 +49,8 @@ API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} +find -name '.class' -delete + cp %{SOURCE1} LICENSE cp %{SOURCE2} LICENSE.MIT @@ -73,6 +74,9 @@ cp %{SOURCE2} LICENSE.MIT %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin + +%pom_remove_dep -r org.codehaus.plexus:plexus-compiler-javac-errorprone %build # Tests are skipped because of unavailable plexus-compiler-test artifact @@ -90,6 +94,9 @@ cp %{SOURCE2} LICENSE.MIT %doc LICENSE LICENSE.MIT %changelog +* Fri Sep 11 2020 Marian Koncek - 2.8.8-1 +- Update to upstream version 2.8.8 + * Tue Nov 05 2019 Mikolaj Izdebski - 2.8.5-3 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index e3e10fb..be89467 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-compiler-2.8.5.tar.gz) = d53cc996cc86347f2bf95b28d9b6d41e9b6f9d784b929237d5ecbf65fad4843ed734f5280bc9f96b2de3831f2dc422ec682c886301275061cea7fe743dcdf656 +SHA512 (plexus-compiler-2.8.8.tar.gz) = ee73634b203de06d29ac8f1af594e73f29ac209ff9e7712bd4c520fcbfb5257d31105cd8576d1f9ac1513159e4c69725bf760830358979efccb1e22834affc3c SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8