Return-Path: 
 <scm-return-48241-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 43A3599E6
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Mon, 26 Mar 2012 03:34:05 +0000 (UTC)
Received: (qmail 97028 invoked by uid 500); 26 Mar 2012 03:34:04 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 96780 invoked by uid 500); 26 Mar 2012 03:33:59 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 96767 invoked by uid 99); 26 Mar 2012 03:33:58 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Mar 2012 03:33:58 +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; Mon, 26 Mar 2012 03:33:57 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id ACC112388980;
	Mon, 26 Mar 2012 03:33:37 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1305208 - in /geronimo/tck/branches/3.0:
 geronimo-porting/pom.xml pom.xml
Date: Mon, 26 Mar 2012 03:33:37 -0000
To: scm@geronimo.apache.org
From: xiaming@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120326033337.ACC112388980@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: xiaming
Date: Mon Mar 26 03:33:37 2012
New Revision: 1305208

URL: http://svn.apache.org/viewvc?rev=1305208&view=rev
Log:
GERONIMOTCK-129 Update maven-compiler-plugin to 2.3.2 to fix the compilation issue when using Java 7, and use tomcatVersion to pick up the el dependency change automatically, for trunk

Modified:
    geronimo/tck/branches/3.0/geronimo-porting/pom.xml
    geronimo/tck/branches/3.0/pom.xml

Modified: geronimo/tck/branches/3.0/geronimo-porting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/geronimo-porting/pom.xml?rev=1305208&r1=1305207&r2=1305208&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/geronimo-porting/pom.xml (original)
+++ geronimo/tck/branches/3.0/geronimo-porting/pom.xml Mon Mar 26 03:33:37 2012
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>jasper-el</artifactId>
-            <version>7.0.0.2-SNAPSHOT</version>
+            <version>${tomcatVersion}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/tck/branches/3.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/pom.xml?rev=1305208&r1=1305207&r2=1305208&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/pom.xml (original)
+++ geronimo/tck/branches/3.0/pom.xml Mon Mar 26 03:33:37 2012
@@ -173,6 +173,11 @@
                         </optionSets>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.3.2</version>                
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>