mirror of
https://github.com/apache/struts.git
synced 2026-08-06 15:17:00 +00:00
Adding back spring, testng, and junit to the compile scope (as optional) to satisfy the
javadoc plugin when processing xwork source WW-2414 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@649020 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
+24
-11
@@ -305,12 +305,6 @@
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-core</artifactId>
|
||||
<version>2.0.8</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
|
||||
@@ -318,8 +312,9 @@
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<scope>test</scope>
|
||||
<version>3.8.2</version>
|
||||
<scope>compile</scope>
|
||||
<optional>true</optional>
|
||||
<version>3.8.2</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@@ -390,9 +385,10 @@
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- struts-annotations must be in compile scope for maven-apt-plugin to
|
||||
function correctly. Marking it optional to exclude it from transitive
|
||||
dependency resolution -->
|
||||
<!-- These jars have to be in the compile scope in order to work with apt plugin
|
||||
(struts-annotations) and javadoc (the rest to process xwork sources). Marking
|
||||
them optional to exclude them from transitive dependency resolution -->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.struts</groupId>
|
||||
<artifactId>struts-annotations</artifactId>
|
||||
@@ -401,6 +397,23 @@
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.testng</groupId>
|
||||
<artifactId>testng</artifactId>
|
||||
<version>5.1</version>
|
||||
<scope>compile</scope>
|
||||
<optional>true</optional>
|
||||
<classifier>jdk15</classifier>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring</artifactId>
|
||||
<version>2.0.8</version>
|
||||
<scope>compile</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
|
||||
</dependencies>
|
||||
</project>
|
||||
|
||||
Reference in New Issue
Block a user