Skip to content

Commit 5e08b07

Browse files
committed
update dependencies, fix tests
1 parent 0f8cd6c commit 5e08b07

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

code-assert-gui/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>org.springframework.boot</groupId>
1717
<artifactId>spring-boot-dependencies</artifactId>
18-
<version>2.0.0.RELEASE</version>
18+
<version>2.0.4.RELEASE</version>
1919
<type>pom</type>
2020
<scope>import</scope>
2121
</dependency>

code-assert-gui/src/main/java/guru/nidi/codeassert/gui/Application.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
import org.springframework.boot.SpringApplication;
2323
import org.springframework.boot.autoconfigure.SpringBootApplication;
2424
import org.springframework.context.annotation.Bean;
25-
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
2625

2726
@SpringBootApplication
28-
public class Application extends WebMvcConfigurerAdapter {
27+
public class Application {
2928
public static void main(String[] args) {
3029
SpringApplication.run(Application.class, args);
3130
}

code-assert-gui/src/main/resources/public/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ function packOf(name) {
2626
// d3.json('/model?jarfile=/Users/nidi/.m2/repository/guru/nidi/code-assert/0.8.2/code-assert-0.8.2.jar', (error, model) => {
2727
// d3.json('/model?jarfile=/Users/nidi/.m2/repository/guru/nidi/raml/raml-tester/0.8.11/raml-tester-0.8.11.jar', (error, model) => {
2828
// d3.json('/model?jarfile=/Users/nidi/.m2/repository/guru/nidi/graphviz-java/0.2.2/graphviz-java-0.2.2.jar', (error, model) => {
29-
// d3.json('/model?jarfile=/Users/nidi/.m2/repository/org/springframework/spring-core/3.1.3.RELEASE/spring-core-3.1.3.RELEASE.jar', (error, model) => {
30-
d3.json('/model?jarfile=/Users/nidi/.m2/repository/org/springframework/spring-expression/4.3.10.RELEASE/spring-expression-4.3.10.RELEASE.jar', (error, model) => {
29+
d3.json('/model?jarfile=/Users/nidi/.m2/repository/org/springframework/spring-core/5.0.8.RELEASE/spring-core-5.0.8.RELEASE.jar', (error, model) => {
30+
// d3.json('/model?jarfile=/Users/nidi/.m2/repository/org/springframework/spring-expression/4.3.10.RELEASE/spring-expression-4.3.10.RELEASE.jar', (error, model) => {
3131
if (error) throw error;
3232

3333
let packages = {};

code-assert-gui/src/test/java/guru/nidi/codeassert/gui/CodeTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
import guru.nidi.codeassert.checkstyle.*;
1919
import guru.nidi.codeassert.config.AnalyzerConfig;
20+
import guru.nidi.codeassert.config.In;
2021
import guru.nidi.codeassert.dependency.*;
21-
import guru.nidi.codeassert.findbugs.FindBugsResult;
22+
import guru.nidi.codeassert.findbugs.*;
2223
import guru.nidi.codeassert.junit.CodeAssertJunit5Test;
2324
import guru.nidi.codeassert.junit.PredefConfig;
2425
import guru.nidi.codeassert.pmd.*;
25-
import net.sourceforge.pmd.RulePriority;
2626
import org.junit.jupiter.api.Test;
2727

2828
import static guru.nidi.codeassert.dependency.DependencyRules.denyAll;
@@ -53,18 +53,18 @@ public void defineRules() {
5353

5454
@Override
5555
protected FindBugsResult analyzeFindBugs() {
56-
return null; //TODO JVM crashes, WTF!?
57-
// final BugCollector bugCollector = new BugCollector()
58-
// .apply(PredefConfig.minimalFindBugsIgnore())
56+
// return null; //TODO JVM crashes, WTF!?
57+
final BugCollector bugCollector = new BugCollector()
58+
.apply(PredefConfig.minimalFindBugsIgnore())
5959
// TODO fix
60-
// .just(In.clazz(AppController.class).ignore("PATH_TRAVERSAL_IN"))
61-
// .just(In.everywhere().ignore("SE_NO_SERIALVERSIONID", "SPRING_ENDPOINT"));
62-
// return new FindBugsAnalyzer(AnalyzerConfig.maven().main(), bugCollector).analyze();
60+
.just(In.clazz(AppController.class).ignore("PATH_TRAVERSAL_IN"))
61+
.just(In.everywhere().ignore("SE_NO_SERIALVERSIONID", "SPRING_ENDPOINT"));
62+
return new FindBugsAnalyzer(AnalyzerConfig.maven().main(), bugCollector).analyze();
6363
}
6464

6565
@Override
6666
protected PmdResult analyzePmd() {
67-
final PmdViolationCollector collector = new PmdViolationCollector().minPriority(RulePriority.MEDIUM)
67+
final PmdViolationCollector collector = new PmdViolationCollector()//.minPriority(RulePriority.MEDIUM)
6868
.apply(PredefConfig.minimalPmdIgnore());
6969
return new PmdAnalyzer(AnalyzerConfig.maven().main(), collector)
7070
.withRulesets(PredefConfig.defaultPmdRulesets())

code-assert/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<findbugs.version>3.1.6</findbugs.version>
1919
<findsecbugs.version>1.8.0</findsecbugs.version>
2020
<pmd.version>5.8.1</pmd.version>
21-
<kotlin.version>1.2.30</kotlin.version>
21+
<kotlin.version>1.2.51</kotlin.version>
2222
<detekt.version>1.0.0.RC8</detekt.version>
2323
<ktlint.version>0.27.0</ktlint.version>
2424
</properties>

0 commit comments

Comments
 (0)