asm jars updated to 3.2

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/branches/pmd/4.2.x@6954 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Xavier Le Vourch 2009-06-13 00:13:38 +00:00
parent ae499b9132
commit 6243e25400
29 changed files with 27 additions and 25 deletions

View File

@ -6,7 +6,7 @@
<classpathentry kind="var" path="ANT_HOME/ant.jar"/> <classpathentry kind="var" path="ANT_HOME/ant.jar"/>
<classpathentry kind="lib" path="lib/junit-4.4.jar"/> <classpathentry kind="lib" path="lib/junit-4.4.jar"/>
<classpathentry kind="lib" path="lib/jaxen-1.1.1.jar"/> <classpathentry kind="lib" path="lib/jaxen-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/asm-3.1.jar"/> <classpathentry kind="lib" path="lib/asm-3.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="build"/> <classpathentry kind="output" path="build"/>
</classpath> </classpath>

View File

@ -2,7 +2,7 @@
set TOPDIR=%~dp0/.. set TOPDIR=%~dp0/..
set VERSION=4.2.6 set VERSION=4.2.6
set PMDJAR=%TOPDIR%/lib/pmd-%VERSION%.jar set PMDJAR=%TOPDIR%/lib/pmd-%VERSION%.jar
set JARPATH=%TOPDIR%/lib/asm-3.1.jar;%TOPDIR%/lib/jaxen-1.1.1.jar set JARPATH=%TOPDIR%/lib/asm-3.2.jar;%TOPDIR%/lib/jaxen-1.1.1.jar
set OPTS= set OPTS=
set MAIN_CLASS=net.sourceforge.pmd.util.viewer.Viewer set MAIN_CLASS=net.sourceforge.pmd.util.viewer.Viewer

View File

@ -1,7 +1,7 @@
TOPDIR=.. TOPDIR=..
VERSION=4.2.6 VERSION=4.2.6
PMDJAR=$TOPDIR/lib/pmd-$VERSION.jar PMDJAR=$TOPDIR/lib/pmd-$VERSION.jar
JARPATH=$TOPDIR/lib/asm-3.1.jar:$TOPDIR/lib/jaxen-1.1.1.jar JARPATH=$TOPDIR/lib/asm-3.2.jar:$TOPDIR/lib/jaxen-1.1.1.jar
OPTS= OPTS=
MAIN_CLASS=net.sourceforge.pmd.util.viewer.Viewer MAIN_CLASS=net.sourceforge.pmd.util.viewer.Viewer

View File

@ -12,7 +12,7 @@
<property name="dir.regress" value="regress/" /> <property name="dir.regress" value="regress/" />
<property name="version" value="4.2.6" /> <property name="version" value="4.2.6" />
<property name="asm.version" value="3.1" /> <property name="asm.version" value="3.2" />
<property name="jaxen.version" value="1.1.1" /> <property name="jaxen.version" value="1.1.1" />
<property name="junit.version" value="4.4" /> <property name="junit.version" value="4.4" />
<property name="retroweaver.version" value="2.0.5" /> <property name="retroweaver.version" value="2.0.5" />

View File

@ -2,7 +2,7 @@
set TOPDIR=%~dp0/.. set TOPDIR=%~dp0/..
set VERSION=4.2.6 set VERSION=4.2.6
set PMDJAR=%TOPDIR%/lib/pmd-%VERSION%.jar set PMDJAR=%TOPDIR%/lib/pmd-%VERSION%.jar
set JARPATH=%TOPDIR%/lib/asm-3.1.jar;%TOPDIR%/lib/jaxen-1.1.1.jar set JARPATH=%TOPDIR%/lib/asm-3.2.jar;%TOPDIR%/lib/jaxen-1.1.1.jar
set OPTS=-Xmx512m set OPTS=-Xmx512m
set MAIN_CLASS=net.sourceforge.pmd.cpd.GUI set MAIN_CLASS=net.sourceforge.pmd.cpd.GUI

View File

@ -2,7 +2,7 @@
set TOPDIR=%~dp0/.. set TOPDIR=%~dp0/..
set VERSION=4.2.6 set VERSION=4.2.6
set PMDJAR=%TOPDIR%/lib/pmd-%VERSION%.jar set PMDJAR=%TOPDIR%/lib/pmd-%VERSION%.jar
set JARPATH=%TOPDIR%/lib/asm-3.1.jar;%TOPDIR%/lib/jaxen-1.1.1.jar set JARPATH=%TOPDIR%/lib/asm-3.2.jar;%TOPDIR%/lib/jaxen-1.1.1.jar
set OPTS= set OPTS=
set MAIN_CLASS=net.sourceforge.pmd.util.designer.Designer set MAIN_CLASS=net.sourceforge.pmd.util.designer.Designer

View File

@ -2,7 +2,7 @@
set TOPDIR=%~dp0/.. set TOPDIR=%~dp0/..
set VERSION=4.2.6 set VERSION=4.2.6
set PMDJAR=%TOPDIR%/lib/pmd-%VERSION%.jar set PMDJAR=%TOPDIR%/lib/pmd-%VERSION%.jar
set JARPATH=%TOPDIR%/lib/asm-3.1.jar;%TOPDIR%/lib/jaxen-1.1.1.jar set JARPATH=%TOPDIR%/lib/asm-3.2.jar;%TOPDIR%/lib/jaxen-1.1.1.jar
set OPTS= set OPTS=
set MAIN_CLASS=net.sourceforge.pmd.PMD set MAIN_CLASS=net.sourceforge.pmd.PMD

2
pmd/bin/scp.bat Executable file → Normal file
View File

@ -6,7 +6,7 @@ set ANT_HOME=c:\ant
set PATH=c:\j2sdk1.4.2_04\bin;c:\ant\bin\;%PATH% set PATH=c:\j2sdk1.4.2_04\bin;c:\ant\bin\;%PATH%
set CLASSPATH=../build/ set CLASSPATH=../build/
set CLASSPATH=%CLASSPATH%;../ set CLASSPATH=%CLASSPATH%;../
set CLASSPATH=%CLASSPATH%;../lib/asm-3.1.jar set CLASSPATH=%CLASSPATH%;../lib/asm-3.2.jar
set CLASSPATH=%CLASSPATH%;../lib/jaxen-1.1.1.jar set CLASSPATH=%CLASSPATH%;../lib/jaxen-1.1.1.jar
set CLASSPATH=%CLASSPATH%;c:\javacc2.1\bin\lib\JavaCC.zip set CLASSPATH=%CLASSPATH%;c:\javacc2.1\bin\lib\JavaCC.zip
set CLASSPATH=%CLASSPATH%;c:\ant\lib\ant.jar set CLASSPATH=%CLASSPATH%;c:\ant\lib\ant.jar

2
pmd/bin/scp.sh Executable file → Normal file
View File

@ -4,5 +4,5 @@ PATH=/usr/local/java/bin/:$PATH
ANT_OPTS="-Xmx512m -Xms64m" ANT_OPTS="-Xmx512m -Xms64m"
PATH=$MAVEN_HOME/bin:$PATH PATH=$MAVEN_HOME/bin:$PATH
CVSROOT=:ext:tomcopeland@cvs.sourceforge.net:/cvsroot/pmd CVSROOT=:ext:tomcopeland@cvs.sourceforge.net:/cvsroot/pmd
CLASSPATH=../build/:../lib/asm-3.1.jar:../lib/jaxen-1.1.1.jar:../lib/junit-4.4.jar:/usr/local/ant/lib/ant.jar:/usr/local/ant/lib/ant-nodeps.jar CLASSPATH=../build/:../lib/asm-3.2.jar:../lib/jaxen-1.1.1.jar:../lib/junit-4.4.jar:/usr/local/ant/lib/ant.jar:/usr/local/ant/lib/ant-nodeps.jar
export CLASSPATH PATH CVSROOT ANT_OPTS export CLASSPATH PATH CVSROOT ANT_OPTS

View File

@ -8,6 +8,8 @@ Fixed bug 2724653 - AvoidThreadGroup reports false positives
Correct -benchmark reporting of Rule visits via the RuleChain Correct -benchmark reporting of Rule visits via the RuleChain
Fix issue with Type Resolution incorrectly handling of Classes with same name as a java.lang Class. Fix issue with Type Resolution incorrectly handling of Classes with same name as a java.lang Class.
Dependencies updates: asm updated to 3.2
Android ruleset: CallSuperLast rule now also checks for finish() redefinitions Android ruleset: CallSuperLast rule now also checks for finish() redefinitions
New rule: New rule:

View File

@ -40,7 +40,7 @@ cd ../etc/
cp ../java14/lib/*.jar $pmd_bin_dir/java14/lib/ cp ../java14/lib/*.jar $pmd_bin_dir/java14/lib/
cp ../java14/bin/cpd* ../java14/bin/pmd.* ../java14/bin/designer.* $pmd_bin_dir/java14/bin/ cp ../java14/bin/cpd* ../java14/bin/pmd.* ../java14/bin/designer.* $pmd_bin_dir/java14/bin/
chmod 755 $pmd_bin_dir/java14/bin/* chmod 755 $pmd_bin_dir/java14/bin/*
cp ../lib/pmd-$version.jar ../lib/asm-3.1.jar ../lib/jaxen-1.1.1.jar ../lib/junit-4.4.jar $pmd_bin_dir/lib/ cp ../lib/pmd-$version.jar ../lib/asm-3.2.jar ../lib/jaxen-1.1.1.jar ../lib/junit-4.4.jar $pmd_bin_dir/lib/
mkdir $pmd_bin_dir/etc/xslt mkdir $pmd_bin_dir/etc/xslt
cp xslt/*.xslt xslt/*.js xslt/*.gif xslt/*.css $pmd_bin_dir/etc/xslt/ cp xslt/*.xslt xslt/*.js xslt/*.gif xslt/*.css $pmd_bin_dir/etc/xslt/
cp -R ../target/docs $pmd_bin_dir cp -R ../target/docs $pmd_bin_dir

View File

@ -38,7 +38,7 @@ cd ../etc/
cp ../java14/lib/*.jar $pmd_bin_dir/java14/lib/ cp ../java14/lib/*.jar $pmd_bin_dir/java14/lib/
cp ../java14/bin/cpd* ../java14/bin/pmd.* ../java14/bin/designer.* $pmd_bin_dir/java14/bin/ cp ../java14/bin/cpd* ../java14/bin/pmd.* ../java14/bin/designer.* $pmd_bin_dir/java14/bin/
chmod 755 $pmd_bin_dir/java14/bin/* chmod 755 $pmd_bin_dir/java14/bin/*
cp ../lib/pmd-$stripped_version.jar ../lib/asm-3.1.jar ../lib/jaxen-1.1.1.jar ../lib/junit-4.4.jar $pmd_bin_dir/lib/ cp ../lib/pmd-$stripped_version.jar ../lib/asm-3.2.jar ../lib/jaxen-1.1.1.jar ../lib/junit-4.4.jar $pmd_bin_dir/lib/
mkdir $pmd_bin_dir/etc/xslt mkdir $pmd_bin_dir/etc/xslt
cp xslt/*.xslt xslt/*.js xslt/*.gif xslt/*.css $pmd_bin_dir/etc/xslt/ cp xslt/*.xslt xslt/*.js xslt/*.gif xslt/*.css $pmd_bin_dir/etc/xslt/
cp -R ../target/docs $pmd_bin_dir cp -R ../target/docs $pmd_bin_dir

View File

@ -2,7 +2,7 @@
set TOPDIR=%~dp0/../.. set TOPDIR=%~dp0/../..
set VERSION=4.2.6 set VERSION=4.2.6
set PMDJAR=%TOPDIR%/java14/lib/pmd14-%VERSION%.jar set PMDJAR=%TOPDIR%/java14/lib/pmd14-%VERSION%.jar
set JARPATH=%TOPDIR%/lib/asm-3.1.jar;%TOPDIR%/lib/jaxen-1.1.1.jar set JARPATH=%TOPDIR%/lib/asm-3.2.jar;%TOPDIR%/lib/jaxen-1.1.1.jar
set RWPATH=%TOPDIR%/java14/lib/retroweaver-rt-2.0.5.jar;%TOPDIR%/java14/lib/backport-util-concurrent.jar set RWPATH=%TOPDIR%/java14/lib/retroweaver-rt-2.0.5.jar;%TOPDIR%/java14/lib/backport-util-concurrent.jar
set JARPATH=%JARPATH%;%RWPATH% set JARPATH=%JARPATH%;%RWPATH%
set OPTS= set OPTS=

View File

@ -1,7 +1,7 @@
TOPDIR=../.. TOPDIR=../..
VERSION=4.2.6 VERSION=4.2.6
PMDJAR=$TOPDIR/java14/lib/pmd14-$VERSION.jar PMDJAR=$TOPDIR/java14/lib/pmd14-$VERSION.jar
JARPATH=$TOPDIR/lib/asm-3.1.jar:$TOPDIR/lib/jaxen-1.1.1.jar JARPATH=$TOPDIR/lib/asm-3.2.jar:$TOPDIR/lib/jaxen-1.1.1.jar
RWPATH=$TOPDIR/java14/lib/retroweaver-rt-2.0.5.jar:$TOPDIR/java14/lib/backport-util-concurrent.jar RWPATH=$TOPDIR/java14/lib/retroweaver-rt-2.0.5.jar:$TOPDIR/java14/lib/backport-util-concurrent.jar
JARPATH=$JARPATH:$RWPATH JARPATH=$JARPATH:$RWPATH
OPTS= OPTS=

View File

@ -2,7 +2,7 @@
set TOPDIR=%~dp0/../.. set TOPDIR=%~dp0/../..
set VERSION=4.2.6 set VERSION=4.2.6
set PMDJAR=%TOPDIR%/java14/lib/pmd14-%VERSION%.jar set PMDJAR=%TOPDIR%/java14/lib/pmd14-%VERSION%.jar
set JARPATH=%TOPDIR%/lib/asm-3.1.jar;%TOPDIR%/lib/jaxen-1.1.1.jar set JARPATH=%TOPDIR%/lib/asm-3.2.jar;%TOPDIR%/lib/jaxen-1.1.1.jar
set RWPATH=%TOPDIR%/java14/lib/retroweaver-rt-2.0.5.jar;%TOPDIR%/java14/lib/backport-util-concurrent.jar set RWPATH=%TOPDIR%/java14/lib/retroweaver-rt-2.0.5.jar;%TOPDIR%/java14/lib/backport-util-concurrent.jar
set JARPATH=%JARPATH%;%RWPATH% set JARPATH=%JARPATH%;%RWPATH%
set OPTS=-Xmx512m set OPTS=-Xmx512m

View File

@ -2,7 +2,7 @@
set TOPDIR=%~dp0/../.. set TOPDIR=%~dp0/../..
set VERSION=4.2.6 set VERSION=4.2.6
set PMDJAR=%TOPDIR%/java14/lib/pmd14-%VERSION%.jar set PMDJAR=%TOPDIR%/java14/lib/pmd14-%VERSION%.jar
set JARPATH=%TOPDIR%/lib/asm-3.1.jar;%TOPDIR%/lib/jaxen-1.1.1.jar set JARPATH=%TOPDIR%/lib/asm-3.2.jar;%TOPDIR%/lib/jaxen-1.1.1.jar
set RWPATH=%TOPDIR%/java14/lib/retroweaver-rt-2.0.5.jar;%TOPDIR%/java14/lib/backport-util-concurrent.jar set RWPATH=%TOPDIR%/java14/lib/retroweaver-rt-2.0.5.jar;%TOPDIR%/java14/lib/backport-util-concurrent.jar
set JARPATH=%JARPATH%;%RWPATH% set JARPATH=%JARPATH%;%RWPATH%
set OPTS= set OPTS=

View File

@ -2,7 +2,7 @@
set TOPDIR=%~dp0/../.. set TOPDIR=%~dp0/../..
set VERSION=4.2.6 set VERSION=4.2.6
set PMDJAR=%TOPDIR%/java14/lib/pmd14-%VERSION%.jar set PMDJAR=%TOPDIR%/java14/lib/pmd14-%VERSION%.jar
set JARPATH=%TOPDIR%/lib/asm-3.1.jar;%TOPDIR%/lib/jaxen-1.1.1.jar set JARPATH=%TOPDIR%/lib/asm-3.2.jar;%TOPDIR%/lib/jaxen-1.1.1.jar
set RWPATH=%TOPDIR%/java14/lib/retroweaver-rt-2.0.5.jar;%TOPDIR%/java14/lib/backport-util-concurrent.jar set RWPATH=%TOPDIR%/java14/lib/retroweaver-rt-2.0.5.jar;%TOPDIR%/java14/lib/backport-util-concurrent.jar
set JARPATH=%JARPATH%;%RWPATH% set JARPATH=%JARPATH%;%RWPATH%
set OPTS= set OPTS=

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
pmd/lib/asm-3.2.jar Normal file

Binary file not shown.

View File

@ -266,7 +266,7 @@
<dependency> <dependency>
<groupId>asm</groupId> <groupId>asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
<version>3.1</version> <version>3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>

View File

@ -266,7 +266,7 @@
<dependency> <dependency>
<groupId>asm</groupId> <groupId>asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
<version>3.1</version> <version>3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>

View File

@ -12,9 +12,9 @@ maven.compile.target=1.5
maven.clover.execute.during.report=false maven.clover.execute.during.report=false
maven.clover.license.path=${basedir}/etc/clover.license maven.clover.license.path=${basedir}/etc/clover.license
# this can be removed when asm-3.1.jar appears on ibiblio # this can be removed when asm-3.2.jar appears on ibiblio
maven.jar.override = on maven.jar.override = on
maven.jar.asm = ${basedir}/lib/asm-3.1.jar maven.jar.asm = ${basedir}/lib/asm-3.2.jar
maven.junit.fork=true maven.junit.fork=true
maven.junit.forkmode=once maven.junit.forkmode=once

View File

@ -272,7 +272,7 @@ minor fixes if needed until 5.0 is released.</p>
</dependency> </dependency>
<dependency> <dependency>
<id>asm</id> <id>asm</id>
<version>3.1</version> <version>3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<id>junit</id> <id>junit</id>

View File

@ -217,7 +217,7 @@ try deleting the ruleset.xml file in the .metadata/plugins/net.sourceforge.pmd.e
<li>Menu: Select the "Main menu", "Project views", "Editor menu", and "Search results" checkboxes.</li> <li>Menu: Select the "Main menu", "Project views", "Editor menu", and "Search results" checkboxes.</li>
<li>Program: $JDKPath$\bin\java.exe</li> <li>Program: $JDKPath$\bin\java.exe</li>
<li>For the next parameter you'll need to plug in the location of your PMD installation and the rulesets you want to use</li> <li>For the next parameter you'll need to plug in the location of your PMD installation and the rulesets you want to use</li>
<li>Parameters: -cp %CLASSPATH%;c:\pmd\lib\pmd-4.2.6.jar;c:\pmd\lib\asm-3.1.jar;c:\pmd\lib\jaxen-1.1.1.jar net.sourceforge.pmd.PMD "$FilePath$" ideaj unusedcode,imports "$Sourcepath$" $FileClass$.method $FileName$ </li> <li>Parameters: -cp %CLASSPATH%;c:\pmd\lib\pmd-4.2.6.jar;c:\pmd\lib\asm-3.2.jar;c:\pmd\lib\jaxen-1.1.1.jar net.sourceforge.pmd.PMD "$FilePath$" ideaj unusedcode,imports "$Sourcepath$" $FileClass$.method $FileName$ </li>
</ul> </ul>
</ul> </ul>
<p>That's pretty much it. Now you can right click on a source directory and select PMD, it'll run recursively on the source files, and the results should <p>That's pretty much it. Now you can right click on a source directory and select PMD, it'll run recursively on the source files, and the results should
@ -351,8 +351,8 @@ selecting the "Ask for Directory" checkbox.</p>
<LI>Expand the <B>Tools</B> branch (if not already) by clicking on the '<CODE>+</CODE>' directly to its left.</LI> <LI>Expand the <B>Tools</B> branch (if not already) by clicking on the '<CODE>+</CODE>' directly to its left.</LI>
<LI>In the expanded list, select <B>PMD directory</B>. This changes the right side of this dialog to the "tool" form.</LI> <LI>In the expanded list, select <B>PMD directory</B>. This changes the right side of this dialog to the "tool" form.</LI>
<LI>In the "tool" form, enter these parameters:<UL> <LI>In the "tool" form, enter these parameters:<UL>
<LI><B>Parameters:</B> <CODE>-classpath D:\java\pmd-4.2.6\lib\pmd-4.2.6.jar;D:\java\pmd-4.2.6\lib\asm-3.1.jar;D:\java\pmd-4.2.6\lib\jaxen-1.1.1.jar net.sourceforge.pmd.PMD <I><B>$FileDir</B></I> net.sourceforge.pmd.renderers.TextPadRenderer E:\directory\my_pmd_ruleset.xml -debug</CODE> <LI><B>Parameters:</B> <CODE>-classpath D:\java\pmd-4.2.6\lib\pmd-4.2.6.jar;D:\java\pmd-4.2.6\lib\asm-3.2.jar;D:\java\pmd-4.2.6\lib\jaxen-1.1.1.jar net.sourceforge.pmd.PMD <I><B>$FileDir</B></I> net.sourceforge.pmd.renderers.TextPadRenderer E:\directory\my_pmd_ruleset.xml -debug</CODE>
<BR/>(<I>Eliminate the spaces following '<CODE>jaxen-1.1.1.jar;</CODE>' and '<CODE>asm-3.1.jar;</CODE>'. They are there to prevent the text from exceeding the right side of your screen</I>)</LI> <BR/>(<I>Eliminate the spaces following '<CODE>jaxen-1.1.1.jar;</CODE>' and '<CODE>asm-3.2.jar;</CODE>'. They are there to prevent the text from exceeding the right side of your screen</I>)</LI>
<LI><B>Initial Folder:</B> <CODE>$FileDir</CODE></LI> <LI><B>Initial Folder:</B> <CODE>$FileDir</CODE></LI>
<LI><B>Save all documents first:</B> <CODE>Checked</CODE></LI> <LI><B>Save all documents first:</B> <CODE>Checked</CODE></LI>
<LI><B>Capture output:</B> <CODE>Checked</CODE></LI> <LI><B>Capture output:</B> <CODE>Checked</CODE></LI>

View File

@ -31,7 +31,7 @@ C:\tmp\pmd-4.2.6\pmd\bin&gt;
<li>If you are want to run PMD without the batch file, you can do a:</li> <li>If you are want to run PMD without the batch file, you can do a:</li>
<source> <source>
C:\data\pmd\pmd>java -cp lib\pmd-4.2.6.jar;lib\jaxen-1.1.1.jar;lib\asm-3.1.jar C:\data\pmd\pmd>java -cp lib\pmd-4.2.6.jar;lib\jaxen-1.1.1.jar;lib\asm-3.2.jar
net.sourceforge.pmd.PMD net.sourceforge.pmd.PMD
c:\j2sdk1.4.1_01\src\java\lang xml c:\j2sdk1.4.1_01\src\java\lang xml
rulesets/imports.xml rulesets/imports.xml