Skip to content

Commit 349eea5

Browse files
authored
Mvn updates (#12575)
1 parent 9ae696d commit 349eea5

File tree

2 files changed

+29
-32
lines changed

2 files changed

+29
-32
lines changed

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@
6363
<!-- Plugins versions -->
6464
<cs.antrun-plugin.version>1.8</cs.antrun-plugin.version>
6565
<cs.builder-helper-plugin.version>3.0.0</cs.builder-helper-plugin.version>
66-
<cs.checkstyle-plugin.version>3.1.0</cs.checkstyle-plugin.version>
66+
<cs.checkstyle-plugin.version>3.6.0</cs.checkstyle-plugin.version>
6767
<cs.jacoco-plugin.version>0.8.11</cs.jacoco-plugin.version>
6868
<cs.compiler-plugin.version>3.8.1</cs.compiler-plugin.version>
69-
<cs.dependency-plugin.version>3.1.1</cs.dependency-plugin.version>
69+
<cs.dependency-plugin.version>3.9.0</cs.dependency-plugin.version>
7070
<cs.failsafe-plugin.version>2.22.2</cs.failsafe-plugin.version>
7171
<cs.spotbugs.version>3.1.12</cs.spotbugs.version>
7272
<cs.spotbugs-maven-plugin.version>3.1.12.2</cs.spotbugs-maven-plugin.version>
7373
<cs.jar-plugin.version>3.2.0</cs.jar-plugin.version>
74-
<cs.pmd-plugin.version>3.12.0</cs.pmd-plugin.version>
74+
<cs.pmd-plugin.version>3.28.0</cs.pmd-plugin.version>
7575
<cs.project-info-plugin.version>3.0.0</cs.project-info-plugin.version>
7676
<cs.owasp.dependency-checker-plugin.version>7.4.4</cs.owasp.dependency-checker-plugin.version>
7777
<cs.release-plugin.version>2.5.3</cs.release-plugin.version>
7878
<cs.resources-plugin.version>3.1.0</cs.resources-plugin.version>
79-
<cs.site-plugin.version>3.8.2</cs.site-plugin.version>
79+
<cs.site-plugin.version>3.21.0</cs.site-plugin.version>
8080
<cs.surefire-plugin.version>2.22.2</cs.surefire-plugin.version>
8181
<cs.clover-maven-plugin.version>4.4.1</cs.clover-maven-plugin.version>
8282
<cs.exec-maven-plugin.version>3.2.0</cs.exec-maven-plugin.version>

tools/checkstyle/src/main/resources/cloud-pmd.xml

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,25 @@
1919
under the License.
2020
2121
-->
22-
<ruleset name="Maven Ruleset"
23-
xmlns="http://pmd.sf.net/ruleset/1.0.0"
24-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
25-
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
26-
xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
22+
<ruleset name="CloudStack PMD Ruleset"
23+
xmlns="http://pmd.sourceforge.net/ruleset/2.0.0">
2724

2825
<description>
2926
Ruleset that brings all the rulesets we want from the pmd jar, because
3027
the maven-pmd-plugin doesn't find them otherwise. This is also the place
3128
to add our own future rulesets, if any.
3229
</description>
3330

34-
<rule ref="rulesets/java/basic.xml"/>
35-
<rule ref="rulesets/java/braces.xml"/>
36-
<rule ref="rulesets/java/clone.xml"/>
37-
<rule ref="rulesets/java/codesize.xml"/>
38-
<rule ref="rulesets/java/comments.xml">
31+
<rule ref="category/java/basic.xml"/>
32+
<rule ref="category/java/braces.xml"/>
33+
<rule ref="category/java/clone.xml"/>
34+
<rule ref="category/java/codesize.xml"/>
35+
<rule ref="category/java/comments.xml">
3936
<!-- We shouldn't limit the number of lines in the header of a class -->
4037
<exclude name="CommentSize"/>
4138
<exclude name="CommentRequired" />
4239
</rule>
43-
<rule ref="rulesets/java/controversial.xml">
40+
<rule ref="category/java/controversial.xml">
4441
<!-- The rule is good, but is not properly applied. It forces you to statically declare it as ConcurrentHashMap -->
4542
<exclude name="UseConcurrentHashMap"/>
4643
<exclude name="CallSuperInConstructor"/>
@@ -50,35 +47,35 @@
5047
<exclude name="DataflowAnomalyAnalysis" />
5148
<exclude name="UseObjectForClearerAPI" />
5249
</rule>
53-
<rule ref="rulesets/java/coupling.xml">
50+
<rule ref="category/java/coupling.xml">
5451
<exclude name="ExcessiveImports" />
5552
<exclude name="LawOfDemeter"/>
5653
</rule>
57-
<rule ref="rulesets/java/design.xml">
54+
<rule ref="category/java/design.xml">
5855
<exclude name="ConstructorCallsOverridableMethod"/>
5956
<exclude name="AbstractClassWithoutAbstractMethod"/>
6057
<exclude name="AvoidSynchronizedAtMethodLevel"/>
6158
</rule>
62-
<rule ref="rulesets/java/empty.xml"/>
63-
<rule ref="rulesets/java/finalizers.xml"/>
64-
<rule ref="rulesets/java/imports.xml"/>
65-
<rule ref="rulesets/java/j2ee.xml"/>
66-
<rule ref="rulesets/java/junit.xml"/>
67-
<rule ref="rulesets/java/logging-java.xml"/>
68-
<rule ref="rulesets/java/naming.xml">
59+
<rule ref="category/java/empty.xml"/>
60+
<rule ref="category/java/finalizers.xml"/>
61+
<rule ref="category/java/imports.xml"/>
62+
<rule ref="category/java/j2ee.xml"/>
63+
<rule ref="category/java/junit.xml"/>
64+
<rule ref="category/java/logging-java.xml"/>
65+
<rule ref="category/java/naming.xml">
6966
<exclude name="ShortVariable"/>
7067
<exclude name="AbstractNaming"/>
7168
</rule>
72-
<rule ref="rulesets/java/naming.xml/LongVariable">
69+
<rule ref="category/java/naming.xml/LongVariable">
7370
<properties>
7471
<property name="minimum" value="32"/>
7572
</properties>
7673
</rule>
77-
<rule ref="rulesets/java/optimizations.xml"/>
78-
<rule ref="rulesets/java/strictexception.xml"/>
79-
<rule ref="rulesets/java/strings.xml"/>
80-
<rule ref="rulesets/java/sunsecure.xml"/>
81-
<rule ref="rulesets/java/typeresolution.xml"/>
82-
<rule ref="rulesets/java/unnecessary.xml"/>
83-
<rule ref="rulesets/java/unusedcode.xml"/>
74+
<rule ref="category/java/optimizations.xml"/>
75+
<rule ref="category/java/strictexception.xml"/>
76+
<rule ref="category/java/strings.xml"/>
77+
<rule ref="category/java/sunsecure.xml"/>
78+
<rule ref="category/java/typeresolution.xml"/>
79+
<rule ref="category/java/unnecessary.xml"/>
80+
<rule ref="category/java/unusedcode.xml"/>
8481
</ruleset>

0 commit comments

Comments
 (0)