From 9bb5adca81d7b367db46f74e314c8124d07ac6cf Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 11 Oct 2019 13:40:08 +0200 Subject: [PATCH] update to version 3.2.1 --- .gitignore | 1 + plexus-utils.spec | 24 ++++++++++++++++-------- sources | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8a84e15..3077554 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /plexus-utils-3.0.24.tar.gz /plexus-utils-3.1.0.tar.gz /plexus-utils-3.2.0.tar.gz +/plexus-utils-3.2.1.tar.gz diff --git a/plexus-utils.spec b/plexus-utils.spec index 882ec54..e61d79e 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,6 +1,6 @@ Name: plexus-utils -Version: 3.2.0 -Release: 2%{?dist} +Version: 3.2.1 +Release: 1%{?dist} Summary: Plexus Common Utilities # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/ # xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory @@ -17,14 +17,15 @@ BuildArch: noarch Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz Source1: http://apache.org/licenses/LICENSE-2.0.txt -# https://github.com/codehaus-plexus/plexus-utils/issues/45 -Patch1: 0001-Follow-symlinks-in-NioFiles.copy.patch - BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) +# some tests require "mvn" on $PATH +BuildRequires: maven + %description The Plexus project seeks to create end-to-end developer tools for writing applications. At the core is the container, which can be @@ -42,10 +43,14 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -%patch1 -p1 - cp %{SOURCE1} . +# unpackaged dependencies for some tests +%pom_remove_dep -r org.openjdk.jmh:jmh-core +%pom_remove_dep -r org.openjdk.jmh:jmh-generator-annprocess +rm src/test/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractorTest.java +rm src/test/java/org/codehaus/plexus/util/xml/Xpp3DomPerfTest.java + %mvn_file : plexus/utils %mvn_alias : plexus:plexus-utils @@ -65,7 +70,7 @@ cp %{SOURCE1} . " %build -%mvn_build -f +%mvn_build %install %mvn_install @@ -77,6 +82,9 @@ cp %{SOURCE1} . %doc NOTICE.txt LICENSE-2.0.txt %changelog +* Fri Oct 11 2019 Fabio Valentini - 3.2.1-1 +- Update to version 3.2.1. + * Fri Jul 26 2019 Fedora Release Engineering - 3.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 22df18d..4f7ebd8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-utils-3.2.0.tar.gz) = 7d33472e9f2a7f344d3ab5054889b0b8ba36f23dc8690bffbf0ac689c4a9f9906a265e59e030c668068b64d56587de2adbe09a93833201c8b9ec74edf9a49e42 +SHA512 (plexus-utils-3.2.1.tar.gz) = 9642e5513aaecbc8a7e25d42837ee5604dc76dddef83e9091edfc86b4c0d02fd590ac3c0fc998f275f0d00806bd71594006bcc4c78cf492df3d828a91da1d2f9 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8