From e0f258f718c4bae691b6b73cb196a3bf55492114 Mon Sep 17 00:00:00 2001
From: cnenning <cnenning@apache.org>
Date: Tue, 13 Oct 2015 13:06:35 +0200
Subject: [PATCH] made spring-core an optional compile dependency, as that is
 required for javadoc of jdk8

---
 plugins/portlet/pom.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index da5a8cac4..b7500f713 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -11,6 +11,8 @@
     <name>Struts 2 Portlet Plugin</name>
 
     <dependencies>
+        <!-- junit and related JARs are needed for 'compile'! -->
+        <!-- Due to StrutsPortletTestCase shall be distributed to applications. -->
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
@@ -23,6 +25,14 @@
             <optional>true</optional>
         </dependency>
 
+        <!-- spring-core is required for javadoc of jdk8 -->
+        <!-- It is indirectly referenced by struts2-junit-plugin. -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
@@ -100,11 +110,6 @@
             <artifactId>spring-webmvc-portlet</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>