1
0
forked from phoedos/pmd

Merge branch 'master' into pmd/7.0.x

This commit is contained in:
Andreas Dangel
2020-04-25 11:57:53 +02:00
5 changed files with 39 additions and 31 deletions

@ -62,7 +62,11 @@ elif travis_isPush; then
sourceforge_uploadFile "${VERSION}" "pmd-dist/target/pmd-bin-${VERSION}.zip"
sourceforge_uploadFile "${VERSION}" "pmd-dist/target/pmd-src-${VERSION}.zip"
regression-tester_uploadBaseline
if [ "${TRAVIS_BRANCH}" != "java-grammar" ]; then
regression-tester_uploadBaseline
else
log_info "Skipping regression tester for branch ${TRAVIS_BRANCH}"
fi
else
# other build. Can happen during release: the commit with a non snapshot version is built, but not from the tag.

@ -1,6 +1,9 @@
source 'https://rubygems.org/'
gem 'pmdtester', :git => 'https://github.com/pmd/pmd-regression-tester.git'
# bleeding edge from git
#gem 'pmdtester', :git => 'https://github.com/pmd/pmd-regression-tester.git'
gem 'pmdtester', '~> 1.0'
gem 'danger', '~> 5.6', '>= 5.6'
# This group is only needed for rendering release notes

@ -1,13 +1,3 @@
GIT
remote: https://github.com/pmd/pmd-regression-tester.git
revision: 8e652477b3547d6c843864a2641389a4c61c383e
specs:
pmdtester (1.0.0.pre.SNAPSHOT)
differ
nokogiri (~> 1.8.2)
rufus-scheduler (~> 3.5, >= 3.5)
slop (~> 4.6.2)
GEM
remote: https://rubygems.org/
specs:
@ -19,7 +9,7 @@ GEM
nap
open4 (~> 1.3)
colored2 (3.1.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
cork (0.3.0)
colored2 (~> 3.1)
danger (5.16.1)
@ -35,42 +25,50 @@ GEM
octokit (~> 4.7)
terminal-table (~> 1)
differ (0.1.2)
et-orbi (1.2.2)
et-orbi (1.2.4)
tzinfo
faraday (0.16.2)
faraday (0.17.3)
multipart-post (>= 1.2, < 3)
faraday-http-cache (1.3.1)
faraday (~> 0.8)
fugit (1.3.3)
fugit (1.3.4)
et-orbi (~> 1.1, >= 1.1.8)
raabro (~> 1.1)
git (1.5.0)
git (1.6.0)
rchardet (~> 1.8)
kramdown (1.17.0)
liquid (4.0.3)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
multipart-post (2.1.1)
nap (1.1.0)
no_proxy_fix (0.1.2)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
octokit (4.14.0)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
public_suffix (4.0.1)
pmdtester (1.0.0)
differ (~> 0.1)
nokogiri (~> 1.8)
rufus-scheduler (~> 3.5)
slop (~> 4.6)
public_suffix (4.0.4)
raabro (1.1.6)
rouge (3.11.0)
rchardet (1.8.0)
rouge (3.18.0)
rufus-scheduler (3.6.0)
fugit (~> 1.1, >= 1.1.6)
safe_yaml (1.0.5)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
slop (4.6.2)
slop (4.8.1)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
tzinfo (2.0.0)
tzinfo (2.0.2)
concurrent-ruby (~> 1.0)
unicode-display_width (1.6.0)
unicode-display_width (1.7.0)
PLATFORMS
ruby
@ -78,9 +76,9 @@ PLATFORMS
DEPENDENCIES
danger (~> 5.6, >= 5.6)
liquid (>= 4.0.0)
pmdtester!
pmdtester (~> 1.0)
rouge (>= 1.7, < 4)
safe_yaml (>= 1.0)
BUNDLED WITH
2.0.1
2.1.4

@ -78,6 +78,9 @@ RELEASE_RULESET="pmd-core/src/main/resources/rulesets/releases/${RELEASE_VERSION
echo "* Update date info in **docs/_config.yml**."
echo " date: $(date -u +%d-%B-%Y)"
echo
echo "* Update version info in **docs/_config.yml**."
echo " remove the SNAPSHOT from site.pmd.version"
echo
echo "* Ensure all the new rules are listed in the proper file:"
echo " ${RELEASE_RULESET}"
echo

@ -107,7 +107,7 @@
<pmd.build-tools.version>6</pmd.build-tools.version>
<pmd-designer.version>6.21.0</pmd-designer.version>
<pmd-designer.version>6.24.0-SNAPSHOT</pmd-designer.version>
<javacc.jar>${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar</javacc.jar>
<javacc.outputDirectory>${project.build.directory}/generated-sources/javacc</javacc.outputDirectory>
<javacc.ant.wrapper>${project.basedir}/../javacc-wrapper.xml</javacc.ant.wrapper>
@ -376,12 +376,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>6.22.0</version>
<version>6.23.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>6.22.0</version>
<version>6.23.0</version>
</dependency>
<!-- This contains the dogfood ruleset -->
<dependency>