Merge branch 'main' into fix-missing-violations

Author: adangel

History.md

@@ -1,8 +1,8 @@
-# 1.5.6-SNAPSHOT / ????-??-??
+# 1.6.0-SNAPSHOT / ????-??-??
 
 ## New and Noteworthy
 
-#### New Git default branch - "main"
+### New Git default branch - "main"
 
 We are joining the Git community and updating "master" to "main". Using the term "master" for the main
 development branch can be offensive to some people. Existing versions of Git have been always capable of
@@ -13,6 +13,10 @@ is "main". Finally, PMD will also use this new name for the main branch in all o
 Note: The regression tester will also use branch `main` by default now for fetching repositories from the list of
 projects. You might need to add `<tag>master</tag>` for some projects.
 
+### Required Ruby version
+
+With this version, Ruby 3.3 or higher is required.
+
 ## Enhancements
 * [#123](https://github.com/pmd/pmd-regression-tester/pull/123): Support ruby 3.3.0
 * [#125](https://github.com/pmd/pmd-regression-tester/pull/125): Update rubocop configuration
@@ -24,6 +28,11 @@ projects. You might need to add `<tag>master</tag>` for some projects.
 * [#131](https://github.com/pmd/pmd-regression-tester/pull/131): Refactor GitHub Actions Workflows
 * [#132](https://github.com/pmd/pmd-regression-tester/pull/132): Fix manual integration test - Update expected_patch_config_3.xml: no more plsql exclusion
 * [#133](https://github.com/pmd/pmd-regression-tester/pull/133): \[ci] Make build a reuseable workflow
+* [#136](https://github.com/pmd/pmd-regression-tester/pull/136): Fix integration tests - missing pmd-core:jar:tests
+
+## Dependency Updates
+* [#130](https://github.com/pmd/pmd-regression-tester/pull/130): Update gems and required ruby version
+* [#135](https://github.com/pmd/pmd-regression-tester/pull/135): Bump rubocop 1.79
 
 ## External Contributions
 

README.rdoc

@@ -101,26 +101,31 @@ The tool creates the following folders:
 
 == REQUIREMENTS:
 
-* Ruby 2.7 or higher
+* Ruby 3.3 or higher
 
 === Runtime dependency
 
-  nokogiri ~> 1.13
-  slop ~> 4.6
+  nokogiri ~> 1.18
+  slop ~> 4.10
   differ ~> 0.1
-  rufus-scheduler ~> 3.8
+  rufus-scheduler ~> 3.9
   logger-colors ~> 1.0
-  liquid ~> 5.2
+  liquid ~> 5.8
+  base64 ~> 0.2
+  bigdecimal ~> 3.1
+  logger ~> 1.6
 
 === Development dependency
 
+  hoe ~> 4.2
   hoe-bundler ~> 1.5
   hoe-git ~> 1.6
-  minitest ~> 5.10
-  mocha ~> 1.5
-  rubocop ~> 0.93
-  test-unit ~> 3.5
-  rdoc ~> 6.4
+  minitest ~> 5.25
+  mocha ~> 2.7
+  rubocop ~> 1.74
+  test-unit ~> 3.6
+  rdoc ~> 6.12
+  rake ~> 13.2
 
 == INSTALL:
 

Rakefile

@@ -20,27 +20,28 @@ hoe = Hoe.spec 'pmdtester' do
 
   self.clean_globs = %w[target/reports/**/* target/test/**/* target/dynamic-config.xml]
   self.extra_deps += [
-    ['nokogiri',        '~> 1.13'],
-    ['slop',            '~> 4.9'],
+    ['nokogiri',        '~> 1.18'],
+    ['slop',            '~> 4.10'],
     ['differ',          '~> 0.1'],
-    ['rufus-scheduler', '~> 3.8'],
+    ['rufus-scheduler', '~> 3.9'],
     ['logger-colors',   '~> 1.0'],
-    ['liquid',          '~> 5.4'],
-    ['base64',          '~> 0.2'],
-    ['bigdecimal',      '~> 3.1'],
+    ['liquid',          '~> 5.8'],
+    ['base64',          '~> 0.3'],
+    ['bigdecimal',      '~> 3.2'],
+    ['logger',          '~> 1.7']
   ]
   self.extra_dev_deps += [
     ['hoe-bundler',   '~> 1.5'],
     ['hoe-git',       '~> 1.6'],
-    ['minitest',      '~> 5.16'],
-    ['mocha',         '~> 1.16'],
-    ['rubocop',       '~> 1.60'],
-    ['test-unit',     '~> 3.5'],
-    ['rdoc',          '~> 6.4'],
-    # Pin rake to 13.1.0, which is still compatible with hoe. See https://github.com/seattlerb/hoe/pull/118
-    ['rake',          '13.1.0']
+    ['minitest',      '~> 5.25'],
+    ['mocha',         '~> 2.7'],
+    ['rubocop',       '~> 1.79'],
+    ['test-unit',     '~> 3.7'],
+    ['rdoc',          '~> 6.12'],
+    ['rake',          '~> 13.3'],
+    ['hoe',           '~> 4.2'],
   ]
-  spec_extras[:required_ruby_version] = '>= 2.7'
+  spec_extras[:required_ruby_version] = '>= 3.3'
 
   license 'BSD-2-Clause'
 end

lib/pmdtester.rb

@@ -33,7 +33,7 @@
 # and unexpected behaviors will not be introduced to PMD project
 # after fixing an issue and new rules can work as expected.
 module PmdTester
-  VERSION = '1.5.6-SNAPSHOT'
+  VERSION = '1.6.0-SNAPSHOT'
   BASE = 'base'
   PATCH = 'patch'
   PR_NUM_ENV_VAR = 'PMD_CI_PULL_REQUEST_NUMBER' # see PmdBranchDetail

lib/pmdtester/builders/pmd_report_builder.rb

@@ -102,7 +102,7 @@ def generate_pmd_report(project)
                 "-r #{project.get_pmd_report_path(@pmd_branch_name)} " \
                 "#{fail_on_violation} -t #{@threads} " \
                 "#{auxclasspath_option}" \
-                "#{pmd7? ? ' --no-progress' : ''}"
+                "#{' --no-progress' if pmd7?}"
       start_time = Time.now
       exit_code = nil
       if File.exist?(project.get_pmd_report_path(@pmd_branch_name))
@@ -173,7 +173,7 @@ def checkout_build_branch
       # determine the version
       @pmd_version = determine_pmd_version
 
-      return unless wd_has_dirty_git_changes
+      return unless wd_has_dirty_git_changes?
 
       # working dir is dirty....
       # we don't allow this because we need the SHA to address the zip file
@@ -193,7 +193,7 @@ def saved_distro_path(build_sha)
         "-#{build_sha}"
     end
 
-    def wd_has_dirty_git_changes
+    def wd_has_dirty_git_changes?
       !Cmd.execute_successfully('git status --porcelain').empty?
     end
 
@@ -250,15 +250,26 @@ def find_pmd_dist_target
 
     def build_pmd_with_maven
       logger.info "#{@pmd_branch_name}: Building PMD #{@pmd_version}..."
-      package_cmd = './mvnw clean package ' \
-                    "-s #{ResourceLocator.resource('maven-settings.xml')} " \
-                    '-Pfor-dokka-maven-plugin ' \
-                    '-Dmaven.test.skip=true ' \
-                    '-Dmaven.javadoc.skip=true ' \
-                    '-Dmaven.source.skip=true ' \
-                    '-Dcheckstyle.skip=true ' \
-                    '-Dpmd.skip=true ' \
-                    '-T1C -B'
+
+      package_cmd = if Semver.compare(@pmd_version, '7.14.0') >= 0
+                      # build command since PMD migrated to central portal
+                      './mvnw clean package ' \
+                        '-PfastSkip ' \
+                        '-DskipTests ' \
+                        '-T1C -B'
+                    else
+                      # build command for older PMD versions
+                      './mvnw clean package ' \
+                        "-s #{ResourceLocator.resource('maven-settings.xml')} " \
+                        '-Pfor-dokka-maven-plugin ' \
+                        '-Dmaven.test.skip=true ' \
+                        '-Dmaven.javadoc.skip=true ' \
+                        '-Dmaven.source.skip=true ' \
+                        '-Dcheckstyle.skip=true ' \
+                        '-Dpmd.skip=true ' \
+                        '-T1C -B'
+                    end
+
       logger.debug "#{@pmd_branch_name}: maven command: #{package_cmd}"
       Cmd.execute_successfully(package_cmd)
     end

lib/pmdtester/builders/rule_set_builder.rb

@@ -9,6 +9,7 @@ module PmdTester
   # Attention: we only consider java rulesets now.
   class RuleSetBuilder
     include PmdTester
+
     PATH_TO_DYNAMIC_CONFIG = 'target/dynamic-config.xml'
     NO_RULES_CHANGED_MESSAGE = 'No regression tested rules have been changed!'
 
@@ -126,7 +127,7 @@ def determine_categories_rules(filenames)
       categories = Set[]
       rules = Set[]
       filenames.each do |filename|
-        matched = check_single_filename(filename, categories, rules)
+        matched = check_single_filename?(filename, categories, rules)
         regression_test_required = true if matched
 
         next if matched
@@ -140,7 +141,7 @@ def determine_categories_rules(filenames)
       [regression_test_required, categories, rules]
     end
 
-    def check_single_filename(filename, categories, rules)
+    def check_single_filename?(filename, categories, rules)
       logger.debug "Checking #{filename}"
 
       # matches Java-based rule implementations

lib/pmdtester/builders/simple_progress_logger.rb

@@ -6,6 +6,7 @@ module PmdTester
   # Helper class that provides a simple progress logging
   class SimpleProgressLogger
     include PmdTester
+
     def initialize(task_name)
       @task_name = task_name
     end

lib/pmdtester/parsers/options.rb

@@ -10,6 +10,7 @@ class InvalidModeError < StandardError; end
   # command line options
   class Options
     include PmdTester
+
     ANY = 'any'
     LOCAL = 'local'
     ONLINE = 'online'

lib/pmdtester/pmd_error.rb

@@ -5,6 +5,7 @@ module PmdTester
   # and which Pmd branch the 'error' is from
   class PmdError
     include PmdTester
+
     # The pmd branch type, 'base' or 'patch'
     attr_reader :branch
 

pmdtester.gemspec

@@ -1,17 +1,17 @@
 # DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake hoe:spec`.
 
 # -*- encoding: utf-8 -*-
-# stub: pmdtester 1.5.6.pre.SNAPSHOT ruby lib
+# stub: pmdtester 1.6.0.pre.SNAPSHOT ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pmdtester".freeze
-  s.version = "1.5.6.pre.SNAPSHOT".freeze
+  s.version = "1.6.0.pre.SNAPSHOT".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.metadata = { "bug_tracker_uri" => "https://github.com/pmd/pmd-regression-tester/issues", "homepage_uri" => "https://pmd.github.io", "source_code_uri" => "https://github.com/pmd/pmd-regression-tester" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andreas Dangel".freeze, "Binguo Bao".freeze, "Cl\u00E9ment Fournier".freeze]
-  s.date = "2025-05-15"
+  s.date = "2025-07-24"
   s.description = "A regression testing tool ensure that new problems and unexpected behaviors will not be introduced to PMD project after fixing an issue , and new rules can work as expected.".freeze
   s.email = ["[email protected]".freeze, "[email protected]".freeze, "[email protected]".freeze]
   s.executables = ["pmdtester".freeze]
@@ -20,29 +20,30 @@ Gem::Specification.new do |s|
   s.homepage = "https://pmd.github.io".freeze
   s.licenses = ["BSD-2-Clause".freeze]
   s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
-  s.required_ruby_version = Gem::Requirement.new(">= 2.7".freeze)
+  s.required_ruby_version = Gem::Requirement.new(">= 3.3".freeze)
   s.rubygems_version = "3.6.2".freeze
   s.summary = "A regression testing tool ensure that new problems and unexpected behaviors will not be introduced to PMD project after fixing an issue , and new rules can work as expected.".freeze
 
   s.specification_version = 4
 
-  s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.13".freeze])
-  s.add_runtime_dependency(%q<slop>.freeze, ["~> 4.9".freeze])
+  s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.18".freeze])
+  s.add_runtime_dependency(%q<slop>.freeze, ["~> 4.10".freeze])
   s.add_runtime_dependency(%q<differ>.freeze, ["~> 0.1".freeze])
-  s.add_runtime_dependency(%q<rufus-scheduler>.freeze, ["~> 3.8".freeze])
+  s.add_runtime_dependency(%q<rufus-scheduler>.freeze, ["~> 3.9".freeze])
   s.add_runtime_dependency(%q<logger-colors>.freeze, ["~> 1.0".freeze])
-  s.add_runtime_dependency(%q<liquid>.freeze, ["~> 5.4".freeze])
-  s.add_runtime_dependency(%q<base64>.freeze, ["~> 0.2".freeze])
-  s.add_runtime_dependency(%q<bigdecimal>.freeze, ["~> 3.1".freeze])
+  s.add_runtime_dependency(%q<liquid>.freeze, ["~> 5.8".freeze])
+  s.add_runtime_dependency(%q<base64>.freeze, ["~> 0.3".freeze])
+  s.add_runtime_dependency(%q<bigdecimal>.freeze, ["~> 3.2".freeze])
+  s.add_runtime_dependency(%q<logger>.freeze, ["~> 1.7".freeze])
   s.add_development_dependency(%q<hoe-bundler>.freeze, ["~> 1.5".freeze])
   s.add_development_dependency(%q<hoe-git>.freeze, ["~> 1.6".freeze])
-  s.add_development_dependency(%q<minitest>.freeze, ["~> 5.16".freeze])
-  s.add_development_dependency(%q<mocha>.freeze, ["~> 1.16".freeze])
-  s.add_development_dependency(%q<rubocop>.freeze, ["~> 1.60".freeze])
-  s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.5".freeze])
-  s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.4".freeze])
-  s.add_development_dependency(%q<rake>.freeze, ["= 13.1.0".freeze])
-  s.add_development_dependency(%q<hoe>.freeze, ["~> 3.26".freeze])
+  s.add_development_dependency(%q<minitest>.freeze, ["~> 5.25".freeze])
+  s.add_development_dependency(%q<mocha>.freeze, ["~> 2.7".freeze])
+  s.add_development_dependency(%q<rubocop>.freeze, ["~> 1.79".freeze])
+  s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.7".freeze])
+  s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.12".freeze])
+  s.add_development_dependency(%q<rake>.freeze, ["~> 13.3".freeze])
+  s.add_development_dependency(%q<hoe>.freeze, ["~> 4.2".freeze])
 end
 
 # DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake hoe:spec`.