Fix false positives in Pdd.java

[MikailBag]

No description provided.

[yegor256]

@rultor merge

[rultor]

@rultor merge

@yegor256 OK, I'll try to merge now. You can check the progress of the merge here

[rultor]

@rultor merge

@MikailBag @yegor256 Oops, I failed. You can see the full log here (spent 2min)

+ chmod a+x entry.sh
+ cat
+ echo 'export '\''head=git@github.com:yegor256/qulice.git'\''' ';' 'export '\''pull_id=1168'\''' ';' 'export '\''fork=git@github.com:MikailBag/qulice.git'\''' ';' 'export '\''fork_branch=i1121'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=[WIP] Fix false positives in Pdd.java'\''' ';' 'export '\''author=yegor256'\''' ';' 'pdd --file=/dev/null' ';' 'mvn clean install -Pqulice-profile -Pqulice --errors --batch-mode' ';'
+ sensitive=('settings.xml')
+ rm -rf .gnupg
+ cd repo
+ git remote add fork git@github.com:MikailBag/qulice.git
+ git remote update
Fetching origin
Fetching fork
From github.com:MikailBag/qulice
 * [new branch]        checkstyle-upd -> fork/checkstyle-upd
 * [new branch]        gh-pages       -> fork/gh-pages
 * [new branch]        i-1125         -> fork/i-1125
 * [new branch]        i-1128         -> fork/i-1128
 * [new branch]        i1079          -> fork/i1079
 * [new branch]        i1121          -> fork/i1121
 * [new branch]        java17         -> fork/java17
 * [new branch]        master         -> fork/master
 * [new branch]        qualify-nested -> fork/qualify-nested
 * [new branch]        renovate/com.jcabi-jcabi-xml-0.x -> fork/renovate/com.jcabi-jcabi-xml-0.x
 * [new branch]        renovate/com.jcabi-parent-0.x -> fork/renovate/com.jcabi-parent-0.x
 * [new branch]        renovate/com.puppycrawl.tools-checkstyle-8.x -> fork/renovate/com.puppycrawl.tools-checkstyle-8.x
 * [new branch]        renovate/com.qulice-qulice-maven-plugin-0.x -> fork/renovate/com.qulice-qulice-maven-plugin-0.x
 * [new branch]        renovate/commons-io-commons-io-2.x -> fork/renovate/commons-io-commons-io-2.x
 * [new branch]        renovate/commons-lang-commons-lang-2.x -> fork/renovate/commons-lang-commons-lang-2.x
 * [new branch]        renovate/net.sourceforge.pmd-pmd-core-6.x -> fork/renovate/net.sourceforge.pmd-pmd-core-6.x
 * [new branch]        renovate/net.sourceforge.pmd-pmd-java-6.x -> fork/renovate/net.sourceforge.pmd-pmd-java-6.x
 * [new branch]        renovate/net.sourceforge.pmd-pmd-jsp-6.x -> fork/renovate/net.sourceforge.pmd-pmd-jsp-6.x
 * [new branch]        renovate/org.antlr-antlr4-runtime-4.x -> fork/renovate/org.antlr-antlr4-runtime-4.x
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean
+ git checkout -B __rultor fork/i1121
Switched to a new branch '__rultor'
Branch '__rultor' set up to track remote branch 'i1121' from 'fork'.
+ git checkout -B master origin/master
Switched to and reset branch 'master'
Branch 'master' set up to track remote branch 'master' from 'origin'.
Your branch is up to date with 'origin/master'.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff __rultor
Auto-merging qulice-checkstyle/src/test/java/com/qulice/checkstyle/ChecksTest.java
Auto-merging qulice-checkstyle/src/main/java/com/qulice/checkstyle/NonStaticMethodCheck.java
CONFLICT (content): Merge conflict in qulice-checkstyle/src/main/java/com/qulice/checkstyle/NonStaticMethodCheck.java
Automatic merge failed; fix conflicts and then commit the result.
'cid' file is absent, most probably the Docker container wasn't started correctly

[yegor256]

@MikailBag there are conflicts, would be great if you can fix them