Skip to content

Commit 5cb81d8

Browse files
committed
chore: junit 6
1 parent a37ae6a commit 5cb81d8

70 files changed

Lines changed: 88 additions & 70 deletions

Some content is hidden

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

build.gradle

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ allprojects {
4949
java.srcDir(targetDir)
5050
}
5151
}
52+
53+
// Ensure jar is built (needed for project dependencies)
54+
tasks.named("jar") {
55+
enabled = true
56+
}
5257
}
5358
}
5459

@@ -59,11 +64,20 @@ project(":violations-lib") {
5964
implementation "com.google.code.gson:gson:2.13.2"
6065
implementation "org.owasp.encoder:encoder:1.3.1"
6166

62-
testImplementation 'junit:junit:4.13.2'
67+
testImplementation 'org.junit.jupiter:junit-jupiter:5.14.1'
68+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.14.1'
69+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.14.1'
70+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
71+
6372
testImplementation "org.assertj:assertj-core:3.27.6"
6473
testImplementation "uk.co.jemos.podam:podam:8.0.2.RELEASE"
6574
testImplementation "com.approvaltests:approvaltests:25.7.0"
66-
testImplementation "com.networknt:json-schema-validator:2.0.0"
75+
testImplementation "com.networknt:json-schema-validator:1.5.9"
76+
}
77+
78+
79+
test {
80+
useJUnitPlatform()
6781
}
6882

6983
shadowExtension {

settings.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,9 @@ pluginManagement {
66
}
77
}
88

9+
plugins {
10+
id "se.bjurr.gradle.include-virtual" version "1.0.0"
11+
}
12+
913
rootProject.name = "violations-lib-base"
10-
include "violations-lib-sarif", "violations-lib-coverty", "violations-lib"
14+
includeVirtual "violations-lib-sarif", "violations-lib-coverty", "violations-lib"

violations-lib-coverty/.gitkeep

Whitespace-only changes.

violations-lib-sarif/.gitkeep

Whitespace-only changes.

violations-lib/src/test/java/se/bjurr/violations/lib/AndroidLintTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import static se.bjurr.violations.lib.reports.Parser.ANDROIDLINT;
99

1010
import java.util.Set;
11-
import org.junit.Test;
11+
import org.junit.jupiter.api.Test;
1212
import se.bjurr.violations.lib.model.Violation;
1313
import se.bjurr.violations.lib.util.ViolationAsserter;
1414

violations-lib/src/test/java/se/bjurr/violations/lib/AnsibleLaterParserTest.java

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

88
import java.util.ArrayList;
99
import java.util.Set;
10-
import org.junit.Test;
10+
import org.junit.jupiter.api.Test;
1111
import se.bjurr.violations.lib.model.SEVERITY;
1212
import se.bjurr.violations.lib.model.Violation;
1313

violations-lib/src/test/java/se/bjurr/violations/lib/ArmGccTest.java

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

99
import java.util.ArrayList;
1010
import java.util.Set;
11-
import org.junit.Test;
11+
import org.junit.jupiter.api.Test;
1212
import se.bjurr.violations.lib.model.Violation;
1313

1414
public class ArmGccTest {

violations-lib/src/test/java/se/bjurr/violations/lib/BanditTest.java

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

99
import java.util.ArrayList;
1010
import java.util.Set;
11-
import org.junit.Test;
11+
import org.junit.jupiter.api.Test;
1212
import se.bjurr.violations.lib.model.SEVERITY;
1313
import se.bjurr.violations.lib.model.Violation;
1414

violations-lib/src/test/java/se/bjurr/violations/lib/CLangTest.java

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

1111
import java.util.ArrayList;
1212
import java.util.Set;
13-
import org.junit.Test;
13+
import org.junit.jupiter.api.Test;
1414
import se.bjurr.violations.lib.model.Violation;
1515

1616
public class CLangTest {

violations-lib/src/test/java/se/bjurr/violations/lib/CPDTest.java

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

1010
import java.util.ArrayList;
1111
import java.util.Set;
12-
import org.junit.Test;
12+
import org.junit.jupiter.api.Test;
1313
import se.bjurr.violations.lib.model.Violation;
1414

1515
public class CPDTest {

0 commit comments

Comments
 (0)