diff --git a/.gitignore b/.gitignore index a6f89c2..e6399d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -/target/ \ No newline at end of file +/target/ +nbactions.xml +.idea/ +milton-b3p.iml diff --git a/.mvn/owasp-suppression.xml b/.mvn/owasp-suppression.xml new file mode 100644 index 0000000..fbf9371 --- /dev/null +++ b/.mvn/owasp-suppression.xml @@ -0,0 +1,3 @@ + + + diff --git a/Jenkinsfile b/Jenkinsfile index cb60d6b..b3dae8e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ timestamps { ]]); node { - withEnv(["JAVA_HOME=${ tool 'JDK8' }", "PATH+MAVEN=${tool 'Maven 3.5.4'}/bin:${env.JAVA_HOME}/bin"]) { + withEnv(["JAVA_HOME=${ tool 'JDK8' }", "PATH+MAVEN=${tool 'Maven CURRENT'}/bin:${env.JAVA_HOME}/bin"]) { stage('Prepare') { sh "ulimit -a" @@ -29,9 +29,8 @@ timestamps { stage('OWASP Dependency Check') { echo "Uitvoeren OWASP dependency check" - dependencyCheckAnalyzer datadir: '', hintsFile: '', includeCsvReports: false, includeHtmlReports: true, includeJsonReports: false, isAutoupdateDisabled: false, outdir: '', scanpath: '**/*.jar', skipOnScmChange: false, skipOnUpstreamChange: false, suppressionFile: '', zipExtensions: '' - - dependencyCheckPublisher canComputeNew: false, defaultEncoding: '', healthy: '85', pattern: '**/dependency-check-report.xml', shouldDetectModules: true, unHealthy: '' + sh "mvn org.owasp:dependency-check-maven:check" + dependencyCheckPublisher failedNewCritical: 1, unstableNewHigh: 1, unstableNewLow: 1, unstableNewMedium: 1 } } } diff --git a/nbactions.xml b/nbactions.xml deleted file mode 100644 index a9b81c7..0000000 --- a/nbactions.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - build - - * - - - install - - - true - - - diff --git a/pom.xml b/pom.xml index 7a1118f..ade8638 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ milton-b3p 4.2.3-SNAPSHOT jar - + windows-1252 - + commons-logging @@ -19,7 +19,7 @@ commons-codec commons-codec - 1.12 + 1.13 commons-fileupload @@ -58,11 +58,25 @@ https://repo.b3p.nl/nexus/repository/snapshots/ - - - + + + + + org.owasp + dependency-check-maven + 5.2.0 + + true + ALL + ${project.basedir}/.mvn/owasp-suppression.xml + + + + + + maven-release-plugin - 2.5.3 + 2.5.3