Return-Path: <commits-return-15804-archive-asf-public=cust-asf.ponee.io@struts.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id AF752200B45
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri, 15 Jul 2016 15:18:40 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id AE06E160A89; Fri, 15 Jul 2016 13:18:40 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 03CCC160A61
	for <archive-asf-public@cust-asf.ponee.io>; Fri, 15 Jul 2016 15:18:39 +0200 (CEST)
Received: (qmail 33413 invoked by uid 500); 15 Jul 2016 13:18:30 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 32187 invoked by uid 99); 15 Jul 2016 13:18:29 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2016 13:18:29 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 63703E968B; Fri, 15 Jul 2016 13:18:29 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: lukaszlenart@apache.org
To: commits@struts.apache.org
Date: Fri, 15 Jul 2016 13:18:49 -0000
Message-Id: <f1bc4ed959494307a98b87554683190d@git.apache.org>
In-Reply-To: <e18c339dc52f4a9eb57be4afe60bc036@git.apache.org>
References: <e18c339dc52f4a9eb57be4afe60bc036@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [22/50] [abbrv] struts git commit: Upgrade Tiles dependencies
archived-at: Fri, 15 Jul 2016 13:18:40 -0000

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 <lukasz.lenart@gmail.com>
Authored: Tue Jan 12 08:51:14 2016 +0100
Committer: Lukasz Lenart <lukasz.lenart@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>