diff --git a/Jenkinsfile b/Jenkinsfile index 15abeeabc..5ab6cb075 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { } post { always { - archiveArtifacts artifacts: 'build/reports/checkstyle/*.xml', fingerprint: true + archiveArtifacts artifacts: 'build/reports/checkstyleNohttp/*.html', fingerprint: true } } } diff --git a/build.gradle b/build.gradle index 57ca80323..308067964 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,6 @@ apply plugin: 'checkstyle' apply plugin: 'io.spring.javaformat' apply plugin: 'pl.allegro.tech.build.axion-release' apply plugin: 'maven-publish' -apply plugin: 'checkstyle' gradle.startParameter.excludedTaskNames += [ "checkFormatAot", "checkFormatAotTest" ] @@ -84,7 +83,7 @@ checkstyle { checkstyleNohttp { configDirectory = project.file('src/checkstyle') configFile = file('src/checkstyle/nohttp-checkstyle.xml') - enabled = false + enabled = true } tasks.named("formatMain").configure { dependsOn("checkstyleMain") } diff --git a/config/checksyle/rulex.xml b/config/checksyle/rulex.xml deleted file mode 100644 index b8a8f11e3..000000000 --- a/config/checksyle/rulex.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/new_important_feature.txt b/new_important_feature.txt deleted file mode 100644 index bd86ffeb4..000000000 --- a/new_important_feature.txt +++ /dev/null @@ -1,3 +0,0 @@ -Hello World! -More text -Final test, let's goooo! \ No newline at end of file diff --git a/pom.xml b/pom.xml index d092c7442..284037f7c 100644 --- a/pom.xml +++ b/pom.xml @@ -146,17 +146,6 @@ @{project.version} - - github @@ -168,26 +157,6 @@ - - org.apache.maven.plugins maven-release-plugin @@ -226,41 +195,6 @@ - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle.version} - - - com.puppycrawl.tools - checkstyle - ${checkstyle.version} - - - io.spring.nohttp - nohttp-checkstyle - ${nohttp-checkstyle.version} - - - - - nohttp-checkstyle-validation - validate - - src/checkstyle/nohttp-checkstyle.xml - ${basedir} - **/* - **/.git/**/*,**/.idea/**/*,**/target/**/,**/.flattened-pom.xml,**/*.class - - config_loc=${basedir}/src/checkstyle/ - - - - check - - - - org.graalvm.buildtools native-maven-plugin @@ -320,6 +254,19 @@ + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + + /config/checkstyle/rules.xml + + + + + Apache License, Version 2.0 @@ -328,10 +275,6 @@ - - maven-group - http://localhost:8081/repository/my-maven-group/ - spring-snapshots Spring Snapshots