From 3ba8f5046d58bc5d944c9a834041f3106822a682 Mon Sep 17 00:00:00 2001
From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 3 Aug 2010 14:03:30 +0000
Subject: [PATCH] Further places where our JDT version is hard coded.

It would be nice to at least support globs in the
jar scanner configuration, so instance configuration
can be kept stable when doing product updates.

Otherwise things will not break in an obvious way,
but e.g. startup performance might drop.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@981889 13f79535-47bb-0310-9956-ffa450edef68
---
 conf/catalina.properties    | 2 +-
 eclipse.classpath           | 2 +-
 res/maven/tomcat-jasper.pom | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/catalina.properties b/conf/catalina.properties
index 613eda748..6fc272a61 100644
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
@@ -89,7 +89,7 @@ tomcat.util.scan.DefaultJarScanner.jarsToSkip=\
 bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\
 annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,\
 catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-tribes.jar,\
-jasper.jar,jasper-el.jar,ecj-3.5.1.jar,\
+jasper.jar,jasper-el.jar,ecj-3.6.jar,\
 tomcat-api.jar,tomcat-util.jar,tomcat-coyote.jar,tomcat-dbcp.jar,\
 tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
 commons-beanutils.jar,commons-collections.jar,commons-dbcp.jar,\
diff --git a/eclipse.classpath b/eclipse.classpath
index e2c51cfc6..dbc78363d 100644
--- a/eclipse.classpath
+++ b/eclipse.classpath
@@ -25,6 +25,6 @@
     <classpathentry kind="var" path="TOMCAT_LIBS_BASE/tomcat7-deps/dbcp/tomcat-dbcp.jar" sourcepath="/TOMCAT_LIBS_BASE/tomcat7-deps/dbcp/src/java"/>
     <classpathentry kind="var" path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar"/>
     <classpathentry kind="var" path="TOMCAT_LIBS_BASE/wsdl4j-1.6.1/wsdl4j-1.6.1.jar"/>
-    <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-3.5.1/ecj-3.5.1.jar"/>
+    <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-3.6/ecj-3.6.jar"/>
     <classpathentry kind="output" path=".settings/output"/>
 </classpath>
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 5810072c8..9bf263016 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.eclipse.jdt</groupId>
       <artifactId>ecj</artifactId>
-      <version>3.5.1</version>
+      <version>3.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-- 
2.11.0