Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 57F547982 for ; Fri, 2 Sep 2011 11:40:18 +0000 (UTC) Received: (qmail 1916 invoked by uid 500); 2 Sep 2011 11:40:13 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 1558 invoked by uid 500); 2 Sep 2011 11:40:04 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 1542 invoked by uid 99); 2 Sep 2011 11:39:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2011 11:39:59 +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; Fri, 02 Sep 2011 11:39:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4B38C23888E7 for ; Fri, 2 Sep 2011 11:39:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1164485 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default eclipse.classpath java/org/apache/catalina/startup/TldConfig.java java/org/apache/jasper/compiler/TldLocationsCache.java res/maven/jasper.pom webapps/docs/changelog.xml Date: Fri, 02 Sep 2011 11:39:36 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110902113937.4B38C23888E7@eris.apache.org> Author: markt Date: Fri Sep 2 11:39:36 2011 New Revision: 1164485 URL: http://svn.apache.org/viewvc?rev=1164485&view=rev Log: native to 1.1.22 ecj to 3.7 Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.properties.default tomcat/tc6.0.x/trunk/eclipse.classpath tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java tomcat/tc6.0.x/trunk/res/maven/jasper.pom tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1164485&r1=1164484&r2=1164485&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 2 11:39:36 2011 @@ -108,11 +108,6 @@ PATCHES PROPOSED TO BACKPORT: needed like in #doGetBytes(). -1: -* Update Eclipse compiler and Tomcat native - http://people.apache.org/~markt/patches/2011-08-25-lib-update-tc6.patch - +1: markt, kkolinko, kfujino - -1: - * Update recommended version of Tomcat-Native to 1.1.22 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?r1=1154911&r2=1154910&pathrev=1154911 +1: kkolinko, markt, kfujino Modified: tomcat/tc6.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1164485&r1=1164484&r2=1164485&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/build.properties.default (original) +++ tomcat/tc6.0.x/trunk/build.properties.default Fri Sep 2 11:39:36 2011 @@ -108,17 +108,17 @@ wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j # - noTldJars in o.a.j.compiler.TldLocationsCache # - res/maven/jasper.pom # - eclipse.classpath -jdt.version=3.3.1 -jdt.release=R-3.3.1-200709211145 +jdt.version=3.7 +jdt.release=R-3.7-201106131736 jdt.home=${base.path}/ecj-${jdt.version} jdt.jar=${jdt.home}/ecj-${jdt.version}.jar # The download will be moved to the archive area eventually. We are taking care of that in advance. # Note older JARs were called ecj.jar. Newer JARs are called ecj-${jdt.version}.jar -jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj.jar -jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj.jar +jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar +jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar # ----- Tomcat native library ----- -tomcat-native.version=1.1.20 +tomcat-native.version=1.1.22 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version} tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz Modified: tomcat/tc6.0.x/trunk/eclipse.classpath URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/eclipse.classpath?rev=1164485&r1=1164484&r2=1164485&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/eclipse.classpath (original) +++ tomcat/tc6.0.x/trunk/eclipse.classpath Fri Sep 2 11:39:36 2011 @@ -20,7 +20,7 @@ - + Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1164485&r1=1164484&r2=1164485&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Fri Sep 2 11:39:36 2011 @@ -86,7 +86,7 @@ public final class TldConfig implements noTldJars.add("el-api.jar"); noTldJars.add("jasper.jar"); noTldJars.add("jasper-el.jar"); - noTldJars.add("ecj-3.3.1.jar"); + noTldJars.add("ecj-3.7.jar"); noTldJars.add("jsp-api.jar"); noTldJars.add("servlet-api.jar"); noTldJars.add("tomcat-coyote.jar"); Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1164485&r1=1164484&r2=1164485&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java Fri Sep 2 11:39:36 2011 @@ -128,7 +128,7 @@ public class TldLocationsCache { noTldJars.add("el-api.jar"); noTldJars.add("jasper.jar"); noTldJars.add("jasper-el.jar"); - noTldJars.add("ecj-3.3.1.jar"); + noTldJars.add("ecj-3.7.jar"); noTldJars.add("jsp-api.jar"); noTldJars.add("servlet-api.jar"); noTldJars.add("tomcat-coyote.jar"); Modified: tomcat/tc6.0.x/trunk/res/maven/jasper.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/jasper.pom?rev=1164485&r1=1164484&r2=1164485&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/jasper.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/jasper.pom Fri Sep 2 11:39:36 2011 @@ -55,7 +55,7 @@ org.eclipse.jdt.core.compiler ecj - 3.3.1 + 3.7 org.apache.tomcat Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1164485&r1=1164484&r2=1164485&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 2 11:39:36 2011 @@ -84,6 +84,17 @@ + + + + Update the native component of the APR/native connectors to 1.1.22. + (markt) + + + Update the Eclipse compiler (used for JSPs) to 3.7. (markt) + + +
--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org