Attachment 711992 Details for Bug 890414 – Patch to version 5.0.2

[patch] Patch to version 5.0.2

0001-Updated-to-latest-upstream-version.patch (text/plain), 15.42 KB, created by Tomas 'Sheldon' Radej on 2013-03-18 14:23:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas 'Sheldon' Radej

Created: 2013-03-18 14:23:04 UTC

Size: 15.42 KB

patch

obsolete

>From c37764ef485aa1b994d8bff09a88fe788812806e Mon Sep 17 00:00:00 2001
>From: Tomas Radej <tradej@redhat.com>
>Date: Mon, 18 Mar 2013 15:22:12 +0100
>Subject: [PATCH] Updated to latest upstream version
>
>- Building with maven-local (upstream uses maven now)
>---
> .gitignore                |   1 +
> pmd-4.2.4-nicerhtml.patch |  17 -----
> pmd-4.2.5-antdep.patch    |  14 ----
> pmd-4.2.5-build.patch     | 179 ----------------------------------------------
> pmd.spec                  | 105 ++++++++++-----------------
> sources                   |   2 +-
> 6 files changed, 41 insertions(+), 277 deletions(-)
> delete mode 100644 pmd-4.2.4-nicerhtml.patch
> delete mode 100644 pmd-4.2.5-antdep.patch
> delete mode 100644 pmd-4.2.5-build.patch
>
>diff --git a/.gitignore b/.gitignore
>index b76dfb1..b653f5a 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> pmd-src-4.2.5.zip
>+/pmd-src-5.0.2.zip
>diff --git a/pmd-4.2.4-nicerhtml.patch b/pmd-4.2.4-nicerhtml.patch
>deleted file mode 100644
>index e14502d..0000000
>--- a/pmd-4.2.4-nicerhtml.patch
>+++ /dev/null
>@@ -1,17 +0,0 @@
>---- src/net/sourceforge/pmd/renderers/XSLTRenderer.java.orig	2007-10-19 13:21:30.000000000 -0600
>-+++ src/net/sourceforge/pmd/renderers/XSLTRenderer.java	2010-06-02 09:14:03.722935341 -0600
>-@@ -45,9 +45,11 @@
>- 	 * @param xsltFilename
>- 	 */
>- 	public XSLTRenderer(String xsltFilename) {
>--		File file = new File(xsltFilename);
>--		if ( xsltFilename != null && file.exists() && file.canRead() ) {
>--			this.xsltFilename = xsltFilename;
>-+		if ( xsltFilename != null ) {
>-+			File file = new File(xsltFilename);
>-+			if ( file.exists() && file.canRead() ) {
>-+				this.xsltFilename = xsltFilename;
>-+			}
>- 		}
>- 	}
>- 
>diff --git a/pmd-4.2.5-antdep.patch b/pmd-4.2.5-antdep.patch
>deleted file mode 100644
>index f46af7e..0000000
>--- a/pmd-4.2.5-antdep.patch
>+++ /dev/null
>@@ -1,14 +0,0 @@
>---- pom.xml.orig	2009-02-08 17:52:32.000000000 -0700
>-+++ pom.xml	2010-11-29 11:30:26.147097635 -0700
>-@@ -254,9 +254,9 @@
>-   </build>
>-   <dependencies>
>-     <dependency>
>--      <groupId>ant</groupId>
>-+      <groupId>org.apache.ant</groupId>
>-       <artifactId>ant</artifactId>
>--      <version>1.6</version>
>-+      <version>1.8.1</version>
>-     </dependency>
>-     <dependency>
>-       <groupId>jaxen</groupId>
>diff --git a/pmd-4.2.5-build.patch b/pmd-4.2.5-build.patch
>deleted file mode 100644
>index abda1c9..0000000
>--- a/pmd-4.2.5-build.patch
>+++ /dev/null
>@@ -1,179 +0,0 @@
>-diff --git a/bin/build.xml b/bin/build.xml
>-index 30c0d40..9cf5233 100644
>---- a/bin/build.xml
>-+++ b/bin/build.xml
>-@@ -12,10 +12,9 @@
>- 	<property name="dir.regress" value="regress/" />
>- 	<property name="version" value="4.2.5" />
>- 
>--	<property name="asm.version" value="3.1" />
>-+	<property name="asm.version" value="3.3.1" />
>- 	<property name="jaxen.version" value="1.1.1" />
>--	<property name="junit.version" value="4.4" />
>--	<property name="retroweaver.version" value="2.0.5" />
>-+	<property name="junit.version" value="4.8.2" />
>- 	<property name="javacc-home.path" value="${dir.lib}" />
>- 
>- 	
>-@@ -23,10 +22,12 @@
>- 
>- 	<path id="dependencies.path">
>- 		<pathelement location="${dir.build}" />
>--		<fileset dir="${dir.lib}">
>--			<include name="jaxen-${jaxen.version}.jar" />
>--			<include name="asm-${asm.version}.jar" />
>--			<include name="junit-${junit.version}.jar" />
>-+		<fileset dir="/usr/share/java">
>-+			<include name="jaxen.jar" />
>-+			<include name="junit.jar" />
>-+		</fileset>
>-+		<fileset dir="/usr/share/java/objectweb-asm">
>-+			<include name="asm.jar" />
>- 		</fileset>
>- 	</path>
>- 
>-@@ -78,7 +79,7 @@
>- 			<zipfileset dir="etc" includes="ruleset.dtd,ruleset_xml_schema.xsd" prefix="rulesets"/>
>- 			<manifest>
>- 				<attribute name="Main-Class" value="net.sourceforge.pmd.PMD" />
>--				<attribute name="Class-Path" value="jaxen-${jaxen.version}.jar asm-${asm.version}.jar" />
>-+				<attribute name="Class-Path" value="jaxen-${jaxen.version}.jar objectweb-asm/asm-${asm.version}.jar" />
>- 			</manifest>
>- 		</jar>
>- 
>-@@ -88,58 +89,6 @@
>- 			basedir="${dir.build}" />
>- 	</target>
>- 
>--	<taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
>--		<classpath>
>--			<pathelement location="${dir.lib14}/retroweaver-${retroweaver.version}.jar"/>
>--			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
>--			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
>--			<pathelement location="${dir.lib14}/asm-commons-${asm.version}.jar"/>
>--			<pathelement location="${dir.lib14}/asm-util-${asm.version}.jar"/>
>--			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
>--		</classpath>
>--	</taskdef>
>--
>--	<target name="weavejunit" depends="jar">
>--		<path id="retroweaverclasspath">
>--			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
>--			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
>--			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
>--			<pathelement location="${jvm14.runtime}" />
>--			<pathelement location="${dir.lib}/jaxen-${jaxen.version}.jar" />
>--			<pathelement location="${dir.lib14}/junit.jar" />
>--			<pathelement location="${ant.jar}" />
>--		</path>
>--
>--		<retroweaver inputjar="${dir.lib}/junit-${junit.version}.jar" outputjar="${dir.lib14}/junit.jar" target="1.4" failonerror="true" verify="true">
>--			<classpath refid="retroweaverclasspath" />
>--		</retroweaver>
>--	</target>
>--
>--	<target name="weave" depends="jar, weavejunit">
>--		<fail unless="ant.jar" message="ant.jar location is not defined properly" />
>--		<fail unless="jvm14.runtime" message="jvm14.runtime (i.e. rt.jar) location is not defined properly" />
>--
>--		<path id="retroweaverclasspath">
>--			<pathelement location="${dir.lib14}/pmd14-${version}.jar" />
>--			<pathelement location="${dir.lib14}/pmd14-test-${version}.jar" />
>--			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
>--			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
>--			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
>--			<pathelement location="${jvm14.runtime}" />
>--			<pathelement location="${dir.lib}/jaxen-${jaxen.version}.jar" />
>--			<pathelement location="${dir.lib14}/junit.jar" />
>--			<pathelement location="${ant.jar}" />
>--		</path>
>--
>--		<retroweaver inputjar="${dir.lib}/pmd-${version}.jar" outputjar="${dir.lib14}/pmd14-${version}.jar" target="1.4" failonerror="true" verify="true">
>--			<classpath refid="retroweaverclasspath" />
>--		</retroweaver>
>--
>--		<retroweaver inputjar="${dir.lib}/pmd-test-${version}.jar" outputjar="${dir.lib14}/pmd14-test-${version}.jar" target="1.4" failonerror="true" verify="true">
>--			<classpath refid="retroweaverclasspath" />
>--		</retroweaver>
>--	</target>
>--
>- 	<target name="jarsrc" depends="copy,compile" description="Jars up the source directory">
>- 		<jar jarfile="${dir.lib}/pmd-src-${version}.jar" basedir="${dir.src}" />
>- 	</target>
>-@@ -249,44 +198,6 @@
>- 		</concat>
>- 	</target>
>- 
>--	<path id="dependencies14.path">
>--		<fileset dir="${dir.lib14}">
>--			<include name="backport-util-concurrent.jar" />
>--			<include name="pmd14-${version}.jar" />
>--			<include name="pmd14-test-${version}.jar" />
>--			<include name="retroweaver-rt-${retroweaver.version}.jar" />
>--			<include name="junit.jar" />
>--		</fileset>
>--		<fileset dir="${dir.lib}">
>--			<include name="jaxen-${jaxen.version}.jar" />
>--			<include name="asm-${asm.version}.jar" />
>--		</fileset>
>--	</path>
>--
>--	<target name="test14" depends="requires-junit,compile,copy,weavejunit,weave" description="Runs the unit tests with 1.4 jvm">
>--		<fail unless="jvm14.exe" message="jvm14.exe location is not defined properly" />
>--
>--		<antcall target="test-execute">
>--			<param name="test.outputdir" value="${dir.build}/reports14"/>
>--			<param name="test.jvm" value="${jvm14.exe}"/>
>--			<param name="test.dependencies" value="dependencies14.path"/>
>--			<param name="test.regression" value="false"/>
>--			<param name="test.printsummary" value="true"/>
>--		</antcall>
>--	</target>
>--
>--	<target name="regress14" depends="requires-junit,compile,copy,weavejunit,weave" description="Runs the regression unit tests with 1.4 jvm">
>--		<fail unless="jvm14.exe" message="jvm14.exe location is not defined properly" />
>--
>--		<antcall target="test-execute">
>--			<param name="test.outputdir" value="${dir.build}/reports14"/>
>--			<param name="test.jvm" value="${jvm14.exe}"/>
>--			<param name="test.dependencies" value="dependencies14.path"/>
>--			<param name="test.regression" value="true"/>
>--			<param name="test.printsummary" value="false"/>
>--		</antcall>
>--	</target>
>--
>- 	<target name="symtabtest" depends="compile" description="Runs the unit tests for the symboltable package">
>- 		<junit printsummary="yes" haltonfailure="yes">
>- 			<classpath>
>-@@ -424,7 +335,7 @@
>- 
>- 	<target name="clean" depends="delete,compile,copy" description="Does a complete recompile" />
>- 
>--	<target name="dist" depends="clean,jar,weave" description="Preps things for a release" />
>-+	<target name="dist" depends="clean,jar" description="Preps things for a release" />
>- 
>- 	<target name="cpdjnlp" depends="dist" description="Uploads a new CPD JNLP thingy to the PMD web site">
>- 		<signjar jar="${dir.lib}/pmd-${version}.jar" storetype="${keystore.type}" alias="${keystore.alias}" keystore="${keystore.path}" storepass="${keystore.password}" />
>-@@ -466,18 +377,20 @@
>- 	<target name="javadoc" description="Generates Javadocs">
>- 		<mkdir dir="docs/api" />
>- 
>--		<javadoc packagenames="com.*, net.*, org.*" sourcepath="${dir.src}" destdir="docs/api" doctitle="PMD ${version} API" failonerror="yes">
>-+		<javadoc packagenames="com.*, net.*, org.*" sourcepath="${dir.src}" destdir="docs/api" doctitle="PMD ${version} API" failonerror="yes" Encoding="latin1">
>- 			<tag name="todo" enabled="false"/>
>- 			<classpath>
>- 				<fileset dir="${dir.lib}">
>- 					<include name="*.jar" />
>- 				</fileset>
>- 				<pathelement location="${ant.jar}" />
>-+				<path refid="dependencies.path" />
>- 			</classpath>
>-+			<link href="file:///usr/share/javadoc/objectweb-asm/" />
>- 		</javadoc>
>- 	</target>
>- 
>--	<target name="qa" depends="dist, regress, regress14, pmdOnPmd, cpdOnPmd, symtabtest, dfatest, cpdtest, javadoc" description="Runs all tests (used for continuous integration tests with cruise control)"/>
>-+	<target name="qa" depends="dist, regress, pmdOnPmd, cpdOnPmd, symtabtest, dfatest, cpdtest, javadoc" description="Runs all tests (used for continuous integration tests with cruise control)"/>
>- 
>- </project>
>- 
>diff --git a/pmd.spec b/pmd.spec
>index 7339391..1e76485 100644
>--- a/pmd.spec
>+++ b/pmd.spec
>@@ -28,42 +28,28 @@
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> #
> Name:           pmd
>-Version:        4.2.5
>-Release:        15%{?dist}
>+Version:        5.0.2
>+Release:        1%{?dist}
> Epoch:          0
> Summary:        Scans Java source code and looks for potential problems
> License:        BSD
> 
>-Source0:        http://downloads.sourceforge.net/pmd/pmd-src-%{version}.zip
>-# This patch has not been sent upstream.  It causes the build to use installed
>-# jars for dependencies rather than use those distributed with the source.  It
>-# also kills retroweaver dead, dead, dead so it won't interfere with the build.
>-Patch0:         pmd-4.2.5-build.patch
>-# This patch was sent upstream on 11 Feb 2009.  It fixes a null pointer
>-# exception when using the nicerhtml output format.
>-Patch1:         pmd-4.2.4-nicerhtml.patch
>-# This patch has not been sent upstream.  It updates an ant dep in a pom file
>-# to use the latest groupId for ant.
>-Patch2:         pmd-4.2.5-antdep.patch
>-URL:            http://pmd.sourceforge.net/
>+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.zip
>+URL:            http://%{name}.sourceforge.net/
> 
>-BuildRequires:  jpackage-utils >= 0:1.6
>+BuildRequires:  ant-testutil
>+BuildRequires:  javacc
> BuildRequires:  java-devel
>-BuildRequires:  ant >= 0:1.6
>-BuildRequires:  ant-junit
>+BuildRequires:  jpackage-utils >= 0:1.6
> BuildRequires:  junit
>-BuildRequires:  jaxen >= 0:1.1.1
>-BuildRequires:  objectweb-asm >= 0:3.1
>-BuildRequires:  objectweb-asm-javadoc >= 0:3.1
>-BuildRequires:  xml-commons-apis >= 1.3.02
>-Requires:       jpackage-utils >= 0:1.6
>-Requires:       java
>-Requires:       jaxen >= 0:1.1.1
>-Requires:       objectweb-asm >= 0:3.1
>-Requires:       xerces-j2
>-Requires:       xml-commons-apis >= 1.3.02
>-Group:          Development/Tools
>-BuildArch:      noarch
>+BuildRequires:  maven-antrun-plugin
>+BuildRequires:  maven-local
>+BuildRequires:  maven-plugin-build-helper
>+BuildRequires:  maven-resources-plugin
>+BuildRequires:  maven-site-plugin
>+BuildRequires:  maven-surefire-plugin
>+BuildRequires:  saxon
>+
> 
> Provides:       %{name}-manual = %{epoch}:%{version}-%{release}
> Obsoletes:      %{name}-manual < 0:4.0.0-1
>@@ -90,57 +76,44 @@ Requires:       objectweb-asm-javadoc
> Javadoc for %{name}.
> 
> %prep
>-%setup -q
>-%patch0 -p1
>-%patch1
>-%patch2
>+%setup -q -n %{name}-src-%{version}
>+
>+%pom_xpath_set "pom:groupId[text()='net.sourceforge.saxon']" net.sf.saxon
>+
>+# linking to the valid javacc location
>+sed -i 's|<property name="javacc.jar" value="[^"]*"/>|<property name="javacc.jar" value="/usr/share/java/javacc.jar"/>|' pom.xml
>+
>+# correcting saxon-related path problems
>+find -iname '*.java' -exec sed -i \
>+    -e 's/net.sf.saxon.om.$AxisIterator\|SingleNodeIterator\|NodeArrayIterator\|EmptyIterator$/net.sf.saxon.tree.iter.\1/' \
>+    -e 's/net.sf.saxon.om.$FastStringBuffer\|Navigator$/net.sf.saxon.tree.util.\1/' \
>+    -e 's/net.sf.saxon.om.$SiblingCountingNode\|VirtualNode$/net.sf.saxon.tree.wrapper.\1/' \
>+    '{}' ';'
>+
> 
> # remove all binary libs
> find . -name "*.jar" -exec rm -f {} \;
> 
>-# remove an unneeded script in an otherwise documentation directory
>-rm -f etc/fr_docs/copy_up.sh
>-
> %build
>-ant
>-ant -f bin/build.xml -Ddir.lib=%{_javadir} javadoc
>+%mvn_build
> 
> %install
>-# jar
>-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
>-install -m 644 lib/%{name}-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}
>-cp -p etc/pmd-nicerhtml.xsl $RPM_BUILD_ROOT%{_sysconfdir}
>-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
>-cp -pr etc/xslt $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
>-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/rulesets
>-cp -pr rulesets/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/rulesets
>-
>-# pom
>-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
>-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
>-
>-%add_maven_depmap
>-
>-# javadoc
>-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>-
>-%files
>-%doc LICENSE.txt etc/changelog.txt etc/fr_docs etc/readme.txt
>+%mvn_install
>+
>+%files -f .mfiles
>+%doc LICENSE.txt etc/changelog.txt etc/fr_docs ReadMe.txt
> %doc etc/pmdProperties.rtf
>-%{_javadir}/*.jar
> %{_datadir}/%{name}-%{version}
> %config(noreplace) %{_sysconfdir}/pmd-nicerhtml.xsl
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
> 
>-%files javadoc
>+%files javadoc -f .mfiles-javadoc
> %doc LICENSE.txt
>-%{_javadocdir}/*
> 
> %changelog
>+* Tue Mar 05 2013 Tomas Radej <tradej@redhat.com> - 0:5.0.2-1
>+- Updated to latest upstream version
>+- Building with maven-local (upstream uses maven now)
>+
> * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.2.5-15
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index a780cb0..ecbce42 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-b0abacaeba8c51edf91c2eb7f62c2abb  pmd-src-4.2.5.zip
>+3be4e2297965723c7c511bdbe4c09303  pmd-src-5.0.2.zip
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 890414: 711991 | 711992