Author: wsmoak
Date: Sat Jan 20 10:07:15 2007
New Revision: 498147
URL: http://svn.apache.org/viewvc?view=rev&rev=498147
Log:
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
Modified:
struts/struts2/trunk/core/pom.xml
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=498147&r1=498146&r2=498147
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Sat Jan 20 10:07:15 2007
@@ -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>
