Repository: struts Updated Branches: refs/heads/support-2-3 bd1a121b8 -> 997966829
Adds required dependencies (cherry picked from commit 85b2198) Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1dc545e3 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1dc545e3 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1dc545e3 Branch: refs/heads/support-2-3 Commit: 1dc545e34c19520c0ba780b43c53a28f5e3e9484 Parents: 90dbf54 Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Wed Nov 25 20:22:31 2015 +0100 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Sat Nov 28 15:34:55 2015 +0100 ---------------------------------------------------------------------- plugins/tiles/pom.xml | 29 +++++++++++++++++++++++++++++ pom.xml | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 68 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/1dc545e3/plugins/tiles/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 9114b2b..6e872ee 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -40,14 +40,43 @@ </dependency> <dependency> <groupId>org.apache.tiles</groupId> + <artifactId>tiles-servlet</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> <artifactId>tiles-jsp</artifactId> <scope>runtime</scope> </dependency> <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-servlet-wildcard</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-jsp</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-freemarker</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-ognl</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-el</artifactId> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>jsp-api</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <properties> http://git-wip-us.apache.org/repos/asf/struts/blob/1dc545e3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 30ebfa8..6f6ea8a 100644 --- a/pom.xml +++ b/pom.xml @@ -89,8 +89,8 @@ <ognl.version>3.0.13</ognl.version> <asm.version>3.3</asm.version> <asm5.version>5.0.2</asm5.version> - <tiles.version>2.0.6</tiles.version> - <log4j2.version>2.2</log4j2.version> + <tiles.version>2.2.2</tiles.version> + <log4j2.version>2.3</log4j2.version> <!-- SCM Site Configuration --> <site.mainDirectory>${project.build.directory}/site</site.mainDirectory> @@ -641,6 +641,13 @@ </dependency> <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>taglibs</groupId> <artifactId>standard</artifactId> <version>1.1.2</version> @@ -668,10 +675,40 @@ </dependency> <dependency> <groupId>org.apache.tiles</groupId> + <artifactId>tiles-servlet</artifactId> + <version>${tiles.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> <artifactId>tiles-jsp</artifactId> <version>${tiles.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-servlet-wildcard</artifactId> + <version>${tiles.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-jsp</artifactId> + <version>${tiles.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-freemarker</artifactId> + <version>${tiles.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-ognl</artifactId> + <version>${tiles.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-el</artifactId> + <version>${tiles.version}</version> + </dependency> <dependency> <groupId>javax.servlet</groupId>
