From 10220fb9a7972e679aaa7ac45df605f3637af682 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sun, 24 May 2020 18:14:23 +0200 Subject: [PATCH 1/4] [doc] Update deprecated rules --- docs/pages/next_major_development.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/pages/next_major_development.md b/docs/pages/next_major_development.md index 97b9d6db69..6c004a5529 100644 --- a/docs/pages/next_major_development.md +++ b/docs/pages/next_major_development.md @@ -874,6 +874,10 @@ large projects, with many duplications, it was causing `OutOfMemoryError`s (see will be removed with PMD 7.0.0. The rule is replaced by the more general {% rule "java/multithreading/UnsynchronizedStaticFormatter" %}. +* The two Java rules {% rule "java/bestpractices/PositionLiteralsFirstInComparisons" %} + and {% rule "java/bestpractices/PositionLiteralsFirstInCaseInsensitiveComparisons" %} (ruleset `java-bestpractices`) + have been deprecated in favor of the new rule {% rule java/bestpractices/LiteralsFirstInComparisons" %}. + From 8c1105f4cdc0564dd38056caf8b6d9a6ad4ebe65 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sun, 24 May 2020 18:14:55 +0200 Subject: [PATCH 2/4] Clearify release step --- do-release.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/do-release.sh b/do-release.sh index 98fc3eaf1d..92a5ec8079 100755 --- a/do-release.sh +++ b/do-release.sh @@ -175,6 +175,9 @@ echo echo echo "Prepare Next development version:" echo "* Update version/date info in **docs/_config.yml**." +echo " move version to previous_version, increase version, make sure it is a SNAPSHOT version" +echo " otherwise the javadoc links won't work during development" +echo " also update the date, e.g. ??-month-year." echo echo echo "Press enter to continue..." From 70ac66dcb278fc6166c397bfcc1258926c3a7550 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sun, 24 May 2020 19:17:53 +0200 Subject: [PATCH 3/4] Fix rule tag --- docs/pages/next_major_development.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pages/next_major_development.md b/docs/pages/next_major_development.md index 6c004a5529..3439ad0b3c 100644 --- a/docs/pages/next_major_development.md +++ b/docs/pages/next_major_development.md @@ -876,7 +876,7 @@ large projects, with many duplications, it was causing `OutOfMemoryError`s (see * The two Java rules {% rule "java/bestpractices/PositionLiteralsFirstInComparisons" %} and {% rule "java/bestpractices/PositionLiteralsFirstInCaseInsensitiveComparisons" %} (ruleset `java-bestpractices`) - have been deprecated in favor of the new rule {% rule java/bestpractices/LiteralsFirstInComparisons" %}. + have been deprecated in favor of the new rule {% rule "java/bestpractices/LiteralsFirstInComparisons" %}. From bc4a1d67eb091eeebcad26983eeeafbc68aa2698 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 29 May 2020 09:27:58 +0200 Subject: [PATCH 4/4] Update gems --- Gemfile.lock | 10 +++++----- docs/Gemfile.lock | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 930f607624..a95b9119a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,10 +31,10 @@ GEM multipart-post (>= 1.2, < 3) faraday-http-cache (1.3.1) faraday (~> 0.8) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) - git (1.6.0) + git (1.7.0) rchardet (~> 1.8) kramdown (1.17.0) liquid (4.0.3) @@ -53,10 +53,10 @@ GEM nokogiri (~> 1.8) rufus-scheduler (~> 3.5) slop (~> 4.6) - public_suffix (4.0.4) - raabro (1.1.6) + public_suffix (4.0.5) + raabro (1.3.1) rchardet (1.8.0) - rouge (3.18.0) + rouge (3.19.0) rufus-scheduler (3.6.0) fugit (~> 1.1, >= 1.1.6) safe_yaml (1.0.5) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 9cfb934f72..64f086c2ec 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -31,9 +31,9 @@ GEM ffi (1.12.2) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (204) + github-pages (206) github-pages-health-check (= 1.16.1) - jekyll (= 3.8.5) + jekyll (= 3.8.7) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) jekyll-commonmark-ghpages (= 0.1.6) @@ -72,7 +72,7 @@ GEM mercenary (~> 0.3) minima (= 2.5.1) nokogiri (>= 1.10.4, < 2.0) - rouge (= 3.13.0) + rouge (= 3.19.0) terminal-table (~> 1.4) github-pages-health-check (1.16.1) addressable (~> 2.3) @@ -80,13 +80,13 @@ GEM octokit (~> 4.0) public_suffix (~> 3.0) typhoeus (~> 1.3) - html-pipeline (2.12.3) + html-pipeline (2.13.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.5) + jekyll (3.8.7) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -215,7 +215,7 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.13.0) + rouge (3.19.0) ruby-enum (0.8.0) i18n rubyzip (2.3.0)