Return-Path: 
 <commits-return-3568-apmail-ctakes-commits-archive=ctakes.apache.org@ctakes.apache.org>
X-Original-To: apmail-ctakes-commits-archive@www.apache.org
Delivered-To: apmail-ctakes-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id F265510727
	for <apmail-ctakes-commits-archive@www.apache.org>;
 Tue, 25 Nov 2014 16:00:33 +0000 (UTC)
Received: (qmail 98428 invoked by uid 500); 25 Nov 2014 16:00:33 -0000
Delivered-To: apmail-ctakes-commits-archive@ctakes.apache.org
Received: (qmail 98394 invoked by uid 500); 25 Nov 2014 16:00:33 -0000
Mailing-List: contact commits-help@ctakes.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ctakes.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ctakes.apache.org>
List-Post: <mailto:commits@ctakes.apache.org>
List-Id: <commits.ctakes.apache.org>
Reply-To: dev@ctakes.apache.org
Delivered-To: mailing list commits@ctakes.apache.org
Received: (qmail 98385 invoked by uid 99); 25 Nov 2014 16:00:33 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Nov 2014 16:00:33 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Nov 2014 16:00:12 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D23942388B6C;
	Tue, 25 Nov 2014 16:00:10 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1641642 -
 /ctakes/branches/ctakes-3.2.1/ctakes-ytex-web/pom.xml
Date: Tue, 25 Nov 2014 16:00:10 -0000
To: commits@ctakes.apache.org
From: chenpei@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20141125160010.D23942388B6C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: chenpei
Date: Tue Nov 25 16:00:10 2014
New Revision: 1641642

URL: http://svn.apache.org/r1641642
Log:
#CTAKES-337 updgrade jsp-api version to avoid class conflict. #CTAKES-334 fix getter. (FROM TRUNK)

Modified:
    ctakes/branches/ctakes-3.2.1/ctakes-ytex-web/pom.xml

Modified: ctakes/branches/ctakes-3.2.1/ctakes-ytex-web/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/branches/ctakes-3.2.1/ctakes-ytex-web/pom.xml?rev=1641642&r1=1641641&r2=1641642&view=diff
==============================================================================
--- ctakes/branches/ctakes-3.2.1/ctakes-ytex-web/pom.xml (original)
+++ ctakes/branches/ctakes-3.2.1/ctakes-ytex-web/pom.xml Tue Nov 25 16:00:10 2014
@@ -100,7 +100,7 @@
 		<dependency>
 			<groupId>javax.servlet.jsp</groupId>
 			<artifactId>jsp-api</artifactId>
-			<version>2.1</version>
+			<version>2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>