From 66c3985725a910b95802fff91c014e16cb44fe66 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Fri, 16 Aug 2013 11:17:44 -0400
Subject: [PATCH] updated dependencies that are only scanned during tests to be
 provided/optional and copied them to test-classes

Former-commit-id: d75d018ea41fa6f4d43b7549b84e50da6831da1d
---
 dependency-check-core/pom.xml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml
index 2718cfa88..17434e1ff 100644
--- a/dependency-check-core/pom.xml
+++ b/dependency-check-core/pom.xml
@@ -83,16 +83,16 @@ along with Dependency-Check.  If not, see <http://www.gnu.org/licenses />.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.7</version>
+                <version>2.8</version>
                 <executions>
                     <execution>
-                        <phase>package</phase>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                            <excludeScope>provided</excludeScope>
+                            <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                            <includeScope>provided</includeScope>
                         </configuration>
                     </execution>
                 </executions>
@@ -181,9 +181,6 @@ along with Dependency-Check.  If not, see <http://www.gnu.org/licenses />.
                     <excludes>
                         <exclude>**/*IntegrationTest.java</exclude>
                     </excludes>
-                    <additionalClasspathElements>
-                        <additionalClasspathElement>${project.build.directory}/lib/</additionalClasspathElement>
-                    </additionalClasspathElements>
                 </configuration>
             </plugin>
             <plugin>
@@ -372,7 +369,7 @@ along with Dependency-Check.  If not, see <http://www.gnu.org/licenses />.
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>annotations</artifactId>
             <version>2.0.1</version>
-            <scope>provided</scope><!-- don't include this in the libs-->
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
@@ -469,18 +466,20 @@ along with Dependency-Check.  If not, see <http://www.gnu.org/licenses />.
             <artifactId>commons-compress</artifactId>
             <version>1.5</version>
         </dependency>
-        <!-- The following dependencies are only scanned during integration testing -->
-        <!--<dependency>
+        <!-- The following dependencies are only used during testing -->
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
             <version>2.5.5</version>
-            <scope>test</scope>
-        </dependency>-->
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
             <version>2.5</version>
-            <scope>test</scope>
+            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 </project>