From b12f34181180e1982df637f5d8b82ba0f0efe5c5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 15 Jul 2016 14:17:41 +0200 Subject: [PATCH] Don't use Maven 2 toolchain --- maven-surefire.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 1f14ecf..7e1d1ce 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,6 +1,6 @@ Name: maven-surefire Version: 2.19.1 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: Test framework project License: ASL 2.0 and CPL @@ -26,7 +26,6 @@ BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-toolchain) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) @@ -129,6 +128,8 @@ cp -p %{SOURCE2} . %pom_remove_dep :maven-project maven-surefire-report-plugin %pom_remove_dep :maven-project maven-surefire-common %pom_remove_dep :maven-plugin-descriptor maven-surefire-common +%pom_remove_dep :maven-toolchain maven-surefire-common +%pom_remove_dep :maven-toolchain maven-surefire-plugin %build %mvn_package ":*{surefire-plugin,report-plugin}*" @1 @@ -157,6 +158,9 @@ cp -p %{SOURCE2} . %doc LICENSE NOTICE cpl-v10.html %changelog +* Fri Jul 15 2016 Mikolaj Izdebski - 0:2.19.1-5 +- Don't use Maven 2 toolchain + * Thu Jun 30 2016 Mikolaj Izdebski - 0:2.19.1-4 - Compile against Maven 3 APIs