[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed

2019-04-12 Thread Bill Barker 
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-nio2 has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 14 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 23 mins 54 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar 
-Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar 
-Dtest.temp=output/test-tmp-NIO2 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20190413/bin/openssl
 -Dexecute
 .test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=false 
-Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar 
-Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.10-201812060815/ecj-4.10.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.1-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/out

[GUMP@vmgump-vm3]: Project tomcat-trunk-validate-eoln (in module tomcat-trunk) failed

2019-04-12 Thread Bill Barker 
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-validate-eoln has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate-eoln :  Tomcat 9.x, a web server implementing the 
Java Servlet 4.0,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate-eoln/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate-eoln/gump_work/build_tomcat-trunk_tomcat-trunk-validate-eoln.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate-eoln (Type: Build)
Work ended in a state of : Failed
Elapsed: 6 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
validate-eoln 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/classes
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/bin
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/conf
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/lib
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/logs
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/webapps

compile-prepare:
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/startup
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs

validate-eoln:
[javac] Compiling 1 source file to 
/srv/gump/public/workspace/tomcat-trunk/output/classes
[javac] Support for javac --release has been added in Java9 ignoring it
 [checkeol] Checking line ends in 3815 file(s)
 [checkeol] Checking line ends in 100 file(s)
 [checkeol] Done line ends check in 3915 file(s), 2 error(s) found.
 [checkeol] The following files have wrong line ends: [
 [checkeol] 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/startup/ContextConfig.java:
 uses CRLF on line 1, 
 [checkeol] /srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml: 
uses CRLF on line 1]

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:641: The following files have 
wrong line ends: [
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/startup/ContextConfig.java:
 uses CRLF on line 1, 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml: uses CRLF 
on line 1]

Total time: 6 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate-eoln/rss.xml
- Atom: 
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate-eoln/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 2019041306, vmgump-vm3.apache.org:vmgump:2019041306
Gump E-mail Identifier (unique within run) #2.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump-vm3]

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 9.0.19

2019-04-12 Thread Igal Sapir 
I am getting a unit test failure:

On Fri, Apr 12, 2019 at 7:48 AM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.19 release is now available for voting.
> 9.0.19 corrects a regression and a number of packaging errors in 9.0.18.
>
> The major changes compared to the 9.0.17 release are:
>
> - Fix for CVE-2019-0232 a RCE vulnerability on Windows
>
> - Add support for Java 11 to the JSP compiler. Java 12 and 13 are also
>   now supported if used with a ECJ version with support for those  Java
>   versions
>
> - Various NIO2 stability improvements
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.19/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1210/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.19
> 854f4dcf435a6d335576aa22402e2871c66f4fd9
>
> The proposed 9.0.19 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 9.0.19
>
>
I am getting a failure on Ubuntu test cases, but not on Windows.  That did
not happen in 9.0.18.  The failing test is
org.apache.catalina.tribes.group.TestGroupChannelMemberArrival

Full log below:

Testsuite: org.apache.catalina.tribes.group.TestGroupChannelMemberArrival
Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 8.079 sec
- Standard Output ---
1555086368679 Listener-9:member added, has 1 members now. Member:[host:
127.0.1.1, port: 4004, id:
185.118.46.127.126.58.75.145.182.221.126.169.213.220.123.54, payload:
Channel-3]; Thread:Membership-MemberAdded., hash:1258545020
1555086368679 Listener-6:member added, has 1 members now. Member:[host:
127.0.1.1, port: 4008, id:
47.37.31.85.54.172.66.150.184.132.56.120.49.5.38.228, payload: Channel-4];
Thread:Membership-MemberAdded., hash:1983451833
1555086368679 Listener-9:member added, has 2 members now. Member:[host:
127.0.1.1, port: 4008, id:
47.37.31.85.54.172.66.150.184.132.56.120.49.5.38.228, payload: Channel-4];
Thread:Membership-MemberAdded., hash:1258545020
1555086368679 Listener-8:member added, has 1 members now. Member:[host:
127.0.1.1, port: 4008, id:
47.37.31.85.54.172.66.150.184.132.56.120.49.5.38.228, payload: Channel-4];
Thread:Membership-MemberAdded., hash:588869387
1555086368679 Listener-2:member added, has 1 members now. Member:[host:
127.0.1.1, port: 4004, id:
185.118.46.127.126.58.75.145.182.221.126.169.213.220.123.54, payload:
Channel-3]; Thread:Membership-MemberAdded., hash:1244130073
1555086368679 Listener-6:member added, has 2 members now. Member:[host:
127.0.1.1, port: 4004, id:
185.118.46.127.126.58.75.145.182.221.126.169.213.220.123.54, payload:
Channel-3]; Thread:Membership-MemberAdded., hash:1983451833
1555086368679 Listener-8:member added, has 2 members now. Member:[host:
127.0.1.1, port: 4004, id:
185.118.46.127.126.58.75.145.182.221.126.169.213.220.123.54, payload:
Channel-3]; Thread:Membership-MemberAdded., hash:588869387
1555086368679 Listener-2:member added, has 2 members now. Member:[host:
127.0.1.1, port: 4008, id:
47.37.31.85.54.172.66.150.184.132.56.120.49.5.38.228, payload: Channel-4];
Thread:Membership-MemberAdded., hash:1244130073
1555086368679 Listener-9:member added, has 3 members now. Member:[host:
127.0.1.1, port: 4007, id:
242.244.152.138.138.145.69.95.133.11.139.19.140.13.254.98, payload:
Channel-7]; Thread:Membership-MemberAdded., hash:1258545020
1555086368679 Listener-8:member added, has 3 members now. Member:[host:
127.0.1.1, port: 4007, id:
242.244.152.138.138.145.69.95.133.11.139.19.140.13.254.98, payload:
Channel-7]; Thread:Membership-MemberAdded., hash:588869387
1555086368679 Listener-6:member added, has 3 members now. Member:[host:
127.0.1.1, port: 4007, id:
242.244.152.138.138.145.69.95.133.11.139.19.140.13.254.98, payload:
Channel-7]; Thread:Membership-MemberAdded., hash:1983451833
1555086368679 Listener-9:member added, has 4 members now. Member:[host:
127.0.1.1, port: 4005, id:
120.244.21.128.50.121.79.127.137.119.252.134.23.57.48.21, payload:
Channel-2]; Thread:Membership-MemberAdded., hash:1258545020
1555086368679 Listener-2:member added, has 3 members now. Member:[host:
127.0.1.1, port: 4007, id:
242.244.152.138.138.145.69.95.133.11.139.19.140.13.254.98, payload:
Channel-7]; Thread:Membership-MemberAdded., hash:1244130073
1555086368680 Listener-6:member added, has 4 members now. Member:[host:
127.0.1.1, port: 4005, id:
120.244.21.128.50.121.79.127.137.119.252.134.23.57.48.21, payload:
Channel-2]; Thread:Membership-MemberAdded., hash:1983451833
1555086368679 Listener-8:member added, has 4 members now. Member:[host:
127.0.1.1, port: 4005, id:
120.244.21.128.50.121.79.127.137.119.252.134.23.57.48.21, payload:
Channel-2]; Thread:Membership-MemberAdded., hash:588869387
1555086368680 Listener-2:member added, has 4 members now. Member:[host:
127.0.

Re: [VOTE] Release Apache Tomcat 9.0.19

2019-04-12 Thread Coty Sutherland 
On Fri, Apr 12, 2019 at 10:48 AM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.19 release is now available for voting.
> 9.0.19 corrects a regression and a number of packaging errors in 9.0.18.
>
> The major changes compared to the 9.0.17 release are:
>
> - Fix for CVE-2019-0232 a RCE vulnerability on Windows
>
> - Add support for Java 11 to the JSP compiler. Java 12 and 13 are also
>   now supported if used with a ECJ version with support for those  Java
>   versions
>
> - Various NIO2 stability improvements
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.19/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1210/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.19
> 854f4dcf435a6d335576aa22402e2871c66f4fd9
>
> The proposed 9.0.19 release is:
> [ ] Broken - do not release
> [x] Stable - go ahead and release as 9.0.19
>

+1


>
>
> Due to the security fix contained in this release, the voting period may
> be shortened once sufficient votes are cast to enable a faster release.
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[tomcat] branch master updated: Use async by default for now

2019-04-12 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 39673ee  Use async by default for now
39673ee is described below

commit 39673eeddcfe6930ccca7ada4601720eb74157b2
Author: remm 
AuthorDate: Fri Apr 12 18:15:00 2019 +0200

Use async by default for now

Goal: more testing with NIO
---
 java/org/apache/tomcat/util/net/AbstractEndpoint.java | 4 ++--
 webapps/docs/changelog.xml| 8 
 webapps/docs/config/http.xml  | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 155cabe..64be45b 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -742,9 +742,9 @@ public abstract class AbstractEndpoint {
 
 
 /**
- * Expose async IO capability.
+ * Expose asynchronous IO capability.
  */
-private boolean useAsyncIO = false;
+private boolean useAsyncIO = true;
 public void setUseAsyncIO(boolean useAsyncIO) { this.useAsyncIO = 
useAsyncIO; }
 public boolean getUseAsyncIO() { return useAsyncIO; }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 335568d..2542985 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+The useAsyncIO boolean attribute on the Connector element
+value now defaults to true. (remm)
+  
+
+  
 
 
   
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index fe8ba89..9e68e39 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -762,7 +762,7 @@
 
   
 (bool)Use this attribute to enable or disable usage of the
-asynchronous IO API. The default value is false.
+asynchronous IO API. The default value is true.
   
 
   
@@ -906,7 +906,7 @@
 
   
 (bool)Use this attribute to enable or disable usage of the
-asynchronous IO API. The default value is false.
+asynchronous IO API. The default value is true.
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Revert workaround to what looks like a ContextConfig bug around docBase

2019-04-12 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 765e0bd  Revert workaround to what looks like a ContextConfig bug 
around docBase
765e0bd is described below

commit 765e0bdbb5c082ad1ff31b349f43796aad08efae
Author: Mark Thomas 
AuthorDate: Fri Apr 12 16:51:26 2019 +0100

Revert workaround to what looks like a ContextConfig bug around docBase
---
 .../org/apache/catalina/webresources/TestAbstractArchiveResource.java | 4 ++--
 test/org/apache/catalina/webresources/TestFileResource.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java 
b/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
index e573d91..9c59fd8 100644
--- a/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
+++ b/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
@@ -48,7 +48,7 @@ public class TestAbstractArchiveResource extends 
TomcatBaseTest {
 
expectedURL.append(docBase.getCanonicalFile().toURI().toURL().toString());
 
expectedURL.append("*/WEB-INF/lib/test.jar!/META-INF/resources/index.html");
 
-
Assert.assertTrue(expectedURL.toString().equalsIgnoreCase(webResource.getURL().toString()));
+Assert.assertEquals(expectedURL.toString(), 
webResource.getURL().toString());
 }
 
 
@@ -71,7 +71,7 @@ public class TestAbstractArchiveResource extends 
TomcatBaseTest {
 
expectedURL.append(docBase.getCanonicalFile().toURI().toURL().toString());
 expectedURL.append("WEB-INF/lib/test-lib.jar!/META-INF/tags/echo.tag");
 
-
Assert.assertTrue(expectedURL.toString().equalsIgnoreCase(webResource.getURL().toString()));
+Assert.assertEquals(expectedURL.toString(), 
webResource.getURL().toString());
 }
 
 }
diff --git a/test/org/apache/catalina/webresources/TestFileResource.java 
b/test/org/apache/catalina/webresources/TestFileResource.java
index 2bd7ef3..315212a 100644
--- a/test/org/apache/catalina/webresources/TestFileResource.java
+++ b/test/org/apache/catalina/webresources/TestFileResource.java
@@ -40,6 +40,6 @@ public class TestFileResource extends TomcatBaseTest {
 
 // Build the expected location the same way the webapp base dir is 
built
 File f = new File("test/webapp/WEB-INF/classes");
-
Assert.assertTrue(f.getCanonicalFile().toURI().toURL().toString().equalsIgnoreCase(out.toString().trim()));
+Assert.assertEquals(f.getCanonicalFile().toURI().toURL().toString(), 
out.toString().trim());
 }
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in on tomcat-7-trunk

2019-04-12 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1324

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] 4d2ffc7afae83f1b91424e4950c62ac1946ceace
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Run internal upgrade handler on NIO as well

2019-04-12 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new d228347  Run internal upgrade handler on NIO as well
d228347 is described below

commit d228347196ff6374a4e13b2b8ac5bd2c42b7241f
Author: remm 
AuthorDate: Fri Apr 12 17:36:19 2019 +0200

Run internal upgrade handler on NIO as well

Set the useAsyncIO attribute on the connector (I'll leave it even if the
default value changes, just in case).
---
 .../org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java 
b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
index 367f06f..841989a 100644
--- a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
+++ b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
@@ -60,8 +60,8 @@ public class TestUpgradeInternalHandler extends 
TomcatBaseTest {
 @Test
 public void testUpgradeInternal() throws Exception {
 Assume.assumeTrue(
-"Only supported on NIO 2",
-
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Nio2"));
+"Only supported on NIO X",
+
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Nio"));
 
 UpgradeConnection uc = doUpgrade(EchoAsync.class);
 PrintWriter pw = new PrintWriter(uc.getWriter());
@@ -87,6 +87,7 @@ public class TestUpgradeInternalHandler extends 
TomcatBaseTest {
 Class upgradeHandlerClass) throws 
Exception {
 // Setup Tomcat instance
 Tomcat tomcat = getTomcatInstance();
+tomcat.getConnector().setProperty("useAsyncIO", "true");
 
 // No file system docBase required
 Context ctx = tomcat.addContext("", null);


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r33591 - in /dev/tomcat/tomcat-9/v9.0.19: ./ bin/ bin/embed/ src/

2019-04-12 Thread Coty Sutherland 
On Fri, Apr 12, 2019 at 11:29 AM Coty Sutherland 
wrote:

> Are these svn commits intentional? I thought the svn repo was read-only
> now.
>

Disregard that :)


>
> On Fri, Apr 12, 2019 at 10:47 AM  wrote:
>
>> Author: markt
>> Date: Fri Apr 12 14:47:16 2019
>> New Revision: 33591
>>
>> Log:
>> Upload 9.0.19 for voting
>>
>> Added:
>> dev/tomcat/tomcat-9/v9.0.19/
>> dev/tomcat/tomcat-9/v9.0.19/KEYS
>> dev/tomcat/tomcat-9/v9.0.19/README.html
>> dev/tomcat/tomcat-9/v9.0.19/RELEASE-NOTES
>> dev/tomcat/tomcat-9/v9.0.19/bin/
>> dev/tomcat/tomcat-9/v9.0.19/bin/README.html
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.tar.gz
>>  (with props)
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.tar.gz.asc
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.tar.gz.sha512
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.zip
>>  (with props)
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.zip.asc
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.zip.sha512
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-fulldocs.tar.gz
>>  (with props)
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-fulldocs.tar.gz.asc
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-fulldocs.tar.gz.sha512
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x64.zip
>>  (with props)
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x64.zip.asc
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x64.zip.sha512
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x86.zip
>>  (with props)
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x86.zip.asc
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x86.zip.sha512
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.exe   (with
>> props)
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.exe.asc
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.exe.sha512
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.tar.gz   (with
>> props)
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.tar.gz.asc
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.tar.gz.sha512
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.zip   (with
>> props)
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.zip.asc
>> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.zip.sha512
>> dev/tomcat/tomcat-9/v9.0.19/bin/embed/
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.tar.gz
>>  (with props)
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.tar.gz.asc
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.tar.gz.sha512
>> dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.zip
>>  (with props)
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.zip.asc
>>
>> dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.zip.sha512
>> dev/tomcat/tomcat-9/v9.0.19/src/
>> dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.tar.gz
>>  (with props)
>> dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.tar.gz.asc
>> dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.tar.gz.sha512
>> dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.zip   (with
>> props)
>> dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.zip.asc
>> dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.zip.sha512
>>
>> Added: dev/tomcat/tomcat-9/v9.0.19/KEYS
>>
>> ==
>> --- dev/tomcat/tomcat-9/v9.0.19/KEYS (added)
>> +++ dev/tomcat/tomcat-9/v9.0.19/KEYS Fri Apr 12 14:47:16 2019
>> @@ -0,0 +1,676 @@
>> +This file contains the PGP&GPG keys of various Apache developers.
>> +Please don't use them for email unless you have to. Their main
>> +purpose is code signing.
>> +
>> +Apache users: pgp < KEYS
>> +Apache developers:
>> +(pgpk -ll  && pgpk -xa ) >> this file.
>> +  or
>> +(gpg --fingerprint --list-sigs 
>> + && gpg --armor --export ) >> this file.
>> +
>> +Apache developers: please ensure that your key is also available via the
>> +PGP keyservers (such as pgpkeys.mit.edu).
>> +
>> +
>> +Type Bits/KeyIDDate   User ID
>> +pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
>> +
>> +-BEGIN PGP PUBLIC KEY BLOCK-
>> +Version: PGPfreeware 7.0.3 for non-commercial use 
>> +
>> +mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
>> +gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
>> +I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
>> +bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
>> +B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
>> +gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah

Re: [tomcat] branch master updated (1a4bfa2 -> 49f1b8a)

2019-04-12 Thread Rémy Maucherat 
On Fri, Apr 12, 2019 at 5:21 PM  wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a change to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git.
>
>
> from 1a4bfa2  9.0.18 was not release
>  new dda11ac  Increment version ready for next development cycle
>  new 49f1b8a  Remove unused code identified by Eclipse
>

I don't disagree that the code is unused, but I left that in hoping to use
them in some way at some point. (like, maybe) I guess I'll add that later
if/when the time comes.
Ultimately, some form of per operation timeout is better than per
connection timeout only, so it's a goal.

Rémy


>
> The 20727 revisions listed above as "new" are entirely new to this
> repository and will be described in separate emails.  The revisions
> listed as "add" were already present in the repository and have only
> been added to this reference.
>
>
> Summary of changes:
>  build.properties.default |  2 +-
>  java/org/apache/tomcat/util/net/NioEndpoint.java | 10 +-
>  res/maven/mvn.properties.default |  2 +-
>  webapps/docs/changelog.xml   |  4 +++-
>  4 files changed, 10 insertions(+), 8 deletions(-)
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: svn commit: r33591 - in /dev/tomcat/tomcat-9/v9.0.19: ./ bin/ bin/embed/ src/

2019-04-12 Thread Coty Sutherland 
Are these svn commits intentional? I thought the svn repo was read-only now.

On Fri, Apr 12, 2019 at 10:47 AM  wrote:

> Author: markt
> Date: Fri Apr 12 14:47:16 2019
> New Revision: 33591
>
> Log:
> Upload 9.0.19 for voting
>
> Added:
> dev/tomcat/tomcat-9/v9.0.19/
> dev/tomcat/tomcat-9/v9.0.19/KEYS
> dev/tomcat/tomcat-9/v9.0.19/README.html
> dev/tomcat/tomcat-9/v9.0.19/RELEASE-NOTES
> dev/tomcat/tomcat-9/v9.0.19/bin/
> dev/tomcat/tomcat-9/v9.0.19/bin/README.html
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.tar.gz
>  (with props)
>
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.tar.gz.asc
>
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.tar.gz.sha512
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.zip
>  (with props)
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.zip.asc
>
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.zip.sha512
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-fulldocs.tar.gz
>  (with props)
>
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-fulldocs.tar.gz.asc
>
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-fulldocs.tar.gz.sha512
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x64.zip
>  (with props)
>
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x64.zip.asc
>
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x64.zip.sha512
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x86.zip
>  (with props)
>
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x86.zip.asc
>
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x86.zip.sha512
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.exe   (with props)
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.exe.asc
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.exe.sha512
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.tar.gz   (with
> props)
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.tar.gz.asc
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.tar.gz.sha512
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.zip   (with props)
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.zip.asc
> dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.zip.sha512
> dev/tomcat/tomcat-9/v9.0.19/bin/embed/
>
> dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.tar.gz
>  (with props)
>
> dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.tar.gz.asc
>
> dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.tar.gz.sha512
> dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.zip
>  (with props)
>
> dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.zip.asc
>
> dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.zip.sha512
> dev/tomcat/tomcat-9/v9.0.19/src/
> dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.tar.gz
>  (with props)
> dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.tar.gz.asc
> dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.tar.gz.sha512
> dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.zip   (with
> props)
> dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.zip.asc
> dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.zip.sha512
>
> Added: dev/tomcat/tomcat-9/v9.0.19/KEYS
>
> ==
> --- dev/tomcat/tomcat-9/v9.0.19/KEYS (added)
> +++ dev/tomcat/tomcat-9/v9.0.19/KEYS Fri Apr 12 14:47:16 2019
> @@ -0,0 +1,676 @@
> +This file contains the PGP&GPG keys of various Apache developers.
> +Please don't use them for email unless you have to. Their main
> +purpose is code signing.
> +
> +Apache users: pgp < KEYS
> +Apache developers:
> +(pgpk -ll  && pgpk -xa ) >> this file.
> +  or
> +(gpg --fingerprint --list-sigs 
> + && gpg --armor --export ) >> this file.
> +
> +Apache developers: please ensure that your key is also available via the
> +PGP keyservers (such as pgpkeys.mit.edu).
> +
> +
> +Type Bits/KeyIDDate   User ID
> +pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
> +
> +-BEGIN PGP PUBLIC KEY BLOCK-
> +Version: PGPfreeware 7.0.3 for non-commercial use 
> +
> +mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
> +gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
> +I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
> +bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
> +B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
> +gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
> +9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
> +nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
> +0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49

Re: [VOTE] Release Apache Tomcat 9.0.19

2019-04-12 Thread Mark Thomas 
On 12/04/2019 15:48, Mark Thomas wrote:

> The proposed 9.0.19 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.19

Unit tests pass for NIO, NIO2 and APR/Native on Windows, Linux and MacOS
with Tomcat-Native 1.2.21

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated (1a4bfa2 -> 49f1b8a)

2019-04-12 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 1a4bfa2  9.0.18 was not release
 new dda11ac  Increment version ready for next development cycle
 new 49f1b8a  Remove unused code identified by Eclipse

The 20727 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.properties.default |  2 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java | 10 +-
 res/maven/mvn.properties.default |  2 +-
 webapps/docs/changelog.xml   |  4 +++-
 4 files changed, 10 insertions(+), 8 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 9.0.19

2019-04-12 Thread Rémy Maucherat 
On Fri, Apr 12, 2019 at 4:48 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.19 release is now available for voting.
> 9.0.19 corrects a regression and a number of packaging errors in 9.0.18.
>
> The major changes compared to the 9.0.17 release are:
>
> - Fix for CVE-2019-0232 a RCE vulnerability on Windows
>
> - Add support for Java 11 to the JSP compiler. Java 12 and 13 are also
>   now supported if used with a ECJ version with support for those  Java
>   versions
>
> - Various NIO2 stability improvements
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.19/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1210/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.19
> 854f4dcf435a6d335576aa22402e2871c66f4fd9
>
> The proposed 9.0.19 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.19
>
> Rémy

[VOTE] Release Apache Tomcat 9.0.19

2019-04-12 Thread Mark Thomas 
The proposed Apache Tomcat 9.0.19 release is now available for voting.
9.0.19 corrects a regression and a number of packaging errors in 9.0.18.

The major changes compared to the 9.0.17 release are:

- Fix for CVE-2019-0232 a RCE vulnerability on Windows

- Add support for Java 11 to the JSP compiler. Java 12 and 13 are also
  now supported if used with a ECJ version with support for those  Java
  versions

- Various NIO2 stability improvements

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.19/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1210/
The tag is:
https://github.com/apache/tomcat/tree/9.0.19
854f4dcf435a6d335576aa22402e2871c66f4fd9

The proposed 9.0.19 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 9.0.19


Due to the security fix contained in this release, the voting period may
be shortened once sufficient votes are cast to enable a faster release.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r33591 - in /dev/tomcat/tomcat-9/v9.0.19: ./ bin/ bin/embed/ src/

2019-04-12 Thread markt 
Author: markt
Date: Fri Apr 12 14:47:16 2019
New Revision: 33591

Log:
Upload 9.0.19 for voting

Added:
dev/tomcat/tomcat-9/v9.0.19/
dev/tomcat/tomcat-9/v9.0.19/KEYS
dev/tomcat/tomcat-9/v9.0.19/README.html
dev/tomcat/tomcat-9/v9.0.19/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.19/bin/
dev/tomcat/tomcat-9/v9.0.19/bin/README.html
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-deployer.zip.sha512
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-fulldocs.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x64.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x64.zip.asc
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x64.zip.sha512
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x86.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x86.zip.asc
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19-windows-x86.zip.sha512
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.exe   (with props)
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.exe.asc
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.exe.sha512
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.tar.gz   (with props)
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.zip   (with props)
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.zip.asc
dev/tomcat/tomcat-9/v9.0.19/bin/apache-tomcat-9.0.19.zip.sha512
dev/tomcat/tomcat-9/v9.0.19/bin/embed/
dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.zip.asc
dev/tomcat/tomcat-9/v9.0.19/bin/embed/apache-tomcat-9.0.19-embed.zip.sha512
dev/tomcat/tomcat-9/v9.0.19/src/
dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.zip   (with props)
dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.zip.asc
dev/tomcat/tomcat-9/v9.0.19/src/apache-tomcat-9.0.19-src.zip.sha512

Added: dev/tomcat/tomcat-9/v9.0.19/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.19/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.19/KEYS Fri Apr 12 14:47:16 2019
@@ -0,0 +1,676 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW5keSBBcm1z
+dHJvbmcgPGFuZHlAdGFnaXNoLmNvbT6JAFgEEBECABgFAjtAWuUICwMJCAcCAQoC
+GQEFGwMACgkQajrT9PIsT+1plgCfXAovWnVL3MjrTfcGlFSKw7GHCSYAoJkz
+x+r2ANe8/0e+u5ZcYtSaSry+uQINBDtAWuUQCAD2Qle3CH8IF3KiutapQvMF6PlT
+ETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33

[tomcat] 01/01: Tag 9.0.19

2019-04-12 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 9.0.19
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 854f4dcf435a6d335576aa22402e2871c66f4fd9
Author: Mark Thomas 
AuthorDate: Fri Apr 12 15:20:03 2019 +0100

Tag 9.0.19
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index b4227b5..571441d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=19
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 106a656..2f1ed00 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] tag 9.0.19 created (now 854f4dc)

2019-04-12 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to tag 9.0.19
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 854f4dc  (commit)
This tag includes the following new commits:

 new 854f4dc  Tag 9.0.19

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 7.0.x updated: Add release date for 8.5.40

2019-04-12 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 4d2ffc7  Add release date for 8.5.40
4d2ffc7 is described below

commit 4d2ffc7afae83f1b91424e4950c62ac1946ceace
Author: Mark Thomas 
AuthorDate: Fri Apr 12 15:01:51 2019 +0100

Add release date for 8.5.40
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bb7e4fc..4b5fbcc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -60,7 +60,7 @@
 -->
 
 
-
+
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 8.5.x updated: Add release date got 8.5.40

2019-04-12 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 6ad10de  Add release date got 8.5.40
6ad10de is described below

commit 6ad10de39f6bcda2848396321943facad8304239
Author: Mark Thomas 
AuthorDate: Fri Apr 12 15:00:44 2019 +0100

Add release date got 8.5.40
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1ca23c4..6574a45 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -46,7 +46,7 @@
 -->
 
 
-
+
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: 9.0.18 was not release

2019-04-12 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 1a4bfa2  9.0.18 was not release
1a4bfa2 is described below

commit 1a4bfa28e3da40414ca1af27bfbf701a23e4819f
Author: Mark Thomas 
AuthorDate: Fri Apr 12 14:58:32 2019 +0100

9.0.18 was not release
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f357623..106a656 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -79,7 +79,7 @@
 
   
 
-
+
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Fix typo

2019-04-12 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new a2b1116  Fix typo
a2b1116 is described below

commit a2b111678c37d8a0a6ba841737a1668d381077b5
Author: Mark Thomas 
AuthorDate: Fri Apr 12 11:36:57 2019 +0100

Fix typo
---
 java/org/apache/catalina/startup/ExpandWar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/startup/ExpandWar.java 
b/java/org/apache/catalina/startup/ExpandWar.java
index 7fd7144..c9b9b74 100644
--- a/java/org/apache/catalina/startup/ExpandWar.java
+++ b/java/org/apache/catalina/startup/ExpandWar.java
@@ -68,7 +68,7 @@ public class ExpandWar {
  * @exception IOException if an input/output error was encountered
  *  during expansion
  *
- * @return The absolute path to the expanded directory foe the given WAR
+ * @return The absolute path to the expanded directory for the given WAR
  */
 public static String expand(Host host, URL war, String pathname)
 throws IOException {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch master updated: Update ServerInfo to reflect actual information instead of placeholders when running development builds

2019-04-12 Thread Michael Osipov 

Am 2019-04-11 um 21:49 schrieb csuth...@apache.org:

This is an automated email from the ASF dual-hosted git repository.

csutherl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
  new c8748aa  Update ServerInfo to reflect actual information instead of 
placeholders when running development builds
c8748aa is described below

commit c8748aaf9f3f7bc9f38c5805ed80e1a333696216
Author: Coty Sutherland 
AuthorDate: Thu Apr 11 15:45:55 2019 -0400

 Update ServerInfo to reflect actual information instead of placeholders 
when running development builds
---
  java/org/apache/catalina/util/ServerInfo.java | 8 
  1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/util/ServerInfo.java 
b/java/org/apache/catalina/util/ServerInfo.java
index 020d926..a70b5bf 100644
--- a/java/org/apache/catalina/util/ServerInfo.java
+++ b/java/org/apache/catalina/util/ServerInfo.java
@@ -68,11 +68,11 @@ public class ServerInfo {
  } catch (Throwable t) {
  ExceptionUtils.handleThrowable(t);
  }
-if (info == null)
-info = "Apache Tomcat 9.0.x-dev";
-if (built == null)
+if (info == null || info.equals("Apache Tomcat/@VERSION@"))
+info = "Apache Tomcat/9.0.x-dev";
+if (built == null || built.equals("@VERSION_BUILT@"))
  built = "unknown";
-if (number == null)
+if (number == null || number.equals("@VERSION_NUMBER@"))
  number = "9.0.x";


I don't like such an approach. This isn't Java, this is the 
C-define-from-external approach.


The better approach is to read a build.properties at runtime.

Michael

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch master updated: Fixed false positives in unit tests on Windows

2019-04-12 Thread Mark Thomas 
On 12/04/2019 13:13, Mark Thomas wrote:
> On 12/04/2019 09:56, Mark Thomas wrote:
>> On 12/04/2019 01:32, Igal Sapir wrote:
>>> Mark,
>>>
>>> I just realized that you refactored my fix for the false positive unit test
>>> [1] a while ago.  Unfortunately your refactoring still shows false
>>> positives if the path of the command prompt has a lower-cased driver
>>> letter, e.g.
>>>
>>> expected: but
>>> was:
>>>
>>>
>>> I pushed a different fix earlier, prior to noticing your refactoring (TBH I
>>> thought that I never pushed the fix in the first place), which does an
>>> equalsIgnoreCase() [2]
>>>
>>> The only unit tests where I experience this issue
>>> are TestAbstractArchiveResource.java and TestFileResource.java and the
>>> problem seems to be with the Driver Letter which appears in brackets, e.g.
>>> [E] vs. [e].
>>>
>>> If you think that a full case-insensitive comparison is not right then I
>>> can  modify only the drive letter if the pattern "jar:war:file:/[X]" is
>>> found.
>>>
>>> Any thoughts?
>>
>> The test failure indicates that something isn't using canonical paths
>> when it should. Lets see if we can figure out where and then decide how
>> best to fix it.
>>
>> For reference, as well as refactoring the tests I made this change:
>> https://github.com/apache/tomcat/commit/d63695a656f04e39bd1ad4dee0f2339b0e3b898f#diff-ec06eb37e0fee8269d835107dedf7a90
>>
>> which triggered a regression hence this additional change:
>> https://github.com/apache/tomcat/commit/ad60947e42e666dc9c9d77315787ea9bb567e3fd#diff-ec06eb37e0fee8269d835107dedf7a90
>>
>> I wonder if this failure is related.
>>
>> I'm going to look at this now. If it doesn't take too long, I;d like to
>> get this fixed before 9.0.19.
> 
> The bug is in ContextConfig but it is proving a little tricky to address
> as there are lots of edge cases where we need to be careful.
> 
> I'll leave the current work-around for the test in place and look at
> this again after the 9.0.19 tag.

For the benefit of the archives, this is the command I used to get a
Windows command prompt using a lower case letter:

C:\Windows\System32\cmd.exe /K "cd /d c:\"

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r33587 - /dev/tomcat/tomcat-9/v9.0.18/

2019-04-12 Thread markt 
Author: markt
Date: Fri Apr 12 13:21:14 2019
New Revision: 33587

Log:
9.0.18 release vote cancelled

Removed:
dev/tomcat/tomcat-9/v9.0.18/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE][CANCELLED] Release Apache Tomcat 9.0.18

2019-04-12 Thread Rémy Maucherat 
On Fri, Apr 12, 2019 at 3:02 PM Mark Thomas  wrote:

> This vote is cancelled due to the regression with missing JMX MBean
> attributes.
>

The object name (as a String) was registered in JMX, rather than the object
itself, so everything is 100% wrong (except the object name of the
registration, which allowed passing mbeansTestRegistration). This was done
while looking at the Graal support (JMX was supposed to be the main issue
so I looked at that), and it's a good thing I didn't port it.

Rémy

svn commit: r33586 - /dev/tomcat/tomcat-7/v7.0.94/ /release/tomcat/tomcat-7/v7.0.94/

2019-04-12 Thread markt 
Author: markt
Date: Fri Apr 12 13:20:10 2019
New Revision: 33586

Log:
Apache Tomcat 7.0.94 release vote passed

Added:
release/tomcat/tomcat-7/v7.0.94/
  - copied from r33585, dev/tomcat/tomcat-7/v7.0.94/
Removed:
dev/tomcat/tomcat-7/v7.0.94/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r33585 - /dev/tomcat/tomcat-8/v8.5.40/ /release/tomcat/tomcat-8/v8.5.40/

2019-04-12 Thread markt 
Author: markt
Date: Fri Apr 12 13:16:24 2019
New Revision: 33585

Log:
8.5.40 release vote passed

Added:
release/tomcat/tomcat-8/v8.5.40/
  - copied from r33584, dev/tomcat/tomcat-8/v8.5.40/
Removed:
dev/tomcat/tomcat-8/v8.5.40/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE][RESULT] Release Apache Tomcat 7.0.94

2019-04-12 Thread Mark Thomas 
The following votes were cast:

Binding:
+1: markt, isapir, kfujino, violetagg, remm

No other voters were cast.

The vote therefore passes.

Thanks to everyone who contributed to this release.

I'll send out the announcement as soon as the mirrors catch up.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE][RESULT] Release Apache Tomcat 8.5.40

2019-04-12 Thread Mark Thomas 
The following votes were cast:

Binding:
+1: markt, isapir, kfujino, violetagg, remm, csutherl

I wasn't sure if Chris's +1 was for the release or just that he agreed
we didn't need another Tomcat-Native release.

Since it doesn't change the result I'm going to err on the side of
caution and not included it.

Thanks to everyone who contributed to this release.

I'll send the announcement out once the mirrors sync.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE][CANCELLED] Release Apache Tomcat 9.0.18

2019-04-12 Thread Mark Thomas 
This vote is cancelled due to the regression with missing JMX MBean
attributes.

I'll re-tag shortly.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch master updated: Fixed false positives in unit tests on Windows

2019-04-12 Thread Mark Thomas 
On 12/04/2019 09:56, Mark Thomas wrote:
> On 12/04/2019 01:32, Igal Sapir wrote:
>> Mark,
>>
>> I just realized that you refactored my fix for the false positive unit test
>> [1] a while ago.  Unfortunately your refactoring still shows false
>> positives if the path of the command prompt has a lower-cased driver
>> letter, e.g.
>>
>> expected: but
>> was:
>>
>>
>> I pushed a different fix earlier, prior to noticing your refactoring (TBH I
>> thought that I never pushed the fix in the first place), which does an
>> equalsIgnoreCase() [2]
>>
>> The only unit tests where I experience this issue
>> are TestAbstractArchiveResource.java and TestFileResource.java and the
>> problem seems to be with the Driver Letter which appears in brackets, e.g.
>> [E] vs. [e].
>>
>> If you think that a full case-insensitive comparison is not right then I
>> can  modify only the drive letter if the pattern "jar:war:file:/[X]" is
>> found.
>>
>> Any thoughts?
> 
> The test failure indicates that something isn't using canonical paths
> when it should. Lets see if we can figure out where and then decide how
> best to fix it.
> 
> For reference, as well as refactoring the tests I made this change:
> https://github.com/apache/tomcat/commit/d63695a656f04e39bd1ad4dee0f2339b0e3b898f#diff-ec06eb37e0fee8269d835107dedf7a90
> 
> which triggered a regression hence this additional change:
> https://github.com/apache/tomcat/commit/ad60947e42e666dc9c9d77315787ea9bb567e3fd#diff-ec06eb37e0fee8269d835107dedf7a90
> 
> I wonder if this failure is related.
> 
> I'm going to look at this now. If it doesn't take too long, I;d like to
> get this fixed before 9.0.19.

The bug is in ContextConfig but it is proving a little tricky to address
as there are lots of edge cases where we need to be careful.

I'll leave the current work-around for the test in place and look at
this again after the 9.0.19 tag.

Mark

> 
> Mark
> 
> 
>>
>> Igal
>>
>> [1]
>> https://github.com/apache/tomcat/commit/db71c925106915581f1b60b0fda9c352fcdd9138#diff-717001e0451788fe9f26d1176a4fff54
>>
>> [2]
>> https://github.com/apache/tomcat/commit/985d0086329c012a994c842f0a88a9b33989827c#diff-717001e0451788fe9f26d1176a4fff54R43
>>
>>
>>
>> On Thu, Apr 11, 2019 at 11:28 AM  wrote:
>>
>>> This is an automated email from the ASF dual-hosted git repository.
>>>
>>> isapir pushed a commit to branch master
>>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>>
>>>
>>> The following commit(s) were added to refs/heads/master by this push:
>>>  new 985d008  Fixed false positives in unit tests on Windows
>>> 985d008 is described below
>>>
>>> commit 985d0086329c012a994c842f0a88a9b33989827c
>>> Author: Igal Sapir 
>>> AuthorDate: Thu Apr 11 08:45:22 2019 -0700
>>>
>>> Fixed false positives in unit tests on Windows
>>>
>>> When the drive letter is lower cased in a Windows command prompt the
>>> test cases were failing with
>>> expected: but
>>> was:
>>> ---
>>>  .../org/apache/catalina/webresources/TestAbstractArchiveResource.java | 4
>>> ++--
>>>  test/org/apache/catalina/webresources/TestFileResource.java   | 2
>>> +-
>>>  2 files changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git
>>> a/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
>>> b/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
>>> index 9c59fd8..e573d91 100644
>>> ---
>>> a/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
>>> +++
>>> b/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
>>> @@ -48,7 +48,7 @@ public class TestAbstractArchiveResource extends
>>> TomcatBaseTest {
>>>
>>>  expectedURL.append(docBase.getCanonicalFile().toURI().toURL().toString());
>>>
>>>  
>>> expectedURL.append("*/WEB-INF/lib/test.jar!/META-INF/resources/index.html");
>>>
>>> -Assert.assertEquals(expectedURL.toString(),
>>> webResource.getURL().toString());
>>> +
>>> Assert.assertTrue(expectedURL.toString().equalsIgnoreCase(webResource.getURL().toString()));
>>>  }
>>>
>>>
>>> @@ -71,7 +71,7 @@ public class TestAbstractArchiveResource extends
>>> TomcatBaseTest {
>>>
>>>  expectedURL.append(docBase.getCanonicalFile().toURI().toURL().toString());
>>>
>>>  expectedURL.append("WEB-INF/lib/test-lib.jar!/META-INF/tags/echo.tag");
>>>
>>> -Assert.assertEquals(expectedURL.toString(),
>>> webResource.getURL().toString());
>>> +
>>> Assert.assertTrue(expectedURL.toString().equalsIgnoreCase(webResource.getURL().toString()));
>>>  }
>>>
>>>  }
>>> diff --git a/test/org/apache/catalina/webresources/TestFileResource.java
>>> b/test/org/apache/catalina/webresources/TestFileResource.java
>>> index 315212a..2bd7ef3 100644
>>> --- a/test/org/apache/catalina/webresources/TestFileResource.java
>>> +++ b/test/org/apache/catalina/webresources/TestFileResource.java
>>> @@ -40,6 +40,6 @@ public class TestFileResource extends TomcatBaseTest {
>>>
>>>  // Build the expected location the same way the webapp base dir
>

Re: [tomcat] branch master updated: Fixed false positives in unit tests on Windows

2019-04-12 Thread Mark Thomas 
On 12/04/2019 01:32, Igal Sapir wrote:
> Mark,
> 
> I just realized that you refactored my fix for the false positive unit test
> [1] a while ago.  Unfortunately your refactoring still shows false
> positives if the path of the command prompt has a lower-cased driver
> letter, e.g.
> 
> expected: but
> was:
> 
> 
> I pushed a different fix earlier, prior to noticing your refactoring (TBH I
> thought that I never pushed the fix in the first place), which does an
> equalsIgnoreCase() [2]
> 
> The only unit tests where I experience this issue
> are TestAbstractArchiveResource.java and TestFileResource.java and the
> problem seems to be with the Driver Letter which appears in brackets, e.g.
> [E] vs. [e].
> 
> If you think that a full case-insensitive comparison is not right then I
> can  modify only the drive letter if the pattern "jar:war:file:/[X]" is
> found.
> 
> Any thoughts?

The test failure indicates that something isn't using canonical paths
when it should. Lets see if we can figure out where and then decide how
best to fix it.

For reference, as well as refactoring the tests I made this change:
https://github.com/apache/tomcat/commit/d63695a656f04e39bd1ad4dee0f2339b0e3b898f#diff-ec06eb37e0fee8269d835107dedf7a90

which triggered a regression hence this additional change:
https://github.com/apache/tomcat/commit/ad60947e42e666dc9c9d77315787ea9bb567e3fd#diff-ec06eb37e0fee8269d835107dedf7a90

I wonder if this failure is related.

I'm going to look at this now. If it doesn't take too long, I;d like to
get this fixed before 9.0.19.

Mark


> 
> Igal
> 
> [1]
> https://github.com/apache/tomcat/commit/db71c925106915581f1b60b0fda9c352fcdd9138#diff-717001e0451788fe9f26d1176a4fff54
> 
> [2]
> https://github.com/apache/tomcat/commit/985d0086329c012a994c842f0a88a9b33989827c#diff-717001e0451788fe9f26d1176a4fff54R43
> 
> 
> 
> On Thu, Apr 11, 2019 at 11:28 AM  wrote:
> 
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> isapir pushed a commit to branch master
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>
>>
>> The following commit(s) were added to refs/heads/master by this push:
>>  new 985d008  Fixed false positives in unit tests on Windows
>> 985d008 is described below
>>
>> commit 985d0086329c012a994c842f0a88a9b33989827c
>> Author: Igal Sapir 
>> AuthorDate: Thu Apr 11 08:45:22 2019 -0700
>>
>> Fixed false positives in unit tests on Windows
>>
>> When the drive letter is lower cased in a Windows command prompt the
>> test cases were failing with
>> expected: but
>> was:
>> ---
>>  .../org/apache/catalina/webresources/TestAbstractArchiveResource.java | 4
>> ++--
>>  test/org/apache/catalina/webresources/TestFileResource.java   | 2
>> +-
>>  2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git
>> a/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
>> b/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
>> index 9c59fd8..e573d91 100644
>> ---
>> a/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
>> +++
>> b/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
>> @@ -48,7 +48,7 @@ public class TestAbstractArchiveResource extends
>> TomcatBaseTest {
>>
>>  expectedURL.append(docBase.getCanonicalFile().toURI().toURL().toString());
>>
>>  expectedURL.append("*/WEB-INF/lib/test.jar!/META-INF/resources/index.html");
>>
>> -Assert.assertEquals(expectedURL.toString(),
>> webResource.getURL().toString());
>> +
>> Assert.assertTrue(expectedURL.toString().equalsIgnoreCase(webResource.getURL().toString()));
>>  }
>>
>>
>> @@ -71,7 +71,7 @@ public class TestAbstractArchiveResource extends
>> TomcatBaseTest {
>>
>>  expectedURL.append(docBase.getCanonicalFile().toURI().toURL().toString());
>>
>>  expectedURL.append("WEB-INF/lib/test-lib.jar!/META-INF/tags/echo.tag");
>>
>> -Assert.assertEquals(expectedURL.toString(),
>> webResource.getURL().toString());
>> +
>> Assert.assertTrue(expectedURL.toString().equalsIgnoreCase(webResource.getURL().toString()));
>>  }
>>
>>  }
>> diff --git a/test/org/apache/catalina/webresources/TestFileResource.java
>> b/test/org/apache/catalina/webresources/TestFileResource.java
>> index 315212a..2bd7ef3 100644
>> --- a/test/org/apache/catalina/webresources/TestFileResource.java
>> +++ b/test/org/apache/catalina/webresources/TestFileResource.java
>> @@ -40,6 +40,6 @@ public class TestFileResource extends TomcatBaseTest {
>>
>>  // Build the expected location the same way the webapp base dir
>> is built
>>  File f = new File("test/webapp/WEB-INF/classes");
>> -
>> Assert.assertEquals(f.getCanonicalFile().toURI().toURL().toString(),
>> out.toString().trim());
>> +
>> Assert.assertTrue(f.getCanonicalFile().toURI().toURL().toString().equalsIgnoreCase(out.toString().trim()));
>>  }
>>  }
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubs

[Bug 63324] CrawlerSessionManagerValve is getting put into Session, which causes problems when serializing sessions

2019-04-12 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63324

--- Comment #8 from Martin L  ---
Created attachment 36523
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36523&action=edit
patch for 7.0.x (PR 156)

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 63324] CrawlerSessionManagerValve is getting put into Session, which causes problems when serializing sessions

2019-04-12 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63324

--- Comment #7 from Martin L  ---
Created attachment 36522
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36522&action=edit
patch for 8.5.x

adding patch for 8.5.x (PR 155)

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 63324] CrawlerSessionManagerValve is getting put into Session, which causes problems when serializing sessions

2019-04-12 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63324

Martin L  changed:

   What|Removed |Added

  Attachment #36515|0   |1
is obsolete||

--- Comment #6 from Martin L  ---
Created attachment 36521
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36521&action=edit
patch for master

adding new patch for PR 154

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org