From 9fa46b3e20638fc50a973fc754c0cff9f4778e5a Mon Sep 17 00:00:00 2001
From: Wendy Smoak <wsmoak@apache.org>
Date: Sat, 20 Jan 2007 18:07:15 +0000
Subject: [PATCH] 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
---
 core/pom.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 8825a802f..c77556da6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -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>