Merge pull request #7 from B3Partners/dependabot/maven/commons-codec-…

…commons-codec-1.13 Bump commons-codec from 1.12 to 1.13
B3Partners · Aug 1, 2019 · 9be4406 · 9be4406
2 parents e03feed + d6ed48d
commit 9be4406
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,4 @@
-/target/
+/target/
+nbactions.xml
+.idea/
+milton-b3p.iml
diff --git a/.mvn/owasp-suppression.xml b/.mvn/owasp-suppression.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+</suppressions>
diff --git 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
diff --git a/pom.xml b/pom.xml
@@ -5,11 +5,11 @@
     <artifactId>milton-b3p</artifactId>
     <version>4.2.3-SNAPSHOT</version>
     <packaging>jar</packaging>
-    
+
     <properties>
         <project.build.sourceEncoding>windows-1252</project.build.sourceEncoding>
     </properties>
-    
+
     <dependencies>
        <dependency>
             <groupId>commons-logging</groupId>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.12</version>
+            <version>1.13</version>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
@@ -58,11 +58,25 @@
             <url>https://repo.b3p.nl/nexus/repository/snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
-    <build>        
-        <plugins>            
-            <plugin>                
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <version>5.2.0</version>
+                    <configuration>
+                        <skipSystemScope>true</skipSystemScope>
+                        <format>ALL</format>
+                        <suppressionFile>${project.basedir}/.mvn/owasp-suppression.xml</suppressionFile>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>                
+                <version>2.5.3</version>
             </plugin>
         </plugins>
     </build>