- Update version numbers.

- Update Eclipse to 3.2.1.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@475221 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.properties.default b/build.properties.default
index 3a9b6d1..687f664 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -37,8 +37,8 @@ commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-loggi
 # ----- Eclipse JDT, version 3.2 or later -----
 jdt.home=${base.path}/eclipse/plugins
 jdt.lib=${jdt.home}
-jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.2.0.v_671.jar
-jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2-200606291905/eclipse-JDT-3.2.zip
+jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.2.1.v_677_R32x.jar
+jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2.1-200609210945/eclipse-JDT-3.2.1.zip
 
 # ----- Tomcat native library -----
 tomcat-native.home=${base.path}/tomcat-native-1.1.7

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java
index 34ad43e..709d074 100644 (file)
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -57,7 +57,7 @@ public class AprLifecycleListener
     protected static final int REQUIRED_MAJOR = 1;
     protected static final int REQUIRED_MINOR = 1;
     protected static final int REQUIRED_PATCH = 3;
-    protected static final int RECOMMENDED_PV = 6;
+    protected static final int RECOMMENDED_PV = 7;
 
 
     // ---------------------------------------------- Properties

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index ba931a1..1e0f85c 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -191,11 +191,11 @@ Section "Native" SecTomcatNative
 
   SectionIn 3
 
-  NSISdl::download /TIMEOUT=30000 http://tomcat.heanet.ie/native/1.1.6/binaries/win32/tcnative-1.dll $INSTDIR\bin\tcnative-1.dll
+  NSISdl::download /TIMEOUT=30000 http://tomcat.heanet.ie/native/1.1.7/binaries/win32/tcnative-1.dll $INSTDIR\bin\tcnative-1.dll
   Pop $0
   StrCmp $0 success success
     SetDetailsView show
-    DetailPrint "download failed from http://tomcat.heanet.ie/native/1.1.6/binaries/win32/tcnative-1.dll: $0"
+    DetailPrint "download failed from http://tomcat.heanet.ie/native/1.1.7/binaries/win32/tcnative-1.dll: $0"
   success:
 
   ClearErrors