Skip to content

Commit c741522

Browse files
pkrall520pkrall520
authored
Merge pull request #1 from pmd/master
Merge Changes back into my fork
2 parents 011aef5 + 42f6f80 commit c741522

File tree

88 files changed

+3610
-2860
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+3610
-2860
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ language: java
1212
jdk: oraclejdk8
1313

1414
before_install:
15-
- "mkdir -p $HOME/.m2"
16-
- "cp .travis/travis-settings.xml $HOME/.m2/settings.xml"
17-
- "source .travis/setup-secrets.sh"
15+
- bash .travis/setup-secrets.sh
16+
- bash .travis/configure-maven.sh
1817
install: true
1918
before_script:
2019
- "export DISPLAY=:99.0"
@@ -44,6 +43,7 @@ notifications:
4443
email:
4544
recipients:
4645
- [email protected]
46+
- [email protected]
4747
on_success: always
4848
on_failure: always
4949
cache:

‎.travis/configure-maven.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
set -e
3+
4+
mkdir -p ${HOME}/.m2
5+
cp .travis/travis-settings.xml ${HOME}/.m2/settings.xml

‎ReleaseNotes.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Eclipse Update Site:
2121

2222
* [#25](https://github.com/pmd/pmd-eclipse-plugin/pull/25): \[core] Typesafe properties - [Clément Fournier](https://github.com/oowekyala)
2323
* [#26](https://github.com/pmd/pmd-eclipse-plugin/pull/26): Updated french translations - [Clément Fournier](https://github.com/oowekyala)
24+
* [#37](https://github.com/pmd/pmd-eclipse-plugin/pull/37): Global Priority Filter for Violations Overview/Outline - [Phillip Krall](https://github.com/pkrall520)
2425

2526

2627
## 24-June-2017: 4.0.15.v20170624-2134

‎net.sourceforge.pmd.eclipse.plugin.test.fragment/pom.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,36 @@
1212
<artifactId>net.sourceforge.pmd.eclipse.plugin.test.fragment</artifactId>
1313
<packaging>eclipse-plugin</packaging>
1414

15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.apache.maven.plugins</groupId>
19+
<artifactId>maven-checkstyle-plugin</artifactId>
20+
<version>3.0.0</version>
21+
<executions>
22+
<execution>
23+
<id>checkstyle-check</id>
24+
<phase>verify</phase>
25+
<goals>
26+
<goal>check</goal>
27+
</goals>
28+
</execution>
29+
</executions>
30+
<dependencies>
31+
<dependency>
32+
<groupId>com.puppycrawl.tools</groupId>
33+
<artifactId>checkstyle</artifactId>
34+
<version>8.8</version>
35+
</dependency>
36+
</dependencies>
37+
<configuration>
38+
<configLocation>${basedir}/../pmd-checkstyle-config.xml</configLocation>
39+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
40+
<sourceDirectories>
41+
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
42+
</sourceDirectories>
43+
</configuration>
44+
</plugin>
45+
</plugins>
46+
</build>
1547
</project>

‎net.sourceforge.pmd.eclipse.plugin.test.fragment/src/main/java/test/RuleSetsExtension.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838

3939
import java.util.Set;
4040

41+
import org.eclipse.core.runtime.IStatus;
42+
4143
import net.sourceforge.pmd.RuleSet;
4244
import net.sourceforge.pmd.RuleSetFactory;
4345
import net.sourceforge.pmd.RuleSetNotFoundException;
4446
import net.sourceforge.pmd.eclipse.core.IRuleSetsExtension;
4547
import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
4648

47-
import org.eclipse.core.runtime.IStatus;
48-
4949
/**
5050
* Sample of an RuleSets extension.
5151
* This will automatically registers our fragment rulesets into the core plugin.

‎net.sourceforge.pmd.eclipse.plugin.test.fragment/src/main/resources/rulesets/extra1.xml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The Basic Ruleset contains a collection of good practices which everyone should
4141
</rule>
4242

4343
<rule name="EmptyIfStmt"
44-
language="java"
44+
language="java"
4545
message="Avoid empty 'if' statements"
4646
class="net.sourceforge.pmd.lang.rule.XPathRule">
4747
<description>
@@ -118,7 +118,7 @@ Avoid empty try blocks, they serve no purpose.
118118
</rule>
119119

120120
<rule name="EmptyFinallyBlock"
121-
language="java"
121+
language="java"
122122
message="Avoid empty finally blocks"
123123
class="net.sourceforge.pmd.lang.rule.XPathRule">
124124
<description>
@@ -148,7 +148,7 @@ Avoid empty finally blocks, these can be deleted.
148148

149149

150150
<rule name="EmptySwitchStatements"
151-
language="java"
151+
language="java"
152152
message="Avoid empty switch statements"
153153
class="net.sourceforge.pmd.lang.rule.XPathRule">
154154
<description>
@@ -178,7 +178,7 @@ Avoid empty switch statements.
178178

179179

180180
<rule name="JumbledIncrementer"
181-
language="java"
181+
language="java"
182182
message="Avoid modifying an outer loop incrementer in an inner loop for update expression"
183183
class="net.sourceforge.pmd.lang.rule.XPathRule">
184184
<description>
@@ -213,7 +213,7 @@ Avoid jumbled loop incrementers as these are usually a mistake and can make code
213213

214214

215215
<rule name="ForLoopShouldBeWhileLoop"
216-
language="java"
216+
language="java"
217217
message="This for loop could be simplified to a while loop"
218218
class="net.sourceforge.pmd.lang.rule.XPathRule">
219219
<description>
@@ -261,7 +261,7 @@ Avoid unnecessary temporaries when converting primitives to Strings
261261
</rule>
262262

263263
<rule name="OverrideBothEqualsAndHashcode"
264-
language="java"
264+
language="java"
265265
message="Ensure you override both equals() and hashCode()"
266266
class="net.sourceforge.pmd.lang.rule.XPathRule">
267267
<description>
@@ -343,7 +343,7 @@ For more details see http://www.javaworld.com/javaworld/jw-02-2001/jw-0209-doubl
343343
</rule>
344344

345345
<rule name="ReturnFromFinallyBlock"
346-
language="java"
346+
language="java"
347347
message="Avoid returning from a finally block"
348348
class="net.sourceforge.pmd.lang.rule.XPathRule">
349349
<description>
@@ -376,7 +376,7 @@ For more details see http://www.javaworld.com/javaworld/jw-02-2001/jw-0209-doubl
376376
</rule>
377377

378378
<rule name="EmptySynchronizedBlock"
379-
language="java"
379+
language="java"
380380
message="Avoid empty synchronized blocks"
381381
class="net.sourceforge.pmd.lang.rule.XPathRule">
382382
<description>
@@ -400,7 +400,7 @@ Avoid empty synchronized blocks as they do nothing.
400400
</rule>
401401

402402
<rule name="UnnecessaryReturn"
403-
language="java"
403+
language="java"
404404
message="Avoid unnecessary return statements"
405405
class="net.sourceforge.pmd.lang.rule.XPathRule">
406406
<description>
@@ -433,7 +433,7 @@ Avoid unnecessary return statements.
433433

434434

435435
<rule name="EmptyStaticInitializer"
436-
language="java"
436+
language="java"
437437
message="Empty static initializer was found"
438438
class="net.sourceforge.pmd.lang.rule.XPathRule">
439439
<description>
@@ -583,9 +583,8 @@ public final class Foo {
583583
584584
// This final modifier is not necessary, since the class is final
585585
// and thus, all methods are final
586-
private final void foo() {
587-
}
588-
586+
private final void foo() {
587+
}
589588
}
590589
591590
]]>

‎net.sourceforge.pmd.eclipse.plugin.test/pom.xml‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<plugin>
2525
<groupId>org.eclipse.tycho</groupId>
2626
<artifactId>target-platform-configuration</artifactId>
27-
<version>${tycho.version}</version>
2827
<configuration>
2928
<dependency-resolution>
3029
<extraRequirements>
@@ -37,6 +36,34 @@
3736
</dependency-resolution>
3837
</configuration>
3938
</plugin>
39+
<plugin>
40+
<groupId>org.apache.maven.plugins</groupId>
41+
<artifactId>maven-checkstyle-plugin</artifactId>
42+
<version>3.0.0</version>
43+
<executions>
44+
<execution>
45+
<id>checkstyle-check</id>
46+
<phase>verify</phase>
47+
<goals>
48+
<goal>check</goal>
49+
</goals>
50+
</execution>
51+
</executions>
52+
<dependencies>
53+
<dependency>
54+
<groupId>com.puppycrawl.tools</groupId>
55+
<artifactId>checkstyle</artifactId>
56+
<version>8.8</version>
57+
</dependency>
58+
</dependencies>
59+
<configuration>
60+
<configLocation>${basedir}/../pmd-checkstyle-config.xml</configLocation>
61+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
62+
<sourceDirectories>
63+
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
64+
</sourceDirectories>
65+
</configuration>
66+
</plugin>
4067
</plugins>
4168
</build>
4269

0 commit comments

Comments
 (0)