Skip to content

Commit c21dbea

Browse files
committed
Fix more rubocop offenses
1 parent 6f30514 commit c21dbea

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

lib/pmdtester/builders/pmd_report_builder.rb

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -251,24 +251,24 @@ def find_pmd_dist_target
251251
def build_pmd_with_maven
252252
logger.info "#{@pmd_branch_name}: Building PMD #{@pmd_version}..."
253253

254-
if Semver.compare(@pmd_version, '7.14.0') >= 0
255-
# build command since PMD migrated to central portal
256-
package_cmd = './mvnw clean package ' \
257-
'-PfastSkip ' \
258-
'-DskipTests ' \
259-
'-T1C -B'
260-
else
261-
# build command for older PMD versions
262-
package_cmd = './mvnw clean package ' \
263-
"-s #{ResourceLocator.resource('maven-settings.xml')} " \
264-
'-Pfor-dokka-maven-plugin ' \
265-
'-Dmaven.test.skip=true ' \
266-
'-Dmaven.javadoc.skip=true ' \
267-
'-Dmaven.source.skip=true ' \
268-
'-Dcheckstyle.skip=true ' \
269-
'-Dpmd.skip=true ' \
270-
'-T1C -B'
271-
end
254+
package_cmd = if Semver.compare(@pmd_version, '7.14.0') >= 0
255+
# build command since PMD migrated to central portal
256+
'./mvnw clean package ' \
257+
'-PfastSkip ' \
258+
'-DskipTests ' \
259+
'-T1C -B'
260+
else
261+
# build command for older PMD versions
262+
'./mvnw clean package ' \
263+
"-s #{ResourceLocator.resource('maven-settings.xml')} " \
264+
'-Pfor-dokka-maven-plugin ' \
265+
'-Dmaven.test.skip=true ' \
266+
'-Dmaven.javadoc.skip=true ' \
267+
'-Dmaven.source.skip=true ' \
268+
'-Dcheckstyle.skip=true ' \
269+
'-Dpmd.skip=true ' \
270+
'-T1C -B'
271+
end
272272

273273
logger.debug "#{@pmd_branch_name}: maven command: #{package_cmd}"
274274
Cmd.execute_successfully(package_cmd)

test/test_pmd_report_builder.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def test_build_normal_pmd7_new_build
154154

155155
# PMD binary does not exist yet this time...
156156
record_expectations(sha1_head: 'sha1abc', sha1_base: 'sha1abc', zip_file_exists: false)
157-
stub_pmd_build_maven_new_pmd7_build()
157+
stub_pmd_build_maven_new_pmd7_build
158158
PmdTester::Cmd.stubs(:execute_successfully).with(
159159
"unzip -qo pmd-dist/target/pmd-dist-#{@pmd_version}-bin.zip " \
160160
'-d pmd-dist/target/exploded'
@@ -383,7 +383,7 @@ def stub_pmd_build_maven(binary_name:)
383383
end.once
384384
end
385385

386-
def stub_pmd_build_maven_new_pmd7_build()
386+
def stub_pmd_build_maven_new_pmd7_build
387387
PmdTester::Cmd.stubs(:execute_successfully).with do |cmd|
388388
if cmd == './mvnw clean package ' \
389389
'-PfastSkip ' \

0 commit comments

Comments
 (0)