From 33bcfed90f401e7a576f58c98784f8c802a29864 Mon Sep 17 00:00:00 2001 From: Xavier Le Vourch Date: Wed, 16 Apr 2008 21:52:03 +0000 Subject: [PATCH] version changed to 4.2.2-SNAPSHOT in Java and 4.2.2 in other files git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/branches/pmd/4.2.x@6020 51baf565-9d33-0410-a72c-fc3788e3496d --- pmd/bin/bgastviewer.bat | 2 +- pmd/bin/bgastviewer.sh | 2 +- pmd/bin/build.xml | 2 +- pmd/bin/cpdgui.bat | 2 +- pmd/bin/designer.bat | 2 +- pmd/bin/pmd.bat | 2 +- pmd/docs.sh | 4 ++-- pmd/etc/bug_closer.txt | 4 ++-- pmd/etc/cpd.jnlp | 2 +- pmd/java14/bin/bgastviewer.bat | 2 +- pmd/java14/bin/bgastviewer.sh | 2 +- pmd/java14/bin/cpdgui.bat | 2 +- pmd/java14/bin/designer.bat | 2 +- pmd/java14/bin/pmd.bat | 2 +- pmd/pmd-jdk14-pom.xml | 2 +- pmd/pom.xml | 2 +- pmd/project.xml | 8 ++++---- pmd/src/net/sourceforge/pmd/PMD.java | 2 +- pmd/src/site/site.xml | 4 ++-- pmd/xdocs/compiling.xml | 6 +++--- pmd/xdocs/installing.xml | 6 +++--- pmd/xdocs/integrations.xml | 8 ++++---- pmd/xdocs/navigation.xml | 4 ++-- pmd/xdocs/running.xml | 6 +++--- 24 files changed, 40 insertions(+), 40 deletions(-) diff --git a/pmd/bin/bgastviewer.bat b/pmd/bin/bgastviewer.bat index f421583af2..aeb77fef24 100644 --- a/pmd/bin/bgastviewer.bat +++ b/pmd/bin/bgastviewer.bat @@ -1,6 +1,6 @@ @echo off set TOPDIR=%~dp0/.. -set VERSION=4.2.1 +set VERSION=4.2.2 set PMDJAR=%TOPDIR%/lib/pmd-%VERSION%.jar set JARPATH=%TOPDIR%/lib/asm-3.1.jar;%TOPDIR%/lib/jaxen-1.1.1.jar set OPTS= diff --git a/pmd/bin/bgastviewer.sh b/pmd/bin/bgastviewer.sh index b76e898e6b..396bab5235 100644 --- a/pmd/bin/bgastviewer.sh +++ b/pmd/bin/bgastviewer.sh @@ -1,5 +1,5 @@ TOPDIR=.. -VERSION=4.2.1 +VERSION=4.2.2 PMDJAR=$TOPDIR/lib/pmd-$VERSION.jar JARPATH=$TOPDIR/lib/asm-3.1.jar:$TOPDIR/lib/jaxen-1.1.1.jar OPTS= diff --git a/pmd/bin/build.xml b/pmd/bin/build.xml index 06269e996a..17556c6450 100644 --- a/pmd/bin/build.xml +++ b/pmd/bin/build.xml @@ -9,7 +9,7 @@ - + diff --git a/pmd/bin/cpdgui.bat b/pmd/bin/cpdgui.bat index a3e42c579d..23eafb5b02 100644 --- a/pmd/bin/cpdgui.bat +++ b/pmd/bin/cpdgui.bat @@ -1,6 +1,6 @@ @echo off set TOPDIR=%~dp0/.. -set VERSION=4.2.1 +set VERSION=4.2.2 set PMDJAR=%TOPDIR%/lib/pmd-%VERSION%.jar set JARPATH=%TOPDIR%/lib/asm-3.1.jar;%TOPDIR%/lib/jaxen-1.1.1.jar set OPTS=-Xmx512m diff --git a/pmd/bin/designer.bat b/pmd/bin/designer.bat index 0d4afec33c..da99d5e3da 100644 --- a/pmd/bin/designer.bat +++ b/pmd/bin/designer.bat @@ -1,6 +1,6 @@ @echo off set TOPDIR=%~dp0/.. -set VERSION=4.2.1 +set VERSION=4.2.2 set PMDJAR=%TOPDIR%/lib/pmd-%VERSION%.jar set JARPATH=%TOPDIR%/lib/asm-3.1.jar;%TOPDIR%/lib/jaxen-1.1.1.jar set OPTS= diff --git a/pmd/bin/pmd.bat b/pmd/bin/pmd.bat index de04578d2b..e9d8a9cbc7 100644 --- a/pmd/bin/pmd.bat +++ b/pmd/bin/pmd.bat @@ -1,6 +1,6 @@ @echo off set TOPDIR=%~dp0/.. -set VERSION=4.2.1 +set VERSION=4.2.2 set PMDJAR=%TOPDIR%/lib/pmd-%VERSION%.jar set JARPATH=%TOPDIR%/lib/asm-3.1.jar;%TOPDIR%/lib/jaxen-1.1.1.jar set OPTS= diff --git a/pmd/docs.sh b/pmd/docs.sh index 8ec5a478a0..996cf309c2 100644 --- a/pmd/docs.sh +++ b/pmd/docs.sh @@ -20,7 +20,7 @@ elif [ $option = "all" ]; then elif [ $option = "uploadcurrent" ]; then echo "Generating and uploading maven artifacts" mvn -q source:jar javadoc:jar deploy - mvn -q deploy:deploy-file -Durl=scp://pmd.sourceforge.net/home/groups/p/pm/pmd/htdocs/maven2 -DrepositoryId=pmd-repo -Dfile=java14/lib/pmd14-4.2.1.jar -DpomFile=pmd-jdk14-pom.xml + mvn -q deploy:deploy-file -Durl=scp://pmd.sourceforge.net/home/groups/p/pm/pmd/htdocs/maven2 -DrepositoryId=pmd-repo -Dfile=java14/lib/pmd14-4.2.2.jar -DpomFile=pmd-jdk14-pom.xml echo "Generating xdocs and uploading" ruby munge_rulesets.rb maven -qb pmd:rulesets-index xdoc:generate-from-pom @@ -39,7 +39,7 @@ elif [ $option = "uploadcurrent" ]; then elif [ $option = "upload" ]; then echo "Generating and uploading maven artifacts" mvn -q source:jar javadoc:jar deploy - mvn -q deploy:deploy-file -Durl=scp://pmd.sourceforge.net/home/groups/p/pm/pmd/htdocs/maven2 -DrepositoryId=pmd-repo -Dfile=java14/lib/pmd14-4.2.1.jar -DpomFile=pmd-jdk14-pom.xml + mvn -q deploy:deploy-file -Durl=scp://pmd.sourceforge.net/home/groups/p/pm/pmd/htdocs/maven2 -DrepositoryId=pmd-repo -Dfile=java14/lib/pmd14-4.2.2.jar -DpomFile=pmd-jdk14-pom.xml echo "Uploading xdocs" DOCS_FILE=docs.tar.gz cp xdocs/cpdresults.txt xdocs/cpp_cpdresults.txt target/docs/ diff --git a/pmd/etc/bug_closer.txt b/pmd/etc/bug_closer.txt index 24eff2b7d5..6c0840e397 100644 --- a/pmd/etc/bug_closer.txt +++ b/pmd/etc/bug_closer.txt @@ -1,6 +1,6 @@ -Fixed in Subversion, and you can download a new pmd-4.2.1.jar file here: +Fixed in Subversion, and you can download a new pmd-4.2.2.jar file here: -http://infoether.com/~tom/pmd-4.2.1.jar +http://infoether.com/~tom/pmd-4.2.2.jar that contains that fix. diff --git a/pmd/etc/cpd.jnlp b/pmd/etc/cpd.jnlp index b50ed8b847..db0e92b985 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/java14/bin/bgastviewer.bat b/pmd/java14/bin/bgastviewer.bat index c299c4798c..ff3d6d55d8 100644 --- a/pmd/java14/bin/bgastviewer.bat +++ b/pmd/java14/bin/bgastviewer.bat @@ -1,6 +1,6 @@ @echo off set TOPDIR=%~dp0/../.. -set VERSION=4.2.1 +set VERSION=4.2.2 set PMDJAR=%TOPDIR%/java14/lib/pmd14-%VERSION%.jar set JARPATH=%TOPDIR%/lib/asm-3.1.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 diff --git a/pmd/java14/bin/bgastviewer.sh b/pmd/java14/bin/bgastviewer.sh index aef03472cc..668bff2161 100644 --- a/pmd/java14/bin/bgastviewer.sh +++ b/pmd/java14/bin/bgastviewer.sh @@ -1,5 +1,5 @@ TOPDIR=../.. -VERSION=4.2.1 +VERSION=4.2.2 PMDJAR=$TOPDIR/java14/lib/pmd14-$VERSION.jar JARPATH=$TOPDIR/lib/asm-3.1.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 diff --git a/pmd/java14/bin/cpdgui.bat b/pmd/java14/bin/cpdgui.bat index c94b7e245c..99e8766594 100644 --- a/pmd/java14/bin/cpdgui.bat +++ b/pmd/java14/bin/cpdgui.bat @@ -1,6 +1,6 @@ @echo off set TOPDIR=%~dp0/../.. -set VERSION=4.2.1 +set VERSION=4.2.2 set PMDJAR=%TOPDIR%/java14/lib/pmd14-%VERSION%.jar set JARPATH=%TOPDIR%/lib/asm-3.1.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 diff --git a/pmd/java14/bin/designer.bat b/pmd/java14/bin/designer.bat index ef362f6fec..99eddc0001 100644 --- a/pmd/java14/bin/designer.bat +++ b/pmd/java14/bin/designer.bat @@ -1,6 +1,6 @@ @echo off set TOPDIR=%~dp0/../.. -set VERSION=4.2.1 +set VERSION=4.2.2 set PMDJAR=%TOPDIR%/java14/lib/pmd14-%VERSION%.jar set JARPATH=%TOPDIR%/lib/asm-3.1.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 diff --git a/pmd/java14/bin/pmd.bat b/pmd/java14/bin/pmd.bat index c1220a5118..3467b506ae 100644 --- a/pmd/java14/bin/pmd.bat +++ b/pmd/java14/bin/pmd.bat @@ -1,6 +1,6 @@ @echo off set TOPDIR=%~dp0/../.. -set VERSION=4.2.1 +set VERSION=4.2.2 set PMDJAR=%TOPDIR%/java14/lib/pmd14-%VERSION%.jar set JARPATH=%TOPDIR%/lib/asm-3.1.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 diff --git a/pmd/pmd-jdk14-pom.xml b/pmd/pmd-jdk14-pom.xml index 3a57dbc3cd..e2323a3444 100644 --- a/pmd/pmd-jdk14-pom.xml +++ b/pmd/pmd-jdk14-pom.xml @@ -4,7 +4,7 @@ pmd pmd-jdk14 PMD - 4.2.1 + 4.2.2 PMD scans Java source code and looks for potential problems like:

diff --git a/pmd/pom.xml b/pmd/pom.xml index 7b4c70f44f..85170513f0 100644 --- a/pmd/pom.xml +++ b/pmd/pom.xml @@ -4,7 +4,7 @@ pmd pmd PMD - 4.2.1 + 4.2.2 PMD scans Java source code and looks for potential problems like:

diff --git a/pmd/project.xml b/pmd/project.xml index efed59d59e..8417fe7f78 100644 --- a/pmd/project.xml +++ b/pmd/project.xml @@ -4,7 +4,7 @@ 3 pmd PMD - 4.2.1 + 4.2.2 InfoEther http://pmd.sourceforge.net/ @@ -43,9 +43,9 @@ - 4.2.1 - 4.2.1 - pmd_release_4_2_1 + 4.2.2 + 4.2.2 + pmd_release_4_2_2 dev diff --git a/pmd/src/net/sourceforge/pmd/PMD.java b/pmd/src/net/sourceforge/pmd/PMD.java index a890cbda63..a1f7792e7b 100644 --- a/pmd/src/net/sourceforge/pmd/PMD.java +++ b/pmd/src/net/sourceforge/pmd/PMD.java @@ -48,7 +48,7 @@ import net.sourceforge.pmd.util.FileFinder; public class PMD { public static final String EOL = System.getProperty("line.separator", "\n"); - public static final String VERSION = "4.2.1"; + public static final String VERSION = "4.2.2-SNAPSHOT"; public static final String EXCLUDE_MARKER = "NOPMD"; private static final Logger LOG = Logger.getLogger(PMD.class.getName()); diff --git a/pmd/src/site/site.xml b/pmd/src/site/site.xml index 92eef6aeda..d95b28a27a 100644 --- a/pmd/src/site/site.xml +++ b/pmd/src/site/site.xml @@ -16,8 +16,8 @@ href="http://sourceforge.net" /> - - + + diff --git a/pmd/xdocs/compiling.xml b/pmd/xdocs/compiling.xml index 6efe974632..912d569722 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-4.2.1.zip
-        [tom@hal building]$ unzip -q pmd-src-4.2.1.zip
+        -rw-rw-r--    1 tom      tom       5837216 Jul 17 13:09 pmd-src-4.2.2.zip
+        [tom@hal building]$ unzip -q pmd-src-4.2.2.zip
         [tom@hal building]$

Now cd down into the pmd/bin directory: 

-        [tom@hal building]$ cd pmd-4.2.1/bin/
+        [tom@hal building]$ cd pmd-4.2.2/bin/
         [tom@hal bin]$ ls -l | grep build.xml
         -rw-rw-r--    1 tom      tom          5736 Jun 19 15:36 build.xml
         [tom@hal bin]$
diff --git a/pmd/xdocs/installing.xml b/pmd/xdocs/installing.xml
index a2e5e4ab8b..61e071f499 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:
                   
-                      [tom@hal tmp]$ unzip -q pmd-bin-4.2.1.zip
+                      [tom@hal tmp]$ unzip -q pmd-bin-4.2.2.zip
                       [tom@hal tmp]$ ls -l
                       total 4640
-                      drwxrwxr-x    5 tom      tom          4096 Apr 17 16:38 pmd-4.2.1
-                      -rw-rw-r--    1 tom      tom       4733312 Jun  9 15:44 pmd-bin-4.2.1.zip
+                      drwxrwxr-x    5 tom      tom          4096 Apr 17 16:38 pmd-4.2.2
+                      -rw-rw-r--    1 tom      tom       4733312 Jun  9 15:44 pmd-bin-4.2.2.zip
                       [tom@hal tmp]$
                   
           

diff --git a/pmd/xdocs/integrations.xml b/pmd/xdocs/integrations.xml
index 69460bcb84..902867209f 100644
--- a/pmd/xdocs/integrations.xml
+++ b/pmd/xdocs/integrations.xml
@@ -118,7 +118,7 @@
       
    
           
  • Name: PMD 
    • 
           
  • Kind: Tool for directories
    • 
-          
  • Executable: /Applications/pmd-4.2.1/bin/pmd.sh
    • 
+          
  • Executable: /Applications/pmd-4.2.2/bin/pmd.sh
    • 
           
  • Arguments: $DIRECTORY_PATH$ emacs $USER_ARGUMENTS$
    • 
       

   
@@ -217,7 +217,7 @@ try deleting the ruleset.xml file in the .metadata/plugins/net.sourceforge.pmd.e
   
  • Menu: Select the "Main menu", "Project views", "Editor menu", and "Search results" checkboxes.
    • 
   
  • Program: $JDKPath$\bin\java.exe
    • 
   
  • For the next parameter you'll need to plug in the location of your PMD installation and the rulesets you want to use
    • 
-  
  • Parameters: -cp %CLASSPATH%;c:\pmd\lib\pmd-4.2.1.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$ 
    • 
+  
  • Parameters: -cp %CLASSPATH%;c:\pmd\lib\pmd-4.2.2.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$ 
    • 
   
   
   
    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
@@ -337,7 +337,7 @@ selecting the "Ask for Directory" checkbox.
    
     
    Assumptions
    
     
      
         
    • The Java Development Kit, version 1.4.2 (versions 1.4 and higher are acceptable) is properly installed into your machine, and exists in D:\java\jdk_142\.  This means that D:\java\jdk_142\bin\java.exe exists.
      • 
-        
    • PMD version 4.2.1 exists in D:\java\pmd-4.2.1\.  This means that D:\java\pmd-4.2.1\lib\pmd-4.2.1.jar (among other jar files in the same directory) exist.
      • 
+        
    • PMD version 4.2.2 exists in D:\java\pmd-4.2.2\.  This means that D:\java\pmd-4.2.2\lib\pmd-4.2.2.jar (among other jar files in the same directory) exist.
      • 
     
    
     
    To integrate into TextPad
    
     
      
@@ -351,7 +351,7 @@ selecting the "Ask for Directory" checkbox.
      
         
    1. Expand the Tools branch (if not already) by clicking on the '+' directly to its left.
      2. 
         
    2. In the expanded list, select PMD directory.  This changes the right side of this dialog to the "tool" form.
      3. 
         
    3. In the "tool" form, enter these parameters:
        
-            
      • Parameters:  -classpath D:\java\pmd-4.2.1\lib\pmd-4.2.1.jar;D:\java\pmd-4.2.1\lib\asm-3.1.jar;D:\java\pmd-4.2.1\lib\jaxen-1.1.1.jar net.sourceforge.pmd.PMD $FileDir net.sourceforge.pmd.renderers.TextPadRenderer E:\directory\my_pmd_ruleset.xml -debug
+            
      • Parameters:  -classpath D:\java\pmd-4.2.2\lib\pmd-4.2.2.jar;D:\java\pmd-4.2.2\lib\asm-3.1.jar;D:\java\pmd-4.2.2\lib\jaxen-1.1.1.jar net.sourceforge.pmd.PMD $FileDir net.sourceforge.pmd.renderers.TextPadRenderer E:\directory\my_pmd_ruleset.xml -debug
             
        (Eliminate the spaces following 'jaxen-1.1.1.jar;' and 'asm-3.1.jar;'.  They are there to prevent the text from exceeding the right side of your screen)
        • 
             
      • Initial Folder:  $FileDir
        • 
             
      • Save all documents first:  Checked
        • 
diff --git a/pmd/xdocs/navigation.xml b/pmd/xdocs/navigation.xml
index a155201321..d03023b8a7 100644
--- a/pmd/xdocs/navigation.xml
+++ b/pmd/xdocs/navigation.xml
@@ -13,8 +13,8 @@
             href="http://sourceforge.net" />
     
     
-      
-      
+      
+      
       
       
       
diff --git a/pmd/xdocs/running.xml b/pmd/xdocs/running.xml
index 5df931d3be..91f22dce36 100644
--- a/pmd/xdocs/running.xml
+++ b/pmd/xdocs/running.xml
@@ -13,7 +13,7 @@
     		
      • Type pmd [filename|jar or zip file containing source code|directory] [report format] [ruleset file], i.e:
        • 
     		
        
     			
-C:\tmp\pmd-4.2.1\pmd\bin>pmd c:\data\pmd\pmd\test-data\Unused1.java xml rulesets/unusedcode.xml
+C:\tmp\pmd-4.2.2\pmd\bin>pmd c:\data\pmd\pmd\test-data\Unused1.java xml rulesets/unusedcode.xml
 <?xml version="1.0"?><pmd>
 <file name="c:\data\pmd\pmd\test-data\Unused1.java">
 <violation line="5" rule="UnusedLocalVariable">
@@ -21,7 +21,7 @@ Avoid unused local variables such as 'fr'
 </violation>
 </file></pmd>
 
-C:\tmp\pmd-4.2.1\pmd\bin>
+C:\tmp\pmd-4.2.2\pmd\bin>
 				
        
        You can pass a file name, a directory name, or a jar or zip file name containing Java source code to PMD.
        
        
        Also, the PMD binary distribution includes the ruleset files
@@ -31,7 +31,7 @@ C:\tmp\pmd-4.2.1\pmd\bin>
 
        
      • If you are want to run PMD without the batch file, you can do a:
        • 
        
-C:\data\pmd\pmd>java -cp lib\pmd-4.2.1.jar;lib\jaxen-1.1.1.jar;lib\asm-3.1.jar
+C:\data\pmd\pmd>java -cp lib\pmd-4.2.2.jar;lib\jaxen-1.1.1.jar;lib\asm-3.1.jar
                      net.sourceforge.pmd.PMD
                      c:\j2sdk1.4.1_01\src\java\lang xml
                      rulesets/imports.xml