WARNING! Access to this system is limited to authorised users only.
Unauthorised users may be subject to prosecution.
Unauthorised access to this system is a criminal offence under Australian law (Federal Crimes Act 1914 Part VIA)
It is a criminal offence to:
(1) Obtain access to data without authority. -Penalty 2 years imprisonment.
(2) Damage, delete, alter or insert data without authority. -Penalty 10 years imprisonment.
User activity is monitored and recorded. Anyone using this system expressly consents to such monitoring and recording.

Commit e7e1ee86 authored by John Zhang's avatar John Zhang
Browse files

revert PMD back to 5.7.0

parent cc9921cc
......@@ -11,13 +11,13 @@
<property file="dacapo.properties"/>
<property name="bm-name" value="pmd"/>
<property name="bm-version" value="6.1.0"/>
<property name="bm-version" value="5.7.0"/>
<property name="bm-url" value="${github.url}/pmd/pmd/releases/download/pmd_releases%2F${bm-version}"/>
<property name="bm-src" value="${bm-name}-src-${bm-version}.zip"/>
<property name="jaxen-version" value="1.1.6"/>
<property name="asm-version" value="6.0"/>
<property name="asm-version" value="5.0.4"/>
<property name="commons-io-version" value="2.4"/>
<property name="commons-lang3-version" value="3.7"/>
<property name="commons-lang3-version" value="3.4"/>
<property name="jcommander-version" value="1.48"/>
<property name="saxon-version" value="9.1.0.8"/>
......@@ -45,12 +45,7 @@
<!-- execute Maven in build directory -->
<exec dir="${bm-build-top}" executable="${mvn-exe}">
<env key="JAVA_HOME" value="${jdk9home}"/>
<arg value="-B"/>
<arg line="--global-toolchains ${mvn-toolchains-xml}"/>
<arg value="-Dmaven.test.skip=true"/>
<arg line="-pl pmd-core,pmd-java,pmd-dist"/>
<arg line="clean package"/>
<arg line="-B --global-toolchains ${mvn-toolchains-xml} -Dmaven.test.skip=true clean package"/>
</exec>
<!-- unpacks produced zip file -->
......
This diff is collapsed.
This diff is collapsed.
pmd/pmd-python/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java
pmd/pmd-vm/target/generated-sources/javacc/net/sourceforge/pmd/lang/vm/ast/Token.java
\ No newline at end of file
benchmark pmd
class org.dacapo.harness.Pmd
thread-model single
jars "pmd-core-6.1.0.jar", "pmd-java-6.1.0.jar", "jaxen-1.1.6.jar", "asm-6.0.jar", "commons-io-2.4.jar", "commons-lang3-3.7.jar", "jcommander-1.48.jar", "saxon-9.1.0.8.jar", "saxon-9.1.0.8-dom.jar", "junit-4.12.jar", "xercesImpl.jar", "xml-apis.jar";
jars "pmd-core-5.7.0.jar", "pmd-java-5.7.0.jar", "jaxen-1.1.6.jar", "asm-5.0.4.jar", "commons-io-2.4.jar", "commons-lang3-3.4.jar", "jcommander-1.48.jar", "saxon-9.1.0.8.jar", "saxon-9.1.0.8-dom.jar", "junit-4.12.jar", "xercesImpl.jar", "xml-apis.jar";
size xsmall args "@pmd/small.lst","text","pmd/rulesets/java/braces.xml","-debug";
......@@ -20,7 +20,7 @@ size small args "@pmd/small.lst","text",
"pmd/rulesets/java/strings.xml",
"pmd/rulesets/java/unusedcode.xml"
output
stdout digest 0x475d6a8a284d22088d52b77e44806c0aac252efd;
stdout digest 0xfb33e383fe2f079d7bfa76f564482c144fee1654;
size default args "@pmd/default.lst","text",
"pmd/rulesets/java/basic.xml",
......@@ -37,7 +37,7 @@ size default args "@pmd/default.lst","text",
"pmd/rulesets/java/strings.xml",
"pmd/rulesets/java/unusedcode.xml"
output
stdout digest 0xe728cd1b9254199c0273775e604753a02536318f;
stdout digest 0x134df767dd7cb928f7a8737b673826f0db2e6bf8;
size large args "@pmd/large.lst","text",
"pmd/rulesets/java/basic.xml",
......@@ -54,7 +54,7 @@ size large args "@pmd/large.lst","text",
"pmd/rulesets/java/strings.xml",
"pmd/rulesets/java/unusedcode.xml"
output
stdout digest 0xe6eee309b7f1d367c32b06673a4aba47e98f7c89;
stdout digest 0x6ffbc6a2e901c82c0ecfca92eb84998db5ea51fc;
description
short "A source code analyzer for Java",
......@@ -63,6 +63,6 @@ description
author "Tom Copeland",
license "BSD-style",
url "https://pmd.github.io",
version "6.1.0",
version "5.7.0",
threads "Externally single-threaded. Internally multi-threaded; creating workers according to number of available processors.",
repeats "Single iteration checks numerous sources file against 18 coding rules";
diff -ur orig/pmd-src-6.1.0/pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractRenderer.java pmd-src-6.1.0/pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractRenderer.java
--- orig/pmd-src-6.1.0/pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractRenderer.java 2017-05-20 20:36:32.000000000 +1000
+++ pmd-src-6.1.0/pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractRenderer.java 2017-12-19 14:30:10.744710417 +1100
@@ -74,7 +74,7 @@
diff -ur orig/pmd-src-5.7.0/pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractRenderer.java pmd-src-5.7.0/pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractRenderer.java
--- orig/pmd-src-5.7.0/pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractRenderer.java 2017-05-20 20:36:32.000000000 +1000
+++ pmd-src-5.7.0/pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractRenderer.java 2017-12-19 14:30:10.744710417 +1100
@@ -131,7 +131,7 @@
} catch (IOException e) {
throw new IllegalStateException(e);
} finally {
......@@ -10,24 +10,34 @@ diff -ur orig/pmd-src-6.1.0/pmd-core/src/main/java/net/sourceforge/pmd/renderers
}
}
}
--- pmd-src-6.1.0/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java.orig 2018-03-22 22:32:29.000000000 +1100
+++ pmd-src-6.1.0/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java 2018-03-22 22:32:43.000000000 +1100
@@ -83,6 +83,7 @@
} else {
this.compatibilityFilter = null;
}
+ LOG.setLevel(Level.OFF);
diff -ur orig/pmd-src-5.7.0/pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/FileDataSource.java pmd-src-5.7.0/pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/FileDataSource.java
index a3691033f..142a10d6e 100644
--- orig/pmd-src-5.7.0/pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/FileDataSource.java
+++ pmd-src-5.7.0/pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/FileDataSource.java
@@ -37,14 +37,19 @@ public class FileDataSource implements DataSource {
}
/**
--- pmd-src-6.1.0/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/SequenceChecker.java.orig 2018-03-22 23:48:19.000000000 +1100
+++ pmd-src-6.1.0/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/SequenceChecker.java 2018-03-22 23:48:31.000000000 +1100
@@ -95,6 +95,8 @@
doSt.addStep(doExpr);
doExpr.addStep(root);
+
+ LOGGER.setLevel(Level.OFF);
}
private String glomName(boolean shortNames, String inputFileName, File file) {
- if (shortNames && inputFileName.indexOf(',') == -1) {
- if (new File(inputFileName).isDirectory()) {
- return trimAnyPathSep(file.getPath().substring(inputFileName.length()));
- } else {
- if (inputFileName.indexOf(FILE_SEPARATOR.charAt(0)) == -1) {
- return inputFileName;
+ if (shortNames) {
+ if (inputFileName != null && inputFileName.indexOf(',') == -1) {
+ if (new File(inputFileName).isDirectory()) {
+ return trimAnyPathSep(file.getPath().substring(inputFileName.length()));
+ } else {
+ if (inputFileName.indexOf(FILE_SEPARATOR.charAt(0)) == -1) {
+ return inputFileName;
+ }
+ return trimAnyPathSep(inputFileName.substring(inputFileName.lastIndexOf(FILE_SEPARATOR)));
}
- return trimAnyPathSep(inputFileName.substring(inputFileName.lastIndexOf(FILE_SEPARATOR)));
+ } else {
+ // if the 'master' file is not specified, just use the file name
+ return file.getName();
}
}
private Status aktStatus;
......@@ -15,9 +15,6 @@ make=/usr/bin/make
# file.
build.failonerror=true
# building PMD 6.1.0 requires JDK 9
jdk9home=/Library/Java/JavaVirtualMachines/jdk-9.0.1.jdk/Contents/Home
# building tradebeans & tradesoap requires JDK 7
# (Geronimo deployment requirement)
jdk7home=/Library/Java/JavaVirtualMachines/jdk1.7.0_80.jdk/Contents/Home
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment