updated dependencies that are only scanned during tests to be provided/optional and copied them to test-classes

Former-commit-id: d75d018ea41fa6f4d43b7549b84e50da6831da1d
This commit is contained in:
Jeremy Long
2013-08-16 11:17:44 -04:00
parent d2ace4ae6f
commit 66c3985725

View File

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