From 8b4d62eae404f547872b559fb3a89d051b62222f Mon Sep 17 00:00:00 2001
From: Tom Copeland
Date: Tue, 7 Oct 2003 13:52:58 +0000
Subject: [PATCH] Rls preps
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@2292 51baf565-9d33-0410-a72c-fc3788e3496d
---
pmd/etc/astviewer.bat | 2 +-
pmd/etc/astviewer.sh | 2 +-
pmd/etc/bgastviewer.bat | 2 +-
pmd/etc/bgastviewer.sh | 2 +-
pmd/etc/build.xml | 2 +-
pmd/etc/changelog.txt | 2 +-
pmd/etc/cpd.jnlp | 2 +-
pmd/etc/cpdgui.bat | 2 +-
pmd/etc/cygwin-run.sh | 2 +-
pmd/etc/doing_the_next_pmd_release.txt | 47 +++++++++----------
pmd/etc/run.bat | 2 +-
pmd/project.xml | 8 ++--
pmd/rulesets/design.xml | 23 +++++++++
pmd/rulesets/newrules.xml | 24 +---------
.../sourceforge/pmd/CommandLineOptions.java | 4 +-
pmd/xdocs/ant-task.xml | 5 ++
pmd/xdocs/compiling.xml | 12 ++---
pmd/xdocs/installing.xml | 6 +--
pmd/xdocs/integrations.xml | 6 +--
pmd/xdocs/running.xml | 6 +--
20 files changed, 82 insertions(+), 79 deletions(-)
diff --git a/pmd/etc/astviewer.bat b/pmd/etc/astviewer.bat
index 6234b15bf3..b67ac38102 100755
--- a/pmd/etc/astviewer.bat
+++ b/pmd/etc/astviewer.bat
@@ -1 +1 @@
-java -cp ../build;../lib/pmd-1.2.1.jar;../lib/xercesImpl-2.0.2.jar;../lib/xmlParserAPIs-2.0.2.jar;../lib/jaxen-core-1.0-fcs.jar;../lib/saxpath-1.0-fcs.jar net.sourceforge.pmd.util.ASTViewer
+java -cp ../build;../lib/pmd-1.2.2.jar;../lib/xercesImpl-2.0.2.jar;../lib/xmlParserAPIs-2.0.2.jar;../lib/jaxen-core-1.0-fcs.jar;../lib/saxpath-1.0-fcs.jar net.sourceforge.pmd.util.ASTViewer
diff --git a/pmd/etc/astviewer.sh b/pmd/etc/astviewer.sh
index 194a07b084..b6ac9db685 100644
--- a/pmd/etc/astviewer.sh
+++ b/pmd/etc/astviewer.sh
@@ -1 +1 @@
-java -cp ../build:../lib/pmd-1.2.1.jar:../lib/xercesImpl-2.0.2.jar:../lib/xmlParserAPIs-2.0.2.jar:../lib/jaxen-core-1.0-fcs.jar:../lib/saxpath-1.0-fcs.jar net.sourceforge.pmd.util.ASTViewer
+java -cp ../build:../lib/pmd-1.2.2.jar:../lib/xercesImpl-2.0.2.jar:../lib/xmlParserAPIs-2.0.2.jar:../lib/jaxen-core-1.0-fcs.jar:../lib/saxpath-1.0-fcs.jar net.sourceforge.pmd.util.ASTViewer
diff --git a/pmd/etc/bgastviewer.bat b/pmd/etc/bgastviewer.bat
index dcaaf0af85..92392c28b7 100644
--- a/pmd/etc/bgastviewer.bat
+++ b/pmd/etc/bgastviewer.bat
@@ -1 +1 @@
-java -cp ../build;../lib/pmd-1.2.1.jar;../lib/xercesImpl-2.0.2.jar;../lib/xmlParserAPIs-2.0.2.jar;../lib/jaxen-core-1.0-fcs.jar;../lib/saxpath-1.0-fcs.jar net.sourceforge.pmd.util.viewer.Viewer
+java -cp ../build;../lib/pmd-1.2.2.jar;../lib/xercesImpl-2.0.2.jar;../lib/xmlParserAPIs-2.0.2.jar;../lib/jaxen-core-1.0-fcs.jar;../lib/saxpath-1.0-fcs.jar net.sourceforge.pmd.util.viewer.Viewer
diff --git a/pmd/etc/bgastviewer.sh b/pmd/etc/bgastviewer.sh
index a48beaacb7..2c84e65d89 100755
--- a/pmd/etc/bgastviewer.sh
+++ b/pmd/etc/bgastviewer.sh
@@ -1 +1 @@
-java -cp ../build:../lib/pmd-1.2.1.jar:../lib/xercesImpl-2.0.2.jar:../lib/xmlParserAPIs-2.0.2.jar:../lib/jaxen-core-1.0-fcs.jar:../lib/saxpath-1.0-fcs.jar net.sourceforge.pmd.util.viewer.Viewer
+java -cp ../build:../lib/pmd-1.2.2.jar:../lib/xercesImpl-2.0.2.jar:../lib/xmlParserAPIs-2.0.2.jar:../lib/jaxen-core-1.0-fcs.jar:../lib/saxpath-1.0-fcs.jar net.sourceforge.pmd.util.viewer.Viewer
diff --git a/pmd/etc/build.xml b/pmd/etc/build.xml
index b201b9b968..7560908527 100644
--- a/pmd/etc/build.xml
+++ b/pmd/etc/build.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index 0486bb5afa..eaa143dabf 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -1,4 +1,4 @@
-???? 2003 - 1.3:
+October 06, 2003 - 1.2.2:
Added new rule: CloseConnectionRule
Fixed bug 782246 - FinalFieldCouldBeStatic no longer flags fields in interfaces.
Fixed bug 782235 - "ant -version" now prints more details when a file errors out.
diff --git a/pmd/etc/cpd.jnlp b/pmd/etc/cpd.jnlp
index 95452f7b86..a11f866398 100644
--- a/pmd/etc/cpd.jnlp
+++ b/pmd/etc/cpd.jnlp
@@ -13,7 +13,7 @@
-
+
\ No newline at end of file
diff --git a/pmd/etc/cpdgui.bat b/pmd/etc/cpdgui.bat
index 85cb53531c..59ae5fe3a1 100755
--- a/pmd/etc/cpdgui.bat
+++ b/pmd/etc/cpdgui.bat
@@ -1 +1 @@
-java -Xmx512m -cp ../lib/pmd-1.2.1.jar net.sourceforge.pmd.cpd.GUI
+java -Xmx512m -cp ../lib/pmd-1.2.2.jar net.sourceforge.pmd.cpd.GUI
diff --git a/pmd/etc/cygwin-run.sh b/pmd/etc/cygwin-run.sh
index 7aeb3cda60..901c54320a 100644
--- a/pmd/etc/cygwin-run.sh
+++ b/pmd/etc/cygwin-run.sh
@@ -6,7 +6,7 @@ esac
FILE=$1
FORMAT=$2
RULESETFILES=$3
-PMD_CLASSPATH=../lib/pmd-1.2.1.jar:../lib/jaxen-core-1.0-fcs.jar:../lib/saxpath-1.0-fcs.jar
+PMD_CLASSPATH=../lib/pmd-1.2.2.jar:../lib/jaxen-core-1.0-fcs.jar:../lib/saxpath-1.0-fcs.jar
if $cygwin; then
FILE=`cygpath --windows "$FILE"`
PMD_CLASSPATH=`cygpath --path --windows "$PMD_CLASSPATH"`
diff --git a/pmd/etc/doing_the_next_pmd_release.txt b/pmd/etc/doing_the_next_pmd_release.txt
index 0a08fb4cb9..e341b8dbaf 100644
--- a/pmd/etc/doing_the_next_pmd_release.txt
+++ b/pmd/etc/doing_the_next_pmd_release.txt
@@ -1,8 +1,5 @@
-
-<<<<<<<<<<<<<<< BEFORE RELEASE <<<<<<<<<<<<<< update Ant task docs to reflect new 'targetjdk13' boolean
-
-update run.*, astviewer.*, cpd.jnlp, cpdgui.bat, build.xml, PMD.java to point to pmd-1.2.1.jar
-update xdocs/running.xml, compiling.xml, integrations.xml, installing.xml to reflect pmd-1.2.1
+update run.*, astviewer.*, bgastviewer.*, cygwin-run.sh, cpd.jnlp, cpdgui.bat, build.xml, CommandLineOptions.java to point to pmd-1.2.2.jar
+update xdocs/running.xml, compiling.xml, integrations.xml, installing.xml to reflect pmd-1.2.2
update the release date in the changelog
move rules from "newrules.xml" into a real ruleset file
update release number and tag name in project.xml
@@ -22,46 +19,46 @@ cd ..
./docs all
Prepare binary release:
-rm -rf ~/tmp/pmd-1.2.1
-mkdir -p ~/tmp/pmd-1.2.1/etc
-mkdir ~/tmp/pmd-1.2.1/lib
-cp ../LICENSE.txt run.* cygwin-run.sh build.xml cpdgui.bat changelog.txt astviewer.* ~/tmp/pmd-1.2.1/etc
-cp ../lib/pmd-1.2.1.jar ../lib/xmlParserAPIs-2.0.2.jar ../lib/xercesImpl-2.0.2.jar ../lib/jaxen-core-1.0-fcs.jar ../lib/saxpath-1.0-fcs.jar ~/tmp/pmd-1.2.1/lib/
-cp -R xslt/ ~/tmp/pmd-1.2.1/etc/xslt/
-cp -R ../target/docs ~/tmp/pmd-1.2.1
+rm -rf ~/tmp/pmd-1.2.2
+mkdir -p ~/tmp/pmd-1.2.2/etc
+mkdir ~/tmp/pmd-1.2.2/lib
+cp ../LICENSE.txt run.* cygwin-run.sh build.xml cpdgui.bat changelog.txt astviewer.* ~/tmp/pmd-1.2.2/etc
+cp ../lib/pmd-1.2.2.jar ../lib/xmlParserAPIs-2.0.2.jar ../lib/xercesImpl-2.0.2.jar ../lib/jaxen-core-1.0-fcs.jar ../lib/saxpath-1.0-fcs.jar ~/tmp/pmd-1.2.2/lib/
+cp -R xslt/ ~/tmp/pmd-1.2.2/etc/xslt/
+cp -R ../target/docs ~/tmp/pmd-1.2.2
cd ~/tmp
-zip -q -r pmd-bin-1.2.1.zip pmd-1.2.1/
+zip -q -r pmd-bin-1.2.2.zip pmd-1.2.2/
cd -
Time to tag:
cd ../../
-cvs -q rtag -D tomorrow "pmd_release_1_2_1" pmd
+cvs -q rtag -D tomorrow "pmd_release_1_2_2" pmd
Prepare source release:
-rm -rf ~/tmp/pmd-1.2.1
+rm -rf ~/tmp/pmd-1.2.2
mkdir tmp
-cvs -q export -d tmp/ -r pmd_release_1_2_1 pmd
+cvs -q export -d tmp/ -r pmd_release_1_2_2 pmd
cd pmd/etc
ant jarsrc
cd ../../
-cp pmd/lib/pmd-src-1.2.1.jar tmp/lib/
-mv tmp ~/tmp/pmd-1.2.1
-cp pmd/lib/pmd-1.2.1.jar ~/tmp/pmd-1.2.1/lib
-cp -R pmd/target/docs ~/tmp/pmd-1.2.1/
+cp pmd/lib/pmd-src-1.2.2.jar tmp/lib/
+mv tmp ~/tmp/pmd-1.2.2
+cp pmd/lib/pmd-1.2.2.jar ~/tmp/pmd-1.2.2/lib
+cp -R pmd/target/docs ~/tmp/pmd-1.2.2/
cd ~/tmp/
-zip -q -r pmd-src-1.2.1.zip pmd-1.2.1/
+zip -q -r pmd-src-1.2.2.zip pmd-1.2.2/
if you see a bug and fix it, you can delete the release using:
-cvs rtag -d pmd_release_1_2_1 pmd
+cvs rtag -d pmd_release_1_2_2 pmd
and then retag everything
-ncftpput upload.sourceforge.net incoming/ pmd-src-1.2.1.zip pmd-bin-1.2.1.zip
+ncftpput upload.sourceforge.net incoming/ pmd-src-1.2.2.zip pmd-bin-1.2.2.zip
Go to Admin, Edit/Release Files, click on Add new release
Paste stuff into the changelog/readme boxes
-Add the pmd-bin-1.2.1.zip file
-Add the pmd-src-1.2.1.zip file
+Add the pmd-bin-1.2.2.zip file
+Add the pmd-src-1.2.2.zip file
Classify the file
Redo the web site
diff --git a/pmd/etc/run.bat b/pmd/etc/run.bat
index ba83885df5..3074dfcbdb 100755
--- a/pmd/etc/run.bat
+++ b/pmd/etc/run.bat
@@ -2,4 +2,4 @@
set FILE=%1%
set FORMAT=%2%
set RULESETFILES=%3%
-java -cp ..\lib\pmd-1.2.1.jar;..\lib\jaxen-core-1.0-fcs.jar;..\lib\saxpath-1.0-fcs.jar net.sourceforge.pmd.PMD %FILE% %FORMAT% %RULESETFILES%
+java -cp ..\lib\pmd-1.2.2.jar;..\lib\jaxen-core-1.0-fcs.jar;..\lib\saxpath-1.0-fcs.jar net.sourceforge.pmd.PMD %FILE% %FORMAT% %RULESETFILES%
diff --git a/pmd/project.xml b/pmd/project.xml
index 492caa7919..a18aa8b4de 100644
--- a/pmd/project.xml
+++ b/pmd/project.xml
@@ -3,7 +3,7 @@
3pmdPMD
- 1.2.1
+ 1.2.2Project Ultra*Log @ DARPAhttp://pmd.sourceforge.net/
@@ -48,9 +48,9 @@ Gel, and Emacs. You can
+
+ Ensures that Connection objects are always closed after use
+
+ 3
+
+
+
+
diff --git a/pmd/rulesets/newrules.xml b/pmd/rulesets/newrules.xml
index 9e47409a64..da690b1b2c 100644
--- a/pmd/rulesets/newrules.xml
+++ b/pmd/rulesets/newrules.xml
@@ -6,29 +6,7 @@ These are new rules for the next release
-
-
- Ensures that Connection objects are always closed after use
-
- 3
-
-
-
-
+
diff --git a/pmd/src/net/sourceforge/pmd/CommandLineOptions.java b/pmd/src/net/sourceforge/pmd/CommandLineOptions.java
index 99559bc859..2e56423974 100644
--- a/pmd/src/net/sourceforge/pmd/CommandLineOptions.java
+++ b/pmd/src/net/sourceforge/pmd/CommandLineOptions.java
@@ -110,7 +110,7 @@ public class CommandLineOptions {
"3) A ruleset filename or a comma-delimited string of ruleset filenames" + PMD.EOL +
PMD.EOL +
"For example: " + PMD.EOL +
- "c:\\> java -jar pmd-1.2.1.jar c:\\my\\source\\code html rulesets/unusedcode.xml,rulesets/imports.xml" + PMD.EOL +
+ "c:\\> java -jar pmd-1.2.2.jar c:\\my\\source\\code html rulesets/unusedcode.xml,rulesets/imports.xml" + PMD.EOL +
PMD.EOL +
"Optional arguments that may be put after the mandatory arguments are: " + PMD.EOL +
"-debug: prints debugging information " + PMD.EOL +
@@ -118,7 +118,7 @@ public class CommandLineOptions {
"-shortnames: prints shortened filenames in the report" + PMD.EOL +
PMD.EOL +
"For example: " + PMD.EOL +
- "c:\\> java -jar pmd-1.2.1.jar c:\\my\\source\\code html rulesets/unusedcode.xml,rulesets/imports.xml -jdk13 -debug" + PMD.EOL +
+ "c:\\> java -jar pmd-1.2.2.jar c:\\my\\source\\code html rulesets/unusedcode.xml,rulesets/imports.xml -jdk13 -debug" + PMD.EOL +
PMD.EOL;
}
}
diff --git a/pmd/xdocs/ant-task.xml b/pmd/xdocs/ant-task.xml
index 32440011a1..265d4dcc2c 100644
--- a/pmd/xdocs/ant-task.xml
+++ b/pmd/xdocs/ant-task.xml
@@ -55,6 +55,11 @@
Places truncated filenames in the report. This can reduce your report file size by 15%-20%.
No
+
+
targetjdk13
+
Whether to target JDK 1.3 (i.e., allowing usage of 'assert' as an identifier)
+
No
+
diff --git a/pmd/xdocs/compiling.xml b/pmd/xdocs/compiling.xml
index b013cec035..0541218dab 100644
--- a/pmd/xdocs/compiling.xml
+++ b/pmd/xdocs/compiling.xml
@@ -18,15 +18,15 @@ Now you'll need to either check out the source code or download the latest sourc
[tom@hal building]$ ls -l
total 5716
- -rw-rw-r-- 1 tom tom 5837216 Jul 17 13:09 pmd-src-1.2.1.zip
- [tom@hal building]$ unzip -q pmd-src-1.2.1.zip
+ -rw-rw-r-- 1 tom tom 5837216 Jul 17 13:09 pmd-src-1.2.2.zip
+ [tom@hal building]$ unzip -q pmd-src-1.2.2.zip
[tom@hal building]$
Now cd down into the pmd/etc directory:
- [tom@hal building]$ cd pmd-1.2.1/etc/
+ [tom@hal building]$ cd pmd-1.2.2/etc/
[tom@hal etc]$ ls -l | grep build.xml
-rw-rw-r-- 1 tom tom 5736 Jun 19 15:36 build.xml
[tom@hal etc]$
@@ -39,9 +39,9 @@ Now you'll need to either check out the source code or download the latest sourc
Buildfile: build.xml
compile:
- [mkdir] Created dir: /home/tom/tmp/building/pmd-1.2.1/build
- [javac] Compiling 417 source files to /home/tom/tmp/building/pmd-1.2.1/build
- [javac] Note: /home/tom/tmp/building/pmd-1.2.1/regress/test/net/sourceforge/pmd/
+ [mkdir] Created dir: /home/tom/tmp/building/pmd-1.2.2/build
+ [javac] Compiling 417 source files to /home/tom/tmp/building/pmd-1.2.2/build
+ [javac] Note: /home/tom/tmp/building/pmd-1.2.2/regress/test/net/sourceforge/pmd/
RuleSetReadWriteTest.java uses or overrides a deprecated API.
[javac] Note: Recompile with -deprecation for details.
diff --git a/pmd/xdocs/installing.xml b/pmd/xdocs/installing.xml
index 4d8dcaaac3..2e981e85ce 100644
--- a/pmd/xdocs/installing.xml
+++ b/pmd/xdocs/installing.xml
@@ -34,11 +34,11 @@
Download the latest binary distribution - i.e., pmd-bin-x.xx.zip
Unzip it into any directory:
diff --git a/pmd/xdocs/integrations.xml b/pmd/xdocs/integrations.xml
index 5dbef421e7..db0afd6611 100644
--- a/pmd/xdocs/integrations.xml
+++ b/pmd/xdocs/integrations.xml
@@ -136,7 +136,7 @@ selecting the "Ask for Directory" checkbox.
The Java Development Kit, version 1.3.1 (versions 1.3 and higher are acceptable) is properly installed into your machine, and exists in D:\java\jdk_131\. This means that D:\java\jdk_131\bin\java.exe exists.
-
PMD version 1.2.1 exists in D:\java\pmd-1.2.1\. This means that D:\java\pmd-1.2.1\lib\pmd-1.2.1.jar (among other jar files in the same directory) exist.
+
PMD version 1.2.2 exists in D:\java\pmd-1.2.2\. This means that D:\java\pmd-1.2.2\lib\pmd-1.2.2.jar (among other jar files in the same directory) exist.
To integrate into TextPad
@@ -152,7 +152,7 @@ selecting the "Ask for Directory" checkbox.
Expand the Tools branch (if not already) by clicking on the '+' directly to its left.
In the expanded list, select PMD directory. This changes the right side of this dialog to the "tool" form.
Parameters:-classpath D:\java\pmd-1.2.2\lib\pmd-1.2.2.jar;D:\java\pmd-1.2.2\lib\jaxen-core-1.0-fcs.jar; D:\java\pmd-1.2.2\lib\saxpath-1.0-fcs.jar;D:\java\pmd-1.2.2\lib\xmlParserAPIs-2.0.2.jar; D:\java\pmd-1.2.2\lib\xercesImpl-2.0.2.jar net.sourceforge.pmd.PMD $FileDir net.sourceforge.pmd.renderers.TextPadRenderer E:\directory\my_pmd_ruleset.xml -debug (Eliminate the spaces following both 'jaxen-core-1.0-fcs.jar;' and 'xmlParserAPIs-2.0.2.jar;'. They are there to prevent the text from exceeding the right side of your screen)
Initial Folder:$FileDir
Save all documents first:Checked
@@ -229,7 +229,7 @@ works OK. Here's how to set it up:
Description: PMD doth help one clean the code
Program: javaw
For the next two parameters you'll need to plug in the location of your PMD installation, the rulesets you want to use, and your working directory