phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 4.3.x branch with lastest modification from 4.2.x

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/branches/pmd/4.3.x@7292 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Romain Pelisse
2011-09-19 17:42:21 +00:00
parent ad7c32bcff
commit 3efe93295c
15 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pmd/bin/build.xml
View File

@ -162,7 +162,8 @@
<include name="**/*.java" />
<exclude name="**/ast/*.java" />
<exclude name="**/cppast/*.java" />
</fileset>
<exclude name="net/sourceforge/pmd/dcd/**/*.java" />
</fileset>
</pmd>
</target>

3
pmd/docs.sh
View File

@ -51,12 +51,11 @@ elif [ $option = "upload" ]; then
echo "Generating and uploading maven artifacts"
ssh $USER,pmd@shell.sf.net create
mvn -q source:jar javadoc:jar deploy
mvn -q deploy:deploy-file -Durl=scp://shell.sourceforge.net/home/groups/p/pm/pmd/htdocs/maven2 -DrepositoryId=pmd-repo -Dfile=java14/lib/pmd14-4.2.6.jar -DpomFile=pmd-jdk14-pom.xml
echo "Uploading xdocs"
DOCS_FILE=docs.tar.gz
cp xdocs/cpdresults.txt xdocs/cpp_cpdresults.txt target/docs/
cd target/docs
rsync -a -e ssh * $USER,pmd@web.sourceforge.net:/home/groups/p/pm/pmd/htdocs
rsync -aRvz -e ssh * "${USER}@web.sourceforge.net:/home/project-web/pmd/htdocs"
cd ../..
fi
if [ -e velocity.log ]; then

2
pmd/etc/changelog.txt
View File

@ -1,4 +1,4 @@
???? - 4.2.6:
September 14, 2011 - 4.2.6:
Fixed bug 2920057 - False + : CloseRessource whith an external getter
Fixed bug 1808110 - Fixed performance issue on PreserveStackTrace
Fixed bug 2832322 - cpd.xml file tag path attribute should be entity-encoded

13
pmd/etc/doing_the_next_pmd_release.txt
View File

@ -24,7 +24,7 @@ ensure all the new rules are listed in a rulesets/releases/<version>.xml file
ant -f bin/build.xml pmdOnPmd
ant -f bin/build.xml clean regress test
ant -f bin/build.xml clean regress
Check in everything
ant -f bin/build.xml dist regress regress14
@ -37,7 +37,8 @@ TESTS: Can you
2) run the Ant 'pmd' task and get a report
ant -f bin/build.xml pmd
run "./generate_release.sh <version>" in etc
cd into etc/ and run the release script:
$ ./release.sh
It will run:
@ -46,14 +47,12 @@ It will run:
generate the binary zip file
svn tag if "yes" is pressed
tag svn (unless -s if used)
generate the source zip file
if you see a bug and fix it, you can delete the release using:
svn delete https://pmd.svn.sourceforge.net/svnroot/pmd/tags/pmd/pmd_release_<version>
and then retag it
Note: if you see a bug and fix it, you can delete the release using (and the retag it):
$ svn delete https://pmd.svn.sourceforge.net/svnroot/pmd/tags/pmd/pmd_release_<version>
Go to Admin, File Releases, Add release
Paste stuff into the changelog/readme boxes

6
pmd/etc/release.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
usage() {
echo "$(basename ${0}) [-v version-number] [-d] [-s]"
echo "$(basename ${0}) [-v version-number] [-d] [-s] [-S]"
echo ""
echo "-v override the release's version number provided in pom.xml"
echo "-d no docs generation"
@ -26,8 +26,8 @@ make_tree_structure() {
local root_dir="${1}"
mkdir -p "${root_dir}/etc"
mkdir "${root_dir}/bin"
mkdir "${root_dir}/lib"
mkdir -p "${root_dir}/bin"
mkdir -p "${root_dir}/lib"
}
while getopts v:dsh OPT; do

1
pmd/etc/update_version.sh
View File

@ -54,7 +54,6 @@ update_regexp "pmd14-[0-9\.]*.jar" "pmd14-$1.jar" docs.sh
update_jar $1 etc/cpd.jnlp
update_jar $1 xdocs/running.xml
update_jar $1 xdocs/integrations.xml
update_jar $1 etc/bug_closer.txt
update_dir $1 xdocs/compiling.xml
update_dir $1 xdocs/integrations.xml

2
pmd/pmd-jdk14-pom.xml
View File

@ -4,7 +4,7 @@
<groupId>pmd</groupId>
<artifactId>pmd-jdk14</artifactId>
<name>PMD</name>
<version>4.2.6-SNAPSHOT</version>
<version>4.2.6</version>
<description>
<![CDATA[
<p>PMD scans Java source code and looks for potential problems like:</p>

2
pmd/pom.xml
View File

@ -4,7 +4,7 @@
<groupId>pmd</groupId>
<artifactId>pmd</artifactId>
<name>PMD</name>
<version>4.2.6-SNAPSHOT</version>
<version>4.2.6</version>
<description>
<![CDATA[
<p>PMD scans Java source code and looks for potential problems like:</p>

3
pmd/project.xml
View File

@ -4,7 +4,7 @@
<pomVersion>3</pomVersion>
<id>pmd</id>
<name>PMD</name>
<currentVersion>4.2.6-SNAPSHOT</currentVersion>
<currentVersion>4.2.6</currentVersion>
<organization>
<name>InfoEther</name>
<url>http://pmd.sourceforge.net/</url>
@ -28,6 +28,7 @@
<h3>Recent releases</h3>
<p><ul>
<li>2011-09-14 PMD 4.2.6: bug fixes, new rules (<a href="http://sourceforge.net/projects/pmd/files/pmd/4.2.6/pmd-bin-4.2.6.zip/download"/>)</li>
<li>2009-02-08 PMD 4.2.5: bug fixes, new rule, new Android ruleset (<a href="http://sourceforge.net/project/shownotes.php?release_id=659603&amp;group_id=56262">Changelog</a>)</li>
<li>2008-10-12 PMD 4.2.4: bug fixes (<a href="http://sourceforge.net/project/shownotes.php?release_id=632850&amp;group_id=56262">Changelog</a>)</li>
<li>2008-08-31 PMD 4.2.3: yet more bug fixes (<a href="http://sourceforge.net/project/shownotes.php?release_id=623284&amp;group_id=56262">Changelog</a>)</li>

2
pmd/src/net/sourceforge/pmd/PMD.java
View File

@ -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.6-SNAPSHOT";
public static final String VERSION = "4.2.6";
public static final String EXCLUDE_MARKER = "NOPMD";
private static final Logger LOG = Logger.getLogger(PMD.class.getName());

2
pmd/src/net/sourceforge/pmd/dfa/SequenceChecker.java
View File

@ -29,7 +29,7 @@ public class SequenceChecker {
public static final int ROOT = -1;
private List<Status> nextSteps = new ArrayList<Status>();
private int type;
private int type; //NOPMD type is used, but PMD seems to no be able to spot it
private boolean lastStep;

4
pmd/src/net/sourceforge/pmd/rules/MoreThanOneLogger.java
View File

@ -23,12 +23,12 @@ public class MoreThanOneLogger extends AbstractRule {
static {
try {
log4jLogger = Class.forName("org.apache.log4j.Logger");
} catch (Throwable t) {
} catch (Throwable t) { //NOPMD somewhat legitmate catch all
log4jLogger = null;
}
try {
javaLogger = Class.forName("java.util.logging.Logger");
} catch (Throwable t) {
} catch (Throwable t) { //NOPMD somewhat legitmate catch all
javaLogger = null;
}
}

5
pmd/src/net/sourceforge/pmd/typeresolution/ClassTypeResolver.java
View File

@ -616,8 +616,9 @@ public class ClassTypeResolver extends JavaParserVisitorAdapter {
private Class<?> processOnDemand(String qualifiedName) {
for (String entry : importedOnDemand) {
try {
return pmdClassLoader.loadClass(entry + "." + qualifiedName);
} catch (Throwable e) {
return pmdClassLoader.loadClass(entry + "." + qualifiedName);
} catch (Throwable e) { //NOPMD
}
}
return null;

2
pmd/src/site/xdoc/index.xml
View File

@ -26,5 +26,3 @@
</section>
</body>
</document>

6
pmd/xdocs/navigation.xml
View File

@ -13,8 +13,10 @@
href="http://sourceforge.net" />
</links>
<menu name="Overview">
<item name="Download PMD 4.2.6" href="http://sourceforge.net/project/showfiles.php?group_id=56262&amp;package_id=51441&amp;release_id=659603" />
<item name="What's new in PMD 4.2.6" href="http://sourceforge.net/project/shownotes.php?release_id=659603&amp;group_id=56262" />
<item name="Download PMD 4.2.6"
href="http://sourceforge.net/projects/pmd/files/pmd/4.2.6/pmd-bin-4.2.6.zip/download" />
<item name="What's new in PMD 4.2.6"
href="http://sourceforge.net/projects/pmd/files/pmd/4.2.6/changelog.txt/download" />
<item name="PMD in the news" href="/news.html" />
<item name="PMD-related products and books" href="/products.html" />
<item name="Best practices" href="/bestpractices.html" />