[jbossws-common-tools] Log4j and junit upgrade

[Marek Goldmann]

commit 18f4940dc9807f585c43c876fe82f4b997370fd7
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Wed Jul 2 11:45:04 2014 +0200

    Log4j and junit upgrade

 jbossws-common-tools.spec |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/jbossws-common-tools.spec b/jbossws-common-tools.spec
index fe61987..dd5f059 100644
--- a/jbossws-common-tools.spec
+++ b/jbossws-common-tools.spec
@@ -3,7 +3,7 @@
 
 Name:             jbossws-common-tools
 Version:          1.2.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          JBossWS Common Tools
 Group:            Development/Libraries
 License:          LGPLv2+ and ASL 2.0
@@ -26,16 +26,21 @@ BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-surefire-plugin
 BuildRequires:    maven-surefire-plugin
 BuildRequires:    maven-enforcer-plugin
-BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    gnu-getopt
 BuildRequires:    jbossws-spi
 BuildRequires:    jbossws-api
 BuildRequires:    jbossws-parent
-BuildRequires:    log4j
 BuildRequires:    junit
 BuildRequires:    plexus-pom
 BuildRequires:    plexus-components-pom
 
+%if 0%{?fedora} >= 21
+BuildRequires:    log4j12
+%else
+BuildRequires:    log4j
+%endif
+
 %description
 JBoss Web Services - Common Tools
 
@@ -51,6 +56,8 @@ This package contains the API documentation for %{name}.
 
 cp %{SOURCE1} .
 
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'log4j']/pom:version" "12"
+
 %build
 %mvn_build
 
@@ -65,6 +72,9 @@ cp %{SOURCE1} .
 %doc LICENSE-2.0.txt
 
 %changelog
+* Wed Jul 02 2014 Marek Goldmann <mgoldman at redhat.com> - 1.2.0-4
+- Log4j and junit upgrade
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild