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

Merge branch 'master' into pr/3241

Browse Source
This commit is contained in:
Clément Fournier committed 2021-05-06 12:51:27 +02:00
2 parents 6e750bf927 945c030d7f
commit d84b560c82
12 files changed
+33 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/ISSUE_TEMPLATE/0rule_violation_false-positive.md
+2 -2
View File
@@ -1,6 +1,6 @@
---
name: Rule violation (false positive)
about: Let us know about a false positive
name: Rule violation (false-positive)
about: Let us know about a false-positive (a violation is reported on code that is not problematic)
title: ''
labels: 'a:false-positive'
assignees: ''
.github/ISSUE_TEMPLATE/1rule_violation_false-negative.md
+2 -2
View File
@@ -1,6 +1,6 @@
---
name: Rule violation (false negative)
about: Let us know about a false negative
name: Rule violation (false-negative)
about: Let us know about a false-negative (no violation is reported on problematic code)
title: ''
labels: 'a:false-negative'
assignees: ''
.github/workflows/build.yml
+2 -1
View File
@@ -11,6 +11,7 @@ on:
schedule:
# build it monthly: At 04:00 on day-of-month 1.
- cron: '0 4 1 * *'
workflow_dispatch:
jobs:
build:
@@ -43,7 +44,7 @@ jobs:
run: |
echo "LANG=en_US.UTF-8" >> $GITHUB_ENV
echo "MAVEN_OPTS=-Dmaven.wagon.httpconnectionManager.ttlSeconds=180 -Dmaven.wagon.http.retryHandler.count=3 -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30" >> $GITHUB_ENV
echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/11/scripts" >> $GITHUB_ENV
echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/12/scripts" >> $GITHUB_ENV
- name: Check Environment
shell: bash
run: |
.github/workflows/git-repo-sync.yml
+1 -1
View File
@@ -21,7 +21,7 @@ jobs:
shell: bash
run: |
echo "LANG=en_US.UTF-8" >> $GITHUB_ENV
echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/11/scripts" >> $GITHUB_ENV
echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/12/scripts" >> $GITHUB_ENV
- name: Sync
run: .ci/git-repo-sync.sh
shell: bash
.github/workflows/troubleshooting.yml
+1 -1
View File
@@ -31,7 +31,7 @@ jobs:
run: |
echo "LANG=en_US.UTF-8" >> $GITHUB_ENV
echo "MAVEN_OPTS=-Dmaven.wagon.httpconnectionManager.ttlSeconds=180 -Dmaven.wagon.http.retryHandler.count=3 -DstagingProgressTimeoutMinutes=30" >> $GITHUB_ENV
echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/11/scripts" >> $GITHUB_ENV
echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/12/scripts" >> $GITHUB_ENV
- name: Check Environment
shell: bash
run: |
Gemfile.lock
+2 -2
View File
@@ -39,14 +39,14 @@ GEM
kramdown (1.17.0)
liquid (5.0.1)
logger-colors (1.0.0)
mini_portile2 (2.5.0)
mini_portile2 (2.5.1)
multipart-post (2.1.1)
nap (1.1.0)
no_proxy_fix (0.1.2)
nokogiri (1.11.3)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
octokit (4.20.0)
octokit (4.21.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
docs/Gemfile.lock
+13 -9
View File
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.3.6)
activesupport (6.0.3.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -22,15 +22,19 @@ GEM
em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.12.0)
ffi (>= 1.3.0)
ethon (0.14.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
execjs (2.7.0)
faraday (1.3.0)
faraday (1.4.1)
faraday-excon (~> 1.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
multipart-post (>= 1.2, < 3)
ruby2_keywords
ruby2_keywords (>= 0.0.4)
faraday-excon (1.1.0)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
ffi (1.15.0)
forwardable-extended (2.6.0)
gemoji (3.0.1)
@@ -205,17 +209,17 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.5.0)
mini_portile2 (2.5.1)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.14.4)
multipart-post (2.1.1)
nokogiri (1.11.2)
nokogiri (1.11.3)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
octokit (4.20.0)
octokit (4.21.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
@@ -225,7 +229,7 @@ GEM
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
rexml (3.2.5)
rouge (3.26.0)
ruby-enum (0.9.0)
i18n
docs/_layouts/page.html
+3 -2
View File
@@ -45,8 +45,9 @@ layout: default
{% if page.editmepath %}
{% assign editmepath = page.editmepath %}
{% endif %}
<a target="_blank" href="https://github.com/{{site.github_editme_path}}{{editmepath}}" class="btn btn-default githubEditButton" role="button"><i class="fa fa-github fa-lg"></i> Edit me</a>
{% unless page.editmepath == false %}
<a target="_blank" href="https://github.com/{{site.github_editme_path}}{{editmepath}}" class="btn btn-default githubEditButton" role="button"><i class="fa fa-github fa-lg"></i> Edit me</a>
{% endunless %}
{% endif %}
docs/pages/release_notes.md
+2
View File
@@ -16,6 +16,8 @@ This is a {{ site.pmd.release_type }} release.
### Fixed Issues
* doc
* [#3230](https://github.com/pmd/pmd/issues/3230): \[doc] Remove "Edit me" button for language index pages
* java-codestyle
* [#2655](https://github.com/pmd/pmd/issues/2655): \[java] UnnecessaryImport false positive for on-demand imports
pmd-doc/src/main/java/net/sourceforge/pmd/docs/RuleDocGenerator.java
+1
View File
@@ -182,6 +182,7 @@ public class RuleDocGenerator {
lines.add("language_name: " + entry.getKey().getName());
lines.add("permalink: " + LANGUAGE_INDEX_PERMALINK_PATTERN.replace("${language.tersename}", languageTersename));
lines.add("folder: pmd/rules");
lines.add("editmepath: false");
lines.add("---");
lines.add(GENERATED_WARNING_NO_SOURCE);
pmd-doc/src/test/resources/expected/java.md
+1
View File
@@ -5,6 +5,7 @@ summary: Index of all built-in rules available for Java
language_name: Java
permalink: pmd_rules_java.html
folder: pmd/rules
editmepath: false
---
<!-- DO NOT EDIT THIS FILE. This file is generated. -->
## Sample
pom.xml
+3 -3
View File
@@ -92,8 +92,8 @@
<javacc.version>5.0</javacc.version>
<surefire.version>3.0.0-M5</surefire.version>
<checkstyle.version>8.30</checkstyle.version>
<checkstyle.plugin.version>3.1.1</checkstyle.plugin.version>
<checkstyle.version>8.42</checkstyle.version>
<checkstyle.plugin.version>3.1.2</checkstyle.plugin.version>
<pmd.plugin.version>3.14.0</pmd.plugin.version>
<ant.version>1.10.9</ant.version>
<javadoc.plugin.version>3.2.0</javadoc.plugin.version>
@@ -105,7 +105,7 @@
<argLine>-Xmx512m -Dfile.encoding=${project.build.sourceEncoding}</argLine>
<pmd.build-tools.version>11</pmd.build-tools.version>
<pmd.build-tools.version>12</pmd.build-tools.version>
<pmd-designer.version>6.27.0</pmd-designer.version>
</properties>