Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update versions of quality tools #987

Merged
merged 1 commit into from
Mar 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ javaPoetVersion=1.12.1

# Gradle Plugins
bintrayPluginVersion=1.8.4
spotbugsPluginVersion=4.0.2
spotbugsPluginVersion=4.0.4
shadowPluginVersion=4.0.4
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ final class SimpleCompletableSubscriber extends SequentialCancellable implements
}

SimpleCompletableSubscriber(final Runnable onComplete) {
super();
this.onComplete = requireNonNull(onComplete);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ final class ServiceTalkLibraryPlugin extends ServiceTalkCorePlugin {

pmd {
toolVersion = PMD_VERSION
incrementalAnalysis = true
ruleSets = []
ruleSetConfig = resources.text.fromString(getClass().getResourceAsStream("pmd/basic.xml").text)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import org.gradle.api.JavaVersion
import static org.gradle.api.JavaVersion.VERSION_1_8

final class Versions {
static final String CHECKSTYLE_VERSION = "8.28"
static final String PMD_VERSION = "6.20.0"
static final String SPOTBUGS_VERSION = "4.0.0"
static final String CHECKSTYLE_VERSION = "8.30"
static final String PMD_VERSION = "6.22.0"
static final String SPOTBUGS_VERSION = "4.0.1"
static final JavaVersion TARGET_VERSION = VERSION_1_8
}
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@

<!-- Coding -->
<module name="ArrayTrailingComma"/>
<module name="AvoidDoubleBraceInitialization"/>
<module name="AvoidNoArgumentSuperConstructorCall"/>
<module name="CovariantEquals"/>
<module name="DeclarationOrder">
<property name="ignoreModifiers" value="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ public RoleProtectedBasicAuthSecurityContextFilterTest(final boolean withUserInf

@Override
protected Application application(@Nullable final Key<BasicUserInfo> userInfoKey) {
return new ResourceConfig(RoleProtectedResource.class) {
{
register(RolesAllowedDynamicFeature.class);
registerInstances(userInfoKey != null ?
return new ResourceConfig(RoleProtectedResource.class)
.register(RolesAllowedDynamicFeature.class)
.registerInstances(userInfoKey != null ?
BasicAuthSecurityContextFilters.forGlobalBinding(userInfoKey)
.securityContextFunction((__, userInfo) ->
new BasicAuthSecurityContext(new BasicAuthPrincipal<>(userInfo), false,
Expand All @@ -47,8 +46,6 @@ protected Application application(@Nullable final Key<BasicUserInfo> userInfoKey
.securityContextFunction(__ ->
new BasicAuthSecurityContext(() -> "N/A", false, "USER"::equals))
.build());
}
};
}

@Test
Expand Down