Author: schultz
Date: Tue Apr 15 18:03:47 2014
New Revision: 1587659
URL: http://svn.apache.org/r1587659
Log:
Back-ported r1587378 to require tcnative version 1.1.30.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ (props
changed)
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/tc7/
(props changed)
tomcat/tc7.0.x/trunk/webapps/examples/websocket-deprecated/ (props
changed)
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1587378
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1587659&r1=1587658&r2=1587659&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Tue Apr 15 18:03:47 2014
@@ -137,7 +137,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
-tomcat-native.version=1.1.29
+tomcat-native.version=1.1.30
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/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1587659&r1=1587658&r2=1587659&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Tue Apr 15 18:03:47 2014
@@ -58,9 +58,9 @@ public class AprLifecycleListener
protected static final int TCN_REQUIRED_MAJOR = 1;
protected static final int TCN_REQUIRED_MINOR = 1;
- protected static final int TCN_REQUIRED_PATCH = 29;
+ protected static final int TCN_REQUIRED_PATCH = 30;
protected static final int TCN_RECOMMENDED_MINOR = 1;
- protected static final int TCN_RECOMMENDED_PV = 29;
+ protected static final int TCN_RECOMMENDED_PV = 30;
// ---------------------------------------------- Properties
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1587378
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/codec:r1587378
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload:r1587378
Propchange: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/tc7/
------------------------------------------------------------------------------
Merged /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/tc7:r1587378
Propchange: tomcat/tc7.0.x/trunk/webapps/examples/websocket-deprecated/
------------------------------------------------------------------------------
Merged /tomcat/trunk/webapps/examples/websocket-deprecated:r1587378
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
