Revert r498071 and put struts-annotations back in compile scope, but mark it optional to exclude it from transitive dependency resolution. Thanks to Musachy Barroso for catching this.

WW-1650

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@498147 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Wendy Smoak
2007-01-20 18:07:15 +00:00
parent 026ac13cd7
commit 9fa46b3e20
+11 -7
View File
@@ -19,13 +19,6 @@
</scm>
<build>
<extensions>
<extension>
<groupId>org.apache.struts</groupId>
<artifactId>struts-annotations</artifactId>
<version>1.0-SNAPSHOT</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -468,5 +461,16 @@
<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 -->
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-annotations</artifactId>
<version>1.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
</dependencies>
</project>