made spring-core an optional compile dependency, as that is required for javadoc of jdk8
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e0f258f7 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e0f258f7 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e0f258f7 Branch: refs/heads/master Commit: e0f258f718c4bae691b6b73cb196a3bf55492114 Parents: 9d5b948 Author: cnenning <cnenn...@apache.org> Authored: Tue Oct 13 13:06:35 2015 +0200 Committer: cnenning <cnenn...@apache.org> Committed: Tue Oct 13 13:06:35 2015 +0200 ---------------------------------------------------------------------- plugins/portlet/pom.xml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/e0f258f7/plugins/portlet/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index da5a8ca..b7500f7 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> @@ -101,11 +111,6 @@ <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> <scope>test</scope>