You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/07/15 13:18:49 UTC
[22/50] [abbrv] struts git commit: Upgrade Tiles dependencies
Upgrade Tiles dependencies
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4e3f950b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4e3f950b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4e3f950b
Branch: refs/heads/master
Commit: 4e3f950b279b6ad9e24cf1b46ec7c0b58a031c80
Parents: bdf4f0b
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Tue Jan 12 08:51:14 2016 +0100
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Tue Jan 19 16:18:42 2016 +0100
----------------------------------------------------------------------
plugins/tiles/pom.xml | 13 -------------
pom.xml | 13 +------------
2 files changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/4e3f950b/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 45a9b7e..be39762 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -49,14 +49,6 @@
</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>
@@ -68,11 +60,6 @@
<artifactId>tiles-el</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<optional>true</optional>
http://git-wip-us.apache.org/repos/asf/struts/blob/4e3f950b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d59057..4edd1fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
<ognl.version>3.1.2</ognl.version>
<asm.version>3.3</asm.version>
<asm5.version>5.0.2</asm5.version>
- <tiles.version>2.2.2</tiles.version>
+ <tiles.version>3.0.5</tiles.version>
<log4j2.version>2.5</log4j2.version>
<!-- SCM Site Configuration -->
@@ -622,17 +622,6 @@
<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>