Created attachment 605325 [details] update to 4.3 please update to 4.3
Created attachment 605326 [details] Upgrade to 4.3 - Upgrade to 4.3 - fix pmd version in pom file
Created attachment 605340 [details] Upgrade to 4.3 - Upgrade to 4.3
Source0 url is wrong. Patch0 is changed but the comment stays the same which indicates theres is smth wrong to me. Also the patch removes whole targets which is totally unnecessary and makes the patch way bigger and unreadable than needed, removing targets from from depends lists is enough.
(In reply to comment #3) > Source0 url is wrong. strange the SOURCE0 for me is corrected, becouse http://downloads.sourceforge.net/pmd/pmd-src-%{version}.zip isnt 4.3 but 4.2.6 > Patch0 is changed but the comment stays the same which indicates theres is > smth wrong to me. Also the patch removes whole targets which is totally > unnecessary and makes the patch way bigger and unreadable than needed, > removing targets from from depends lists is enough. the differences are minimal --- pmd-4.2.5-build.patch 2012-08-18 15:14:49.000000000 +0200 +++ pmd-4.3-build.patch 2012-08-18 15:40:03.225126485 +0200 @@ -1,21 +1,22 @@ -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 @@ +--- bin/build.xml 2011-09-19 19:42:21.000000000 +0200 ++++ bin/build.xml-gil 2012-08-18 15:40:00.891235537 +0200 +@@ -10,12 +10,11 @@ + <property name="dir.release" value="release/" /> + <property name="dir.rulesets" value="rulesets/" /> <property name="dir.regress" value="regress/" /> - <property name="version" value="4.2.5" /> +- <property name="version" value="4.2.6" /> ++ <property name="version" value="4.3" /> -- <property name="asm.version" value="3.1" /> +- <property name="asm.version" value="3.2" /> + <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="junit.version" value="4.10" /> <property name="javacc-home.path" value="${dir.lib}" /> <!--Settings--> -@@ -23,10 +22,12 @@ +@@ -23,10 +22,10 @@ <path id="dependencies.path"> <pathelement location="${dir.build}" /> @@ -25,23 +26,21 @@ - <include name="junit-${junit.version}.jar" /> + <fileset dir="/usr/share/java"> + <include name="jaxen.jar" /> ++ <include name="objectweb-asm/asm.jar" /> + <include name="junit.jar" /> -+ </fileset> -+ <fileset dir="/usr/share/java/objectweb-asm"> -+ <include name="asm.jar" /> </fileset> </path> -@@ -78,7 +79,7 @@ +@@ -78,7 +77,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" /> ++ <attribute name="Class-Path" value="jaxen.jar objectweb-asm/asm.jar" /> </manifest> </jar> -@@ -88,58 +89,6 @@ +@@ -88,58 +87,6 @@ basedir="${dir.build}" /> </target> @@ -100,7 +99,7 @@ <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 @@ +@@ -250,44 +197,6 @@ </concat> </target> @@ -145,16 +144,7 @@ <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 @@ +@@ -475,18 +384,20 @@ <target name="javadoc" description="Generates Javadocs"> <mkdir dir="docs/api" />
Closing as duplicate for update to 5.x. *** This bug has been marked as a duplicate of bug 890414 ***