From 016644d507e6f2d51665b94d290c911f8fec8e08 Mon Sep 17 00:00:00 2001
From: dahn <daan.hoogland@shapeblue.com>
Date: Mon, 9 Mar 2020 17:06:19 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"CLOUDSTACK-10271=20maven=20plugin=20f?=
 =?UTF-8?q?or=20owasp=20dependency=20chec=E2=80=A6=20(#3953)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2d63ed5c243bd0732077c0e5485021b2be274aa7. (PR #2446)
fails when network causes CVE DB not being able to be downloaded
---
 pom.xml | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/pom.xml b/pom.xml
index e1d9de6ece7..3006dd7b61b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,13 +67,11 @@
         <cs.jar-plugin.version>3.2.0</cs.jar-plugin.version>
         <cs.pmd-plugin.version>3.12.0</cs.pmd-plugin.version>
         <cs.project-info-plugin.version>3.0.0</cs.project-info-plugin.version>
-        <cs.owasp.dependency-checker-plugin.version>3.1.1</cs.owasp.dependency-checker-plugin.version>
         <cs.release-plugin.version>2.5.3</cs.release-plugin.version>
         <cs.resources-plugin.version>3.1.0</cs.resources-plugin.version>
         <cs.site-plugin.version>3.8.2</cs.site-plugin.version>
         <cs.surefire-plugin.version>2.22.2</cs.surefire-plugin.version>
 
-
         <!-- Logging versions -->
         <cs.log4j.version>1.2.17</cs.log4j.version>
         <cs.log4j.extras.version>1.2.17</cs.log4j.extras.version>
@@ -156,7 +154,6 @@
         <cs.neethi.version>2.0.4</cs.neethi.version>
         <cs.nitro.version>10.1</cs.nitro.version>
         <cs.opensaml.version>2.6.4</cs.opensaml.version>
-        <cs.owasp.esapi.version>2.1.0.1</cs.owasp.esapi.version>
         <cs.rados-java.version>0.5.0</cs.rados-java.version>
         <cs.reflections.version>0.9.12</cs.reflections.version>
         <cs.servicemix.version>3.3.3_1</cs.servicemix.version>
@@ -587,7 +584,7 @@
             <dependency>
                 <groupId>org.owasp.esapi</groupId>
                 <artifactId>esapi</artifactId>
-                <version>${cs.owasp.esapi.version}</version>
+                <version>2.1.0.1</version>
             </dependency>
             <!-- Test dependency in mysql for db tests -->
             <dependency>
@@ -734,22 +731,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.owasp</groupId>
-                <artifactId>dependency-check-maven</artifactId>
-                <version>${cs.owasp.dependency-checker-plugin.version}</version>
-                <configuration>
-                    <skipProvidedScope>true</skipProvidedScope>
-                    <skipRuntimeScope>true</skipRuntimeScope>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -1155,18 +1136,6 @@
     </build>
     <reporting>
         <plugins>
-            <plugin>
-                <groupId>org.owasp</groupId>
-                <artifactId>dependency-check-maven</artifactId>
-                <version>${cs.owasp.dependency-checker-plugin.version}</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>aggregate</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>