[pmd] Update to upstream version 5.2.3
Michael Šimáček
msimacek at fedoraproject.org
Thu Jan 22 12:18:59 UTC 2015
commit 1448f8bebac55e9a296829cb7cad0f0eaca73324
Author: Michael Simacek <msimacek at redhat.com>
Date: Thu Jan 22 12:54:36 2015 +0100
Update to upstream version 5.2.3
javacc.patch | 11 ------
pmd.spec | 23 +++++++-----
saxon.patch | 104 ++++++++++++++++++++++++++++++---------------------------
3 files changed, 68 insertions(+), 70 deletions(-)
---
diff --git a/pmd.spec b/pmd.spec
index 22c4573..724fe97 100644
--- a/pmd.spec
+++ b/pmd.spec
@@ -28,7 +28,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
Name: pmd
-Version: 5.1.3
+Version: 5.2.3
Release: 1%{?dist}
Epoch: 0
Summary: Scans Java source code and looks for potential problems
@@ -38,9 +38,6 @@ BuildArch: noarch
Source0: http://downloads.sourceforge.net/project/pmd/pmd/%{version}/pmd-src-%{version}.zip
URL: http://pmd.sourceforge.net/
-# fix incorrect token replacement when building with javacc 5.0
-# patch sent upstream: https://sourceforge.net/p/pmd/bugs/1109/
-Patch0: javacc.patch
# fix api incompatibilities with newer saxon
# not sent upstream
Patch1: saxon.patch
@@ -53,6 +50,7 @@ BuildRequires: maven-install-plugin
BuildRequires: maven-plugin-build-helper
BuildRequires: maven-pmd-plugin
BuildRequires: maven-checkstyle-plugin
+BuildRequires: maven-site-plugin
BuildRequires: ant-testutil
BuildRequires: apache-commons-lang3
BuildRequires: apache-commons-io
@@ -86,8 +84,7 @@ API documentation for %{name}.
%prep
%setup -q -n %{name}-src-%{version}
-%patch0 -p0 -b.orig
-%patch1 -p0 -b.orig
+%patch1 -p1
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
@@ -97,21 +94,27 @@ find . -name "*.class" -exec rm -f {} \;
%pom_xpath_remove pom:build/pom:extensions
+sed -i 's/net.sourceforge.saxon/net.sf.saxon/' `find -name pom.xml`
+
+%pom_xpath_set -r '//pom:property[@name="javacc.jar"]/@value' `xmvn-resolve net.java.dev.javacc:javacc`
+
%build
-# some tests are failing so ignore them
-# this may be because fedora has a newer rhino than pmd expects
-%mvn_build -- -Dmaven.test.failure.ignore=true -Dmaven.clover.skip=true
+# tests require com.github.tomakehurst:wiremock
+%mvn_build -f
%install
%mvn_install
%files -f .mfiles
-%doc LICENSE
+%doc LICENSE
%files javadoc -f .mfiles-javadoc
%doc LICENSE
%changelog
+* Mon Jan 19 2015 Michael Simacek <msimacek at redhat.com> - 0:5.2.3-1
+- Update to upstream version 5.2.3
+
* Tue Sep 2 2014 Alexander Kurtakov <akurtako at redhat.com> 0:5.1.3-1
- Update to upstream 5.1.3.
diff --git a/saxon.patch b/saxon.patch
index 196e531..efd4bb9 100644
--- a/saxon.patch
+++ b/saxon.patch
@@ -1,7 +1,21 @@
-diff -ur src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java
---- src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java 2013-05-01 12:29:22.000000000 +0100
-+++ src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java 2013-06-28 17:53:32.777197093 +0100
-@@ -3,15 +3,15 @@
+From 5d6f34e91fd927bf0e8940b629bd963341f14768 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek at redhat.com>
+Date: Wed, 21 Jan 2015 23:40:58 +0100
+Subject: [PATCH] Port to current saxon
+
+---
+ .../pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java | 27 +++++++++++++++++-----
+ .../ast/xpath/saxon/AttributeAxisIterator.java | 2 +-
+ .../pmd/lang/ast/xpath/saxon/DocumentNode.java | 24 +++++++++++++++----
+ .../pmd/lang/ast/xpath/saxon/ElementNode.java | 10 ++++----
+ .../pmd/lang/rule/xpath/SaxonXPathRuleQuery.java | 8 +++----
+ 5 files changed, 50 insertions(+), 21 deletions(-)
+
+diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java
+index eccc797..8972561 100644
+--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java
++++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java
+@@ -6,15 +6,15 @@ package net.sourceforge.pmd.lang.ast.xpath.saxon;
import net.sf.saxon.Configuration;
import net.sf.saxon.event.Receiver;
import net.sf.saxon.om.Axis;
@@ -22,7 +36,7 @@ diff -ur src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNod
import net.sf.saxon.pattern.NodeTest;
import net.sf.saxon.trans.XPathException;
import net.sf.saxon.value.Value;
-@@ -69,6 +69,13 @@
+@@ -72,6 +72,13 @@ public class AbstractNodeInfo implements VirtualNode, SiblingCountingNode {
/**
* {@inheritDoc}
*/
@@ -36,7 +50,7 @@ diff -ur src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNod
public int getSiblingPosition() {
throw createUnsupportedOperationException("SiblingCountingNode.getSiblingPosition()");
}
-@@ -90,6 +97,14 @@
+@@ -93,6 +100,14 @@ public class AbstractNodeInfo implements VirtualNode, SiblingCountingNode {
/**
* {@inheritDoc}
*/
@@ -51,7 +65,7 @@ diff -ur src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNod
public void copy(Receiver receiver, int whichNamespaces, boolean copyAnnotations, int locationId)
throws XPathException {
throw createUnsupportedOperationException("ValueRepresentation.copy(Receiver, int, boolean, int)");
-@@ -166,7 +181,7 @@
+@@ -169,7 +184,7 @@ public class AbstractNodeInfo implements VirtualNode, SiblingCountingNode {
*
* {@inheritDoc}
*/
@@ -60,10 +74,24 @@ diff -ur src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNod
return 0;
}
-diff -ur src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNode.java src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNode.java
---- src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNode.java 2013-05-01 12:29:22.000000000 +0100
-+++ src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNode.java 2013-06-28 17:53:41.009216277 +0100
-@@ -5,11 +5,11 @@
+diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeAxisIterator.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeAxisIterator.java
+index 64be824..cd45956 100644
+--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeAxisIterator.java
++++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeAxisIterator.java
+@@ -3,7 +3,7 @@
+ */
+ package net.sourceforge.pmd.lang.ast.xpath.saxon;
+
+-import net.sf.saxon.om.Navigator;
++import net.sf.saxon.tree.util.Navigator;
+ import net.sf.saxon.om.SequenceIterator;
+ import net.sourceforge.pmd.lang.ast.xpath.Attribute;
+
+diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNode.java
+index c64f7ef..50443b5 100644
+--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNode.java
++++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNode.java
+@@ -8,11 +8,11 @@ import java.util.Iterator;
import java.util.Map;
import net.sf.saxon.om.Axis;
@@ -78,7 +106,7 @@ diff -ur src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNod
import net.sf.saxon.type.Type;
import net.sourceforge.pmd.lang.ast.Node;
-@@ -57,8 +57,22 @@
+@@ -60,8 +60,22 @@ public class DocumentNode extends AbstractNodeInfo implements DocumentInfo {
/**
* {@inheritDoc}
*/
@@ -103,10 +131,11 @@ diff -ur src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNod
}
@Override
-diff -ur src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode.java src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode.java
---- src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode.java 2013-05-01 12:29:22.000000000 +0100
-+++ src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode.java 2013-06-28 17:29:42.889914432 +0100
-@@ -1,13 +1,13 @@
+diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode.java
+index 5404880..15d7543 100644
+--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode.java
++++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode.java
+@@ -4,13 +4,13 @@
package net.sourceforge.pmd.lang.ast.xpath.saxon;
import net.sf.saxon.om.Axis;
@@ -125,37 +154,11 @@ diff -ur src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode
import net.sf.saxon.type.Type;
import net.sourceforge.pmd.lang.ast.Node;
---- pom.xml.orig 2014-02-22 00:31:42.720505485 +0200
-+++ pom.xml 2014-02-22 00:32:59.154594190 +0200
-@@ -610,12 +611,12 @@
- <version>5.0.2</version>
- </dependency>
- <dependency>
-- <groupId>net.sourceforge.saxon</groupId>
-+ <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>9.1.0.8</version>
- </dependency>
- <dependency>
-- <groupId>net.sourceforge.saxon</groupId>
-+ <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>9.1.0.8</version>
- <classifier>dom</classifier>
---- src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeAxisIterator.java.orig 2014-02-22 00:34:07.806674010 +0200
-+++ src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeAxisIterator.java 2014-02-22 00:35:44.213652383 +0200
-@@ -3,7 +3,7 @@
- */
- package net.sourceforge.pmd.lang.ast.xpath.saxon;
-
--import net.sf.saxon.om.Navigator;
-+import net.sf.saxon.tree.util.Navigator;
- import net.sf.saxon.om.SequenceIterator;
- import net.sourceforge.pmd.lang.ast.xpath.Attribute;
-
---- src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java.orig 2014-02-22 00:37:34.823510958 +0200
-+++ src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java 2014-02-22 00:39:56.477460779 +0200
-@@ -107,10 +107,10 @@ public class SaxonXPathRuleQuery extends
+diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java
+index 90d787e..2eb999a 100644
+--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java
++++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java
+@@ -107,10 +107,10 @@ public class SaxonXPathRuleQuery extends AbstractXPathRuleQuery {
}
}
@@ -165,8 +168,11 @@ diff -ur src.orig/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode
- }
+ List<net.sf.saxon.om.Item> nodes = xpathExpression.evaluate(xpathDynamicContext);
+ for (net.sf.saxon.om.Item elementNode : nodes) {
-+ results.add((Node) ((ElementNode)elementNode).getUnderlyingNode());
-+ }
++ results.add((Node) ((ElementNode)elementNode).getUnderlyingNode());
++ }
} catch (XPathException e) {
throw new RuntimeException(super.xpath + " had problem: " + e.getMessage(), e);
}
+--
+2.1.0
+
More information about the scm-commits
mailing list