8000 Update checkstyle · srbala/github-plugin@1614fe3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1614fe3

Browse files
timjatimja
committed
Update checkstyle
1 parent 20fbc09 commit 1614fe3

File tree

6 files changed

+25
-20
lines changed

6 files changed

+25
-20
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
328328

329329
<plugin>
330330
<artifactId>maven-checkstyle-plugin</artifactId>
331-
<version>2.16</version>
331+
<version>3.1.1</version>
332332
<executions>
333333
<execution>
334334
<id>checkstyle</id>

‎src/main/java/org/jenkinsci/plugins/github/internal/GitHubClientCacheOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ protected String applyNullSafe(@Nonnull Cache cache) {
182182
private static class NotInCachesFilter implements DirectoryStream.Filter<Path> {
183183
private final Set<String> activeCacheNames;
184184

185-
public NotInCachesFilter(Set<String> activeCacheNames) {
185+
NotInCachesFilter(Set<String> activeCacheNames) {
186186
this.activeCacheNames = activeCacheNames;
187187
}
188188

‎src/main/resources/org/jenkinsci/plugins/github/Messages.properties

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
global.config.url.is.empty=The Jenkins URL is empty. Explicitly set the Jenkins URL in the global configuration or in the GitHub plugin configuration to manage webhooks.
2-
global.config.hook.url.is.malformed=There is a malformed GitHub webhook URL in the global configuration ({0}). Please ensure that the Jenkins URL is valid and ends with a forward slash or use the webhook URL override.
1+
global.config.url.is.empty=The Jenkins URL is empty. Explicitly set the Jenkins URL in the global configuration \
2+
or in the GitHub plugin configuration to manage webhooks.
3+
global.config.hook.url.is.malformed=There is a malformed GitHub webhook URL in the global configuration ({0}). \
4+
Please ensure that the Jenkins URL is valid and ends with a forward slash or use the webhook URL override.
35
common.expandable.message.title=Expandable message
46
hooks.problem.administrative.monitor.displayname=GitHub Hooks Problems
5-
hooks.problem.administrative.monitor.description=Some of the webhooks failed to be registered or were removed. You can view a detailed list of them at this page. Also you can manage the list of ignored repos.
6-
github.trigger.check.method.warning.details=The webhook for repo {0}/{1} on {2} failed to be registered or was removed. More info can be found on the global configuration page. This message will be dismissed if Jenkins receives a PING event from repo webhook or if you add the repo to the ignore list in the global configuration.
7+
hooks.problem.administrative.monitor.description=Some of the webhooks failed to be registered or were removed. \
8+
You can view a detailed list of them at this page. Also you can manage the list of ignored repos.
9+
github.trigger.check.method.warning.details=The webhook for repo {0}/{1} on {2} failed to be registered \
10+
or was removed. \
11+
More info can be found on the global configuration page. This message will be dismissed if Jenkins receives \
12+
a PING event from repo webhook or if you add the repo to the ignore list in the global configuration.
713
unknown.error=Unknown error

‎src/main/resources/org/jenkinsci/plugins/github/admin/GitHubHookRegisterProblemMonitor/index.properties

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ ignored.projects=Ignored Projects
55
project.header=Project
66
message.header=Message
77
help.for.problems=This table shows any problems with registering/removing repo webhooks. \
8-
A message will be dismissed if Jenkins receives a PING event from the corresponding repo webhook, or if you add the repo to the ignore list. These messages will not be saved to disk, \
8+
A message will be dismissed if Jenkins receives a PING event from the corresponding repo webhook, \
9+
or if you add the repo to the ignore list. These messages will not be saved to disk, \
910
so they will all be cleared when Jenkins restarts.
10-
help.for.ignored=This table lists any ignored projects. Any problem with the repos in this list will be declined by administrative monitor. \
11+
help.for.ignored=This table lists any ignored projects. Any problem with the repos in this list will be declined by \
12+
administrative monitor. \
1113
You can remove a repo from this list. This list will be saved on each change and reloaded when Jenkins restarts.
1214
help.for.page.and.debug.shows=This page shows problems with webhooks, and ignored projects.
1315
help.for.page.and.debug.system.pre=A detailed stacktrace for any of the problems can be found in the

‎src/main/resources/org/jenkinsci/plugins/github/admin/GitHubHookRegisterProblemMonitor/message.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
view=View
22
dismiss=Dismiss
3-
hook.registering.problem=There were some problems while registering or removing one or more GitHub webhooks. Would you like to view the problems?
3+
hook.registering.problem=There were some problems while registering or removing one or more GitHub webhooks. \
4+
Would you like to view the problems?

‎src/test/resources/checkstyle/checkstyle-config.xml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE module PUBLIC
33
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
4-
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
4+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
55

66
<!--
77
@@ -32,6 +32,7 @@
3232

3333

3434
<module name="Checker">
35+
<property name="cacheFile" value="${checkstyle.cache.file}"/>
3536
<!--
3637
If you set the basedir property below, then all reported file
3738
names will be relative to the specified directory. See
@@ -46,7 +47,11 @@
4647
<property name="lineSeparator" value="lf"/>
4748
</module>
4849

49-
50+
<!-- Checks for Size Violations. -->
51+
<!-- See https://checkstyle.org/config_sizes.html -->
52+
<module name="LineLength">
53+
<property name="max" value="120"/>
54+
</module>
5055

5156
<!-- Checks that property files contain the same keys. -->
5257
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
@@ -69,8 +74,6 @@
6974

7075
<module name="TreeWalker">
7176

72-
<property name="cacheFile" value="${checkstyle.cache.file}"/>
73-
7477
<!-- required for SuppressWarningsFilter (and other Suppress* rules not use B41A d here) -->
7578
<!-- see http://checkstyle.sourceforge.net/config_annotation.html#SuppressWarningsHolder -->
7679
<module name="SuppressWarningsHolder"/>
@@ -123,9 +126,6 @@
123126

124127
<!-- Checks for Size Violations. -->
125128
<!-- See http://checkstyle.sf.net/config_sizes.html -->
126-
<module name="LineLength">
127-
<property name="max" value="120"/>
128-
</module>
129129
<module name="MethodLength"/>
130130
<module name="ParameterNumber"/>
131131

@@ -185,10 +185,6 @@
185185
<!-- Miscellaneous other checks. -->
186186
<!-- See http://checkstyle.sf.net/config_misc.html -->
187187
<module name="ArrayTypeStyle"/>
188-
<module name="TodoComment">
189-
<property name="format" value="(TODO)|(FIXME)"/>
190-
<property name="severity" value="info"/>
191-
</module>
192188
<!--<module name="FinalParameters"/>-->
193189
<module name="UpperEll"/>
194190

0 commit comments

Comments
 (0)
0