Repository: struts Updated Branches: refs/heads/master f78d90ee2 -> 3ce21403e
WW-4695 Puts back commons-collections 3.x to override Velocity's transitive dependency Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e38a7136 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e38a7136 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e38a7136 Branch: refs/heads/master Commit: e38a71365a2224c4753153a9fde3012459c98eb8 Parents: f78d90e Author: Lukasz Lenart <[email protected]> Authored: Fri Dec 30 08:06:06 2016 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Fri Dec 30 08:06:06 2016 +0100 ---------------------------------------------------------------------- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/e38a7136/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 49bbd80..fbfc1c4 100644 --- a/pom.xml +++ b/pom.xml @@ -699,6 +699,12 @@ <artifactId>commons-collections4</artifactId> <version>4.1</version> </dependency> + <!-- it's a dependency of Velocity defined here to override the transitive one --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.2</version> + </dependency> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId>
