[owasp-esapi-java] xmvn update + switch to junit

[Marek Goldmann]

commit dcf5a4d023a9482fe38a00a7ca074980c9198df4
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Wed Jul 2 10:30:55 2014 +0200

    xmvn update + switch to junit

 owasp-esapi-java.spec |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/owasp-esapi-java.spec b/owasp-esapi-java.spec
index 966c7f2..0056190 100644
--- a/owasp-esapi-java.spec
+++ b/owasp-esapi-java.spec
@@ -1,6 +1,6 @@
 Name:             owasp-esapi-java
 Version:          2.0.1
-Release:          11%{?dist}
+Release:          12%{?dist}
 Summary:          OWASP Enterprise Security API
 Group:            Development/Libraries
 License:          BSD
@@ -29,7 +29,7 @@ BuildRequires:    maven-jar-plugin
 BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-surefire-plugin
 BuildRequires:    maven-surefire-plugin
-BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    maven-enforcer-plugin
 BuildRequires:    maven-eclipse-plugin
 BuildRequires:    sonatype-oss-parent
@@ -41,10 +41,11 @@ BuildRequires:    junit
 BuildRequires:    apache-commons-io
 BuildRequires:    apache-commons-collections
 BuildRequires:    apache-commons-fileupload
-BuildRequires:    log4j
+BuildRequires:    log4j12
 BuildRequires:    xom
 BuildRequires:    ecj
 BuildRequires:    maven-shared
+BuildRequires:    tomcat-jsp-2.2-api
 
 %description
 OWASP ESAPI (The OWASP Enterprise Security API) is a free, open source,
@@ -81,12 +82,16 @@ This package contains the documentation for %{name}.
 # Atisammy not available
 %pom_remove_dep "org.owasp.antisamy:antisamy"
 
-# No POM file for bsh-core in Fedora
-%pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId='bsh-core']" "<systemPath>$(build-classpath bsh-core)</systemPath>"
-%pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId='bsh-core']" "<scope>system</scope>"
+%pom_remove_dep ":bsh-core"
+%pom_add_dep "org.beanshell:bsh"
 
 sed -i "s|public void testSetCookie()|public void ignoredSetCookie()|" src/test/java/org/owasp/esapi/reference/HTTPUtilitiesTest.java
 
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'log4j']/pom:version" "12"
+
+%pom_remove_dep "javax.servlet:jsp-api"
+%pom_add_dep "org.apache.tomcat:tomcat-jsp-api"
+
 %build
 %mvn_build -f
 
@@ -102,6 +107,9 @@ sed -i "s|public void testSetCookie()|public void ignoredSetCookie()|" src/test/
 %doc documentation/*
 
 %changelog
+* Wed Jul 02 2014 Marek Goldmann <mgoldman at redhat.com> - 2.0.1-12
+- xmvn update + switch to junit
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild