[cxf-build-utils] Upstream release 2.6.0

[Marek Goldmann]

commit af470b50eda6207e7a7b93eb241a75e601ec2f4e
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Mar 24 06:17:42 2015 +0100

    Upstream release 2.6.0

 .gitignore                             |  1 +
 0001-Support-for-PMD-from-Fedora.patch | 34 +++++++++++++++++++++++++++
 0001-pmd-5.0.4-support.patch           | 43 ----------------------------------
 cxf-build-utils.spec                   | 22 ++++++++++-------
 sources                                |  2 +-
 5 files changed, 50 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 765d385..2a10903 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /cxf-build-utils-2.4.1.tar.xz
 /cxf-build-utils-2.5.0.tar.xz
+/cxf-build-utils-2.6.0.tar.xz
diff --git a/0001-Support-for-PMD-from-Fedora.patch b/0001-Support-for-PMD-from-Fedora.patch
new file mode 100644
index 0000000..b1abf57
--- /dev/null
+++ b/0001-Support-for-PMD-from-Fedora.patch
@@ -0,0 +1,34 @@
+From 070b18600e2b0fd250708196a258c1b3f7084f4b Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Tue, 24 Mar 2015 06:14:22 +0100
+Subject: [PATCH] Support for PMD from Fedora
+
+---
+ .../main/java/org/apache/cxf/pmd/UnsafeStringConstructorRule.java  | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/buildtools/src/main/java/org/apache/cxf/pmd/UnsafeStringConstructorRule.java b/buildtools/src/main/java/org/apache/cxf/pmd/UnsafeStringConstructorRule.java
+index 2b524ee..6bd4233 100644
+--- a/buildtools/src/main/java/org/apache/cxf/pmd/UnsafeStringConstructorRule.java
++++ b/buildtools/src/main/java/org/apache/cxf/pmd/UnsafeStringConstructorRule.java
+@@ -22,17 +22,10 @@ package org.apache.cxf.pmd;
+ import java.util.List;
+ 
+ import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
+-import net.sourceforge.pmd.RuleContext;
+-import net.sourceforge.pmd.lang.java.ast.ASTAdditiveExpression;
+ import net.sourceforge.pmd.lang.java.ast.ASTAllocationExpression;
+ import net.sourceforge.pmd.lang.java.ast.ASTArgumentList;
+-import net.sourceforge.pmd.lang.java.ast.ASTArrayDimsAndInits;
+ import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+ import net.sourceforge.pmd.lang.java.ast.ASTExpression;
+-import net.sourceforge.pmd.lang.java.ast.ASTName;
+-import net.sourceforge.pmd.lang.java.ast.JavaNode;
+-import net.sourceforge.pmd.lang.java.symboltable.NameDeclaration;
+-import net.sourceforge.pmd.lang.java.symboltable.VariableNameDeclaration;
+ import net.sourceforge.pmd.lang.java.typeresolution.TypeHelper;
+ 
+ /**
+-- 
+2.3.3
+
diff --git a/cxf-build-utils.spec b/cxf-build-utils.spec
index 3021676..d00492e 100644
--- a/cxf-build-utils.spec
+++ b/cxf-build-utils.spec
@@ -1,17 +1,17 @@
 Name:             cxf-build-utils
-Version:          2.5.0
-Release:          3%{?dist}
+Version:          2.6.0
+Release:          1%{?dist}
 Summary:          Apache CXF Build Utils
 Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://cxf.apache.org/build-utils.html
 
-# svn export http://svn.apache.org/repos/asf/cxf/build-utils/tags/cxf-build-utils-2.5.0/ cxf-build-utils-2.5.0
-# tar cafJ cxf-build-utils-2.5.0.tar.xz cxf-build-utils-2.5.0
+# svn export http://svn.apache.org/repos/asf/cxf/build-utils/tags/cxf-build-utils-2.6.0/ cxf-build-utils-2.6.0
+# tar cafJ cxf-build-utils-2.6.0.tar.xz cxf-build-utils-2.6.0
 Source0:          cxf-build-utils-%{version}.tar.xz
 
-# PMD 5.0.4 support
-Patch0:           0001-pmd-5.0.4-support.patch
+# PMD support in Fedora
+Patch0:           0001-Support-for-PMD-from-Fedora.patch
 
 BuildArch:        noarch
 
@@ -22,7 +22,7 @@ BuildRequires:    maven-jar-plugin
 BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-shade-plugin
 BuildRequires:    glassfish-fastinfoset
-BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    pmd
 
 %description
@@ -37,9 +37,12 @@ Group:            Documentation
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n cxf-build-utils-%{version}
 %patch0 -p1
 
+%pom_remove_dep net.sourceforge.pmd:pmd buildtools/pom.xml
+%pom_add_dep net.sourceforge.pmd:pmd-java buildtools/pom.xml
+
 %build
 %mvn_build
 
@@ -52,6 +55,9 @@ This package contains the API documentation for %{name}.
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Mar 24 2015 Marek Goldmann <mgoldman at redhat.com> - 2.6.0-1
+- Upstream release 2.6.0
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index e775018..19bc6f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-daa5ddf719ee8b53104f1eec8dd01e4c  cxf-build-utils-2.5.0.tar.xz
+fc505135b202fc2ca79fe9f67140406e  cxf-build-utils-2.6.0.tar.xz