Skip to content

Commit

Permalink
Remove violations plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Jul 24, 2023
1 parent 0dcc6a1 commit cf2ceea
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ENV GIT_HEAD=${GIT_HEAD}
# Exclude the tasks that will run out of the docker build (in a docker run)
RUN --mount=type=cache,target=/home/gradle/.gradle \
gradle --parallel --exclude-task=:core:test \
--exclude-task=:core:spotbugsMain --exclude-task=:core:checkstyleMain --exclude-task=:core:violations \
--exclude-task=:core:spotbugsMain --exclude-task=:core:checkstyleMain \
--exclude-task=:core:spotbugsTest --exclude-task=:core:checkstyleTest --exclude-task=:core:testCLI \
:core:build :core:explodedWar :publish:build :examples:build :docs:buildDocs

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ checks: build-builder
--volume=$(PWD)/core/src/:/src/core/src/:ro \
--volume=$(PWD)/reports/:/src/core/build/reports/ \
mapfish_print_builder \
gradle --parallel :core:spotbugsMain :core:checkstyleMain :core:violations
gradle --parallel :core:spotbugsMain :core:checkstyleMain

.PHONY: tests
tests: build-builder
Expand All @@ -35,7 +35,7 @@ tests: build-builder
--volume=$(PWD)/core/build/scripts/:/src/core/build/scripts/ \
--volume=$(PWD)/core/src/test/:/src/core/src/test/:ro \
mapfish_print_builder \
gradle --parallel --exclude-task=:core:spotbugsMain --exclude-task=:core:checkstyleMain --exclude-task=:core:violations \
gradle --parallel --exclude-task=:core:spotbugsMain --exclude-task=:core:checkstyleMain \
--exclude-task=:core:spotbugsTest --exclude-task=:core:checkstyleTest \
:core:test :core:testCli

Expand All @@ -57,7 +57,7 @@ acceptance-tests-up: build .env
.PHONY: acceptance-tests-run
acceptance-tests-run: .env
docker-compose exec -T tests gradle \
--exclude-task=:core:spotbugsMain --exclude-task=:core:checkstyleMain --exclude-task=:core:violations \
--exclude-task=:core:spotbugsMain --exclude-task=:core:checkstyleMain \
--exclude-task=:core:spotbugsTest --exclude-task=:core:checkstyleTest --exclude-task=:core:testCLI \
:examples:integrationTest
ci/check-fonts
Expand Down
20 changes: 0 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import se.bjurr.violations.gradle.plugin.ViolationsTask

buildscript {
repositories {
mavenCentral()
Expand All @@ -8,7 +6,6 @@ buildscript {

dependencies {
classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.5"
classpath "se.bjurr.violations:violations-gradle-plugin:1.52.6"
}
}

Expand Down Expand Up @@ -37,39 +34,22 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
apply plugin: 'idea'
apply plugin: 'project-report'
apply plugin: 'checkstyle'
apply plugin: 'se.bjurr.violations.violations-gradle-plugin'

jar.dependsOn(checkstyleMain)

checkstyle {
toolVersion = "6.19" // com.puppycrawl.tools:checkstyle
configFile = file("$rootProject.rootDir/checkstyle_checks.xml")
configProperties = ['basedir': project.rootDir.path]
ignoreFailures = true
reportsDir = file("$project.buildDir/reports/checkstyleReports")
}
checkstyleTest.enabled = false

spotbugs {
toolVersion = "4.4.2" // com.github.spotbugs:spotbugs-annotations
ignoreFailures = true
reportsDir = file("$project.buildDir/reports/spotbugsReports")
effort = "max"
reportLevel = "high"
}
spotbugsTest.enabled = true

tasks.register('violations', ViolationsTask) {
minSeverity = 'INFO'
detailLevel = 'VERBOSE' // PER_FILE_COMPACT, COMPACT or VERBOSE
maxViolations = 1064
printViolations = true
violations = [
["FINDBUGS", ".", ".*/reports/spotbugsReports/.*\\.xml", "Spotbugs"],
["CHECKSTYLE", ".", ".*/reports/checkstyleReports/.*\\.xml", "Checkstyle"]
]
}
check.finalizedBy violations

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
Expand Down

0 comments on commit cf2ceea

Please sign in to comment.