Re: [VOTE] Release Apache Tomcat 9.0.1

[Huxing Zhang]

Hi,

The proposed 9.0.1 release is:
[ ] Broken - do not release
[ ] Alpha  - go ahead and release as 9.0.1
[ X  ] Beta   - go ahead and release as 9.0.1
[ ] Stable - go ahead and release as 9.0.1

Unit test passed.
Test web application works fine.
Tested clean tomcat running on JDK9: ok
Tested clean tomcat running on JDK9 with security manager: ok
--
Mark Thomas 
2017 Sep 28 (Thu) 02:43
Tomcat Developers List 
[VOTE] Release Apache Tomcat 9.0.1


The proposed Apache Tomcat 9.0.1 release is now available for voting.

The major changes compared to the 9.0.0.M27 release are:

- Fix CVE-2017-12617

- Servlet 4.0 implementation is complete

- Add the ability to reconfigure TLS connectors at runtime without
  stopping the connector

- Stricter validation of the Host header

Along with lots of other bug fixes and improvements.


For full details, see the changelog:
http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.1/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1156/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_1/

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

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

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

[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 has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 6 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-validate :  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/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 35 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only 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 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20170929.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g
 
ump/public/workspace/apache-commons/logging/target/commons-logging-20170929.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20170929.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar
-
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/TestValueExpressionImpl.java:34:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/lang/TestELArithmetic.java:26:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/lang/TestELSupport.java:30:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/parser/TestELParser.java:30:
 Extra separation in import group before 'org.junit.Ignore' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestAttributeParser.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestCompiler.java:29:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestGenerator.java:36:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestJspConfig.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestParser.java:25:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java:26:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 

[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-validate (in module tomcat-8.0.x) failed

[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-tc8.0.x-validate has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 6 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-validate :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 29 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20170929.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g
 
ump/public/workspace/apache-commons/logging/target/commons-logging-20170929.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20170929.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar
-
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/TestValueExpressionImpl.java:34:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/lang/TestELArithmetic.java:26:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/lang/TestELSupport.java:30:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/parser/TestELParser.java:28:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestAttributeParser.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestCompiler.java:29:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestGenerator.java:36:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestJspConfig.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestParser.java:25:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java:26:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 

[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) failed

[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-tc7.0.x-validate has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 6 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-validate :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 30 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20170929.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g
 
ump/public/workspace/apache-commons/logging/target/commons-logging-20170929.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20170929.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar
-
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/TestELInJsp.java:23: 
Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/TestMethodExpressionImpl.java:30:
 Extra separation in import group before 'org.junit.Before' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/TestValueExpressionImpl.java:34:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/lang/TestELArithmetic.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/lang/TestELSupport.java:29:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/parser/TestELParser.java:28:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestAttributeParser.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestCompiler.java:28:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestGenerator.java:37:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestJspConfig.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestParser.java:26:
 Extra 

[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

[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-tc7.0.x-test-apr 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-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 19 mins 37 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170928.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexec
 ute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170928-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170928-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20170928/lib 
-Dtest.relaxTiming=true -Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20170928.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.6-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0

[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed

[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-tc7.0.x-test-nio 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-tc7.0.x-test-nio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 17 mins 14 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170928.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexe
 cute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170928-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170928-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true -Dexecute.test.nio=true -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20170928.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.6-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output

svn commit: r1810039 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina: core/ApplicationContext.java core/ApplicationContextFacade.java core/StandardContext.java servlet4preview/ServletContext.java

[markt]

Author: markt
Date: Thu Sep 28 19:38:27 2017
New Revision: 1810039

URL: http://svn.apache.org/viewvc?rev=1810039=rev
Log:
More deprecation

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1810039=1810038=1810039=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java 
Thu Sep 28 19:38:27 2017
@@ -87,6 +87,7 @@ import org.apache.tomcat.util.res.String
  * @author Craig R. McClanahan
  * @author Remy Maucherat
  */
+@SuppressWarnings("deprecation")
 public class ApplicationContext implements 
org.apache.catalina.servlet4preview.ServletContext {
 
 protected static final boolean STRICT_SERVLET_COMPLIANCE;

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=1810039=1810038=1810039=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
 Thu Sep 28 19:38:27 2017
@@ -57,6 +57,7 @@ import org.apache.tomcat.util.ExceptionU
  *
  * @author Remy Maucherat
  */
+@SuppressWarnings("deprecation")
 public class ApplicationContextFacade implements 
org.apache.catalina.servlet4preview.ServletContext {
 
 // -- Attributes

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1810039=1810038=1810039=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu 
Sep 28 19:38:27 2017
@@ -6419,6 +6419,7 @@ public class StandardContext extends Con
 }
 
 
+@SuppressWarnings("deprecation")
 private static class NoPluggabilityServletContext
 implements org.apache.catalina.servlet4preview.ServletContext {
 

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java?rev=1810039=1810038=1810039=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java
 Thu Sep 28 19:38:27 2017
@@ -20,6 +20,17 @@ import javax.servlet.ServletContextEvent
 import javax.servlet.ServletContextListener;
 import javax.servlet.ServletRegistration;
 
+/**
+ * Provides early access to some parts of the proposed Servlet 4.0 API.
+ *
+ * @deprecated This class is not included in Tomcat 9 onwards. Users of this
+ * class should normally upgrade to Tomcat 9 and switch to the
+ * Servlet 4.0 API. If the functionality is required in Tomcat 8.5,
+ * then the Tomcat implementation classes should be used directly.
+ * This class may be removed from Tomcat 8.5.x some time after 30
+ * September 2018.
+ */
+@Deprecated
 public interface ServletContext extends javax.servlet.ServletContext {
 
 /**



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

[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed

[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-tc7.0.x-test-bio 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-tc7.0.x-test-bio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 16 mins 40 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-BIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170928.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexe
 cute.test.bio=true 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170928-native-src.tar.gz
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170928-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true -Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20170928.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.6-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output

svn commit: r1810038 - in /tomcat/tc8.5.x/trunk: java/org/apache/catalina/core/ApplicationDispatcher.java java/org/apache/catalina/core/ApplicationHttpRequest.java test/org/apache/catalina/core/TestAp

[markt]

Author: markt
Date: Thu Sep 28 19:35:25 2017
New Revision: 1810038

URL: http://svn.apache.org/viewvc?rev=1810038=rev
Log:
Fix deprecation warnings

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1810038=1810037=1810038=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java 
Thu Sep 28 19:35:25 2017
@@ -62,6 +62,11 @@ import org.apache.tomcat.util.res.String
  */
 final class ApplicationDispatcher implements AsyncDispatcher, 
RequestDispatcher {
 
+/* Servlet 4.0 constants */
+public static final String ASYNC_MAPPING = "javax.servlet.async.mapping";
+public static final String FORWARD_MAPPING = 
"javax.servlet.forward.mapping";
+public static final String INCLUDE_MAPPING = 
"javax.servlet.include.mapping";
+
 static final boolean STRICT_SERVLET_COMPLIANCE;
 
 static final boolean WRAP_SAME_OBJECT;
@@ -374,9 +379,7 @@ final class ApplicationDispatcher implem
 } else {
 mapping = (new 
ApplicationMapping(null)).getServletMapping();
 }
-wrequest.setAttribute(
-
org.apache.catalina.servlet4preview.RequestDispatcher.FORWARD_MAPPING,
-mapping);
+wrequest.setAttribute(FORWARD_MAPPING, mapping);
 }
 
 wrequest.setContextPath(context.getPath());
@@ -578,9 +581,7 @@ final class ApplicationDispatcher implem
 wrequest.setQueryParams(queryString);
 }
 if (mapping != null) {
-wrequest.setAttribute(
-
org.apache.catalina.servlet4preview.RequestDispatcher.INCLUDE_MAPPING,
-mapping);
+wrequest.setAttribute(INCLUDE_MAPPING, mapping);
 }
 
 wrequest.setAttribute(Globals.DISPATCHER_TYPE_ATTR,
@@ -633,8 +634,7 @@ final class ApplicationDispatcher implem
 } else {
 mapping = (new ApplicationMapping(null)).getServletMapping();
 }
-wrequest.setAttribute(
-
org.apache.catalina.servlet4preview.AsyncContext.ASYNC_MAPPING, mapping);
+wrequest.setAttribute(ASYNC_MAPPING, mapping);
 
 wrequest.setContextPath(context.getPath());
 wrequest.setRequestURI(requestURI);

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1810038=1810037=1810038=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 
Thu Sep 28 19:35:25 2017
@@ -78,13 +78,13 @@ class ApplicationHttpRequest
   RequestDispatcher.INCLUDE_SERVLET_PATH,
   RequestDispatcher.INCLUDE_PATH_INFO,
   RequestDispatcher.INCLUDE_QUERY_STRING,
-  org.apache.catalina.servlet4preview.RequestDispatcher.INCLUDE_MAPPING,
+  ApplicationDispatcher.INCLUDE_MAPPING,
   RequestDispatcher.FORWARD_REQUEST_URI,
   RequestDispatcher.FORWARD_CONTEXT_PATH,
   RequestDispatcher.FORWARD_SERVLET_PATH,
   RequestDispatcher.FORWARD_PATH_INFO,
   RequestDispatcher.FORWARD_QUERY_STRING,
-  org.apache.catalina.servlet4preview.RequestDispatcher.FORWARD_MAPPING};
+  ApplicationDispatcher.FORWARD_MAPPING};
 
 private static final int SPECIALS_FIRST_FORWARD_INDEX = 6;
 

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java?rev=1810038=1810037=1810038=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java 
Thu Sep 28 19:35:25 2017
@@ -347,7 +347,7 @@ public class TestApplicationMapping exte
 pw.println("MatchType=[" + mapping.getMappingMatch() + "]");
 pw.println("ServletName=[" + mapping.getServletName() + "]");
 ServletMapping includeMapping = (ServletMapping) req.getAttribute(
-

buildbot success in on tomcat-7-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/890

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 tomcat/tc7.0.x/trunk] 1810026
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




-
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.1

[Rainer Jung]

Am 28.09.2017 um 20:29 schrieb Rainer Jung:

Am 27.09.2017 um 20:43 schrieb Mark Thomas:

The proposed Apache Tomcat 9.0.1 release is now available for voting.

The major changes compared to the 9.0.0.M27 release are:

- Fix CVE-2017-12617

- Servlet 4.0 implementation is complete

- Add the ability to reconfigure TLS connectors at runtime without
   stopping the connector

- Stricter validation of the Host header

Along with lots of other bug fixes and improvements.


For full details, see the changelog:
http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.1/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1156/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_1/

The proposed 9.0.1 release is:
[ ] Broken - do not release
[ ] Alpha  - go ahead and release as 9.0.1
[X] Beta   - go ahead and release as 9.0.1
[ ] Stable - go ahead and release as 9.0.1


+1 to release as alpha.


I wanted to vote +1 to release as beta. "alpha" was a copy and paste 
typo. Sorry and thanks to Felix for noticing.


Regards,

Rainer

-
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.1

[Felix Schumacher]

Am 28. September 2017 20:29:19 MESZ schrieb Rainer Jung 
:
>Am 27.09.2017 um 20:43 schrieb Mark Thomas:
>> The proposed Apache Tomcat 9.0.1 release is now available for voting.
>> 
>> The major changes compared to the 9.0.0.M27 release are:
>> 
>> - Fix CVE-2017-12617
>> 
>> - Servlet 4.0 implementation is complete
>> 
>> - Add the ability to reconfigure TLS connectors at runtime without
>>stopping the connector
>> 
>> - Stricter validation of the Host header
>> 
>> Along with lots of other bug fixes and improvements.
>> 
>> 
>> For full details, see the changelog:
>>
>http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
>> 
>> It can be obtained from:
>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.1/
>> The Maven staging repo is:
>>
>https://repository.apache.org/content/repositories/orgapachetomcat-1156/
>> The svn tag is:
>> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_1/
>> 
>> The proposed 9.0.1 release is:
>> [ ] Broken - do not release
>> [ ] Alpha  - go ahead and release as 9.0.1
>> [X] Beta   - go ahead and release as 9.0.1
>> [ ] Stable - go ahead and release as 9.0.1
>
>+1 to release as alpha.

Did you mean alpha? Why did you check beta above? 

Regards, 
 Felix 
>
>Details
>===
>
>- SHA1 and MD5 OK
>- signatures OK
>- key in KEYS file
>- gz and zip for src and bin consistent
>- src consistent with svn tag
>   - except bin shell scripts are not executable in src tarball
> (not critical)
>- builds fine
>- build result looks consistent with binaries
>- no checkstyle complaints
>- no Javadoc warnings
>
>- JMX MBean Comparison with 9.0.0: no change
>
>- Unit tests: No failures
>
>Build and tests were done using Java 1.8.0_144. OS was Solaris 10
>Sparc, 
>tcnative was 1.2.14 based on APR 1.6.2 and OpenSSL 1.0.2l plus patches.
>
>Thanks for RM and regards,
>
>Rainer
>
>-
>To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>For additional commands, e-mail: dev-h...@tomcat.apache.org

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

svn commit: r1810026 - /tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java

[markt]

Author: markt
Date: Thu Sep 28 18:40:58 2017
New Revision: 1810026

URL: http://svn.apache.org/viewvc?rev=1810026=rev
Log:
Further alignment with 8.0.x and later. Fixes Linux test failures.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=1810026=1810025=1810026=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java 
Thu Sep 28 18:40:58 2017
@@ -804,6 +804,10 @@ public class FileDirContext extends Base
  * @param mustExist Must the specified resource exist?
  */
 protected File file(String name, boolean mustExist) {
+if (name.equals("/")) {
+name = "";
+}
+
 File file = new File(base, name);
 return validate(file, name, mustExist, absoluteBase, canonicalBase);
 }



-
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.1

[Rainer Jung]

Am 27.09.2017 um 20:43 schrieb Mark Thomas:

The proposed Apache Tomcat 9.0.1 release is now available for voting.

The major changes compared to the 9.0.0.M27 release are:

- Fix CVE-2017-12617

- Servlet 4.0 implementation is complete

- Add the ability to reconfigure TLS connectors at runtime without
   stopping the connector

- Stricter validation of the Host header

Along with lots of other bug fixes and improvements.


For full details, see the changelog:
http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.1/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1156/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_1/

The proposed 9.0.1 release is:
[ ] Broken - do not release
[ ] Alpha  - go ahead and release as 9.0.1
[X] Beta   - go ahead and release as 9.0.1
[ ] Stable - go ahead and release as 9.0.1


+1 to release as alpha.

Details
===

- SHA1 and MD5 OK
- signatures OK
- key in KEYS file
- gz and zip for src and bin consistent
- src consistent with svn tag
  - except bin shell scripts are not executable in src tarball
(not critical)
- builds fine
- build result looks consistent with binaries
- no checkstyle complaints
- no Javadoc warnings

- JMX MBean Comparison with 9.0.0: no change

- Unit tests: No failures

Build and tests were done using Java 1.8.0_144. OS was Solaris 10 Sparc, 
tcnative was 1.2.14 based on APR 1.6.2 and OpenSSL 1.0.2l plus patches.


Thanks for RM and regards,

Rainer

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

svn commit: r1810014 - in /tomcat/tc7.0.x/trunk/java/org/apache/naming/resources: FileDirContext.java VirtualDirContext.java

[markt]

Author: markt
Date: Thu Sep 28 17:20:38 2017
New Revision: 1810014

URL: http://svn.apache.org/viewvc?rev=1810014=rev
Log:
Tab police

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=1810014=1810013=1810014=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java 
Thu Sep 28 17:20:38 2017
@@ -810,7 +810,7 @@ public class FileDirContext extends Base
 
 
 protected File validate(File file, String name, boolean mustExist, String 
absoluteBase,
-   String canonicalBase) {
+String canonicalBase) {
 
 // If the requested names ends in '/', the Java File API will return a
 // matching file if one exists. This isn't what we want as it is not

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java?rev=1810014=1810013=1810014=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java 
Thu Sep 28 17:20:38 2017
@@ -330,9 +330,9 @@ public class VirtualDirContext extends F
 return null;
 }
 }
-
-
+
+
 protected File validate(File file, String name, boolean mustExist, String 
absoluteBase) {
-   return validate(file, name, mustExist, normalize(absoluteBase), 
absoluteBase);
+return validate(file, name, mustExist, normalize(absoluteBase), 
absoluteBase);
 }
 }



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

[jira] [Created] (MTOMCAT-312) Execution Reporting Duplicate

[Brian Hood (JIRA)]

Brian Hood created MTOMCAT-312:
--

 Summary: Execution Reporting Duplicate
 Key: MTOMCAT-312
 URL: https://issues.apache.org/jira/browse/MTOMCAT-312
 Project: Apache Tomcat Maven Plugin
  Issue Type: Bug
  Components: tomcat7
Affects Versions: 2.2
Reporter: Brian Hood
Assignee: Olivier Lamy (*$^¨%`£)
Priority: Blocker


Hi All,

The Id on each of these is different but i get an error saying a have a 
duplicate id.

Here is what i added to the plugins section of my pom file.


  org.apache.tomcat.maven
  tomcat7-maven-plugin
  2.2
   
   
 
 
   
 execution1
 default
 /helloworld
 true
 http://test1:8080/manager/text
 15
 tomcat
 ommited
  
 
 
 
   
 execution2
 default
 /helloworld
 true
 http://test2:8080/manager/text
 15
 tomcat
 ommited
   
 
 
   
  
 

Error 

[ERROR] 
'build.plugins.plugin[org.apache.tomcat.maven:tomcat7-maven-plugin].executions.execution.id'
 must be unique but found duplicate execution with id default @ line 55, column 
21
[WARNING] Reporting configuration should be done in  section, not in 
maven-site-plugin  as reportPlugins parameter. @ line 89, column 
24

at 
org.apache.maven.project.DefaultProjectBuilder.build(DefaultProjectBuilder.java:382)
at 
org.apache.maven.graph.DefaultGraphBuilder.collectProjects(DefaultGraphBuilder.java:400)
at 
org.apache.maven.graph.DefaultGraphBuilder.getProjectsForMavenReactor(DefaultGraphBuilder.java:391)
at 
org.apache.maven.graph.DefaultGraphBuilder.build(DefaultGraphBuilder.java:78)
at org.apache.maven.DefaultMaven.buildGraph(DefaultMaven.java:511)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:221)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:194)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:107)
at org.apache.maven.cli.MavenCli.execute(MavenCli.java:993)
at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:345)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:191)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at 
org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
at 
org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
at 
org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
at 
org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)

 



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

svn commit: r1809996 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview: AsyncContext.java GenericFilter.java RequestDispatcher.java http/HttpFilter.java

[markt]

Author: markt
Date: Thu Sep 28 13:53:26 2017
New Revision: 1809996

URL: http://svn.apache.org/viewvc?rev=1809996=rev
Log:
Start to deprecate the Servlet 4.0 preview API

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/AsyncContext.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/GenericFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/RequestDispatcher.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpFilter.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/AsyncContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/AsyncContext.java?rev=1809996=1809995=1809996=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/AsyncContext.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/AsyncContext.java 
Thu Sep 28 13:53:26 2017
@@ -16,6 +16,15 @@
  */
 package org.apache.catalina.servlet4preview;
 
+/**
+ * @deprecated This class is not included in Tomcat 9 onwards. Users of this
+ * class should normally upgrade to Tomcat 9 and switch to the
+ * Servlet 4.0 API. If the functionality is required in Tomcat 8.5,
+ * then the Tomcat implementation classes should be used directly.
+ * This class may be removed from Tomcat 8.5.x some time after 30
+ * September 2018.
+ */
+@Deprecated
 public interface AsyncContext extends javax.servlet.AsyncContext {
 
 public static final String ASYNC_MAPPING = "javax.servlet.async.mapping";

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/GenericFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/GenericFilter.java?rev=1809996=1809995=1809996=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/GenericFilter.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/GenericFilter.java
 Thu Sep 28 13:53:26 2017
@@ -24,6 +24,15 @@ import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 
+/**
+ * @deprecated This class is not included in Tomcat 9 onwards. Users of this
+ * class should normally upgrade to Tomcat 9 and switch to the
+ * Servlet 4.0 API. If the functionality is required in Tomcat 8.5,
+ * then the Tomcat implementation classes should be used directly.
+ * This class may be removed from Tomcat 8.5.x some time after 30
+ * September 2018.
+ */
+@Deprecated
 public abstract class GenericFilter implements Filter, FilterConfig, 
Serializable {
 
 private static final long serialVersionUID = 1L;

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/RequestDispatcher.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/RequestDispatcher.java?rev=1809996=1809995=1809996=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/RequestDispatcher.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/RequestDispatcher.java
 Thu Sep 28 13:53:26 2017
@@ -18,7 +18,15 @@ package org.apache.catalina.servlet4prev
 
 /**
  * Provides early access to some parts of the proposed Servlet 4.0 API.
+ *
+ * @deprecated This class is not included in Tomcat 9 onwards. Users of this
+ * class should normally upgrade to Tomcat 9 and switch to the
+ * Servlet 4.0 API. If the functionality is required in Tomcat 8.5,
+ * then the Tomcat implementation classes should be used directly.
+ * This class may be removed from Tomcat 8.5.x some time after 30
+ * September 2018.
  */
+@Deprecated
 public interface RequestDispatcher extends javax.servlet.RequestDispatcher {
 
 /**

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpFilter.java?rev=1809996=1809995=1809996=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpFilter.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpFilter.java
 Thu Sep 28 13:53:26 2017
@@ -26,6 +26,15 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.catalina.servlet4preview.GenericFilter;
 
+/**
+ * @deprecated This class is not included in Tomcat 9 onwards. Users of this
+ * class should normally upgrade 

Re: Java 9 and endorsed in TC 7+8.0 [Was: Tomcat and Java 9]

[Rainer Jung]

Am 27.09.2017 um 22:50 schrieb Mark Thomas:

On 27/09/17 14:20, Rainer Jung wrote:


I drafted a patch available at

http://home.apache.org/~rjung/patches/tc8-java-9-noendorsed.patch

for TC 8.0.x. I can't really test on Windows.

Basic ingredients:

- For bat and sh do not try to remove the flag from the Java command,
and instead use a non existing system property ignore.endorsed.dirs
instead of java.endorsed.dirs if the user has not supplied a non-empty
JAVA_ENDORSED_DIRS and the endorsed sub directory of CATALINA_HOME does
not exist. I also did not replace the full flag including the value with
a variable to reduce chances of getting whitespace issues. It sounded
easiest to simply make the property name variable.

- I refrained from Java version checking in the scripts. I think it is
better to not set endorsed if the user has not demanded it and the
directory wasn't created. And if the user demands it or the dir exists,
set it and fail on Java 9 so that it is clear that people have to clean
their installation up.

- Removed the endorsed flag from the commandline that the NSI installer
registers for the service. This is mostly because I don't know enough
about how to add logic to the NSI.

I have not directly committed it, because script file changes always
carry some potential of breaking stuff and I want to wait until the next
release is done.

It would be great if people could do some testing on their platforms.


I like the approach. It is better that what I did in trunk which was to
simply remove it entirely.

I'll port your patch to 9.0.x and test it.


I provided a patch candidate at

http://home.apache.org/~rjung/patches/tc9-java-9-noendorsed.patch

It is mostly reverting r1653475 and then applying my TC 8 patch.

Regards,

Rainer


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

svn commit: r1809993 - /tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt

[markt]

Author: markt
Date: Thu Sep 28 13:39:53 2017
New Revision: 1809993

URL: http://svn.apache.org/viewvc?rev=1809993=rev
Log:
JSP schema is duplicated

Modified:
tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt

Modified: tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt?rev=1809993=1809992=1809993=diff
==
--- tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt (original)
+++ tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt Thu Sep 28 13:39:53 2017
@@ -102,6 +102,7 @@ output/classes/javax/servlet/resources/j
 output/classes/javax/servlet/resources/javaee_web_services_1_3.xsd
 output/classes/javax/servlet/resources/javaee_web_services_client_1_2.xsd
 output/classes/javax/servlet/resources/javaee_web_services_client_1_3.xsd
+output/classes/javax/servlet/resources/jsp_2_2.xsd
 output/classes/javax/servlet/resources/web-app_3_0.xsd
 output/classes/javax/servlet/resources/web-common_3_0.xsd
 output/classes/javax/servlet/resources/web-fragment_3_0.xsd



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

svn commit: r1809992 - in /tomcat/tc7.0.x/trunk/java/org/apache/naming/resources: FileDirContext.java VirtualDirContext.java

[markt]

Author: markt
Date: Thu Sep 28 13:30:46 2017
New Revision: 1809992

URL: http://svn.apache.org/viewvc?rev=1809992=rev
Log:
Fix failing tests on Windows

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=1809992=1809991=1809992=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java 
Thu Sep 28 13:30:46 2017
@@ -805,11 +805,12 @@ public class FileDirContext extends Base
  */
 protected File file(String name, boolean mustExist) {
 File file = new File(base, name);
-return validate(file, name, mustExist, absoluteBase);
+return validate(file, name, mustExist, absoluteBase, canonicalBase);
 }
 
 
-protected File validate(File file, String name, boolean mustExist, String 
absoluteBase) {
+protected File validate(File file, String name, boolean mustExist, String 
absoluteBase,
+   String canonicalBase) {
 
 // If the requested names ends in '/', the Java File API will return a
 // matching file if one exists. This isn't what we want as it is not
@@ -850,8 +851,8 @@ public class FileDirContext extends Base
 // Ensure that the file is not outside the fileBase. This should not be
 // possible for standard requests (the request is normalized early in
 // the request processing) but might be possible for some access via 
the
-// Servlet API (RequestDispatcheretc.) therefore these checks are
-// retained as an additional safety measure absoluteBase has been
+// Servlet API (RequestDispatcher etc.) therefore these checks are
+// retained as an additional safety measure. absoluteBase has been
 // normalized so absPath needs to be normalized as well.
 String absPath = normalize(file.getAbsolutePath());
 if ((absoluteBase.length() > absPath.length())) {

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java?rev=1809992=1809991=1809992=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java 
Thu Sep 28 13:30:46 2017
@@ -330,4 +330,9 @@ public class VirtualDirContext extends F
 return null;
 }
 }
+
+
+protected File validate(File file, String name, boolean mustExist, String 
absoluteBase) {
+   return validate(file, name, mustExist, normalize(absoluteBase), 
absoluteBase);
+}
 }



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

svn commit: r1809978 - in /tomcat/tc7.0.x/trunk/java/org/apache/naming/resources: FileDirContext.java JrePlatform.java

[markt]

Author: markt
Date: Thu Sep 28 11:54:25 2017
New Revision: 1809978

URL: http://svn.apache.org/viewvc?rev=1809978=rev
Log:
First pass at aligning 7.0.x checks with 8.0.x

Added:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/JrePlatform.java
  - copied, changed from r1809922, 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=1809978=1809977=1809978=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java 
Thu Sep 28 11:54:25 2017
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.naming.resources;
 
 import java.io.File;
@@ -97,6 +95,8 @@ public class FileDirContext extends Base
  */
 protected String absoluteBase = null;
 
+private String canonicalBase = null;
+
 
 /**
  * Allow linking.
@@ -106,7 +106,6 @@ public class FileDirContext extends Base
 
 // - Properties
 
-
 /**
  * Set the document root.
  *
@@ -137,14 +136,14 @@ public class FileDirContext extends Base
 throw new 
IllegalArgumentException(sm.getString("fileResources.base", docBase));
 }
 
+this.absoluteBase = normalize(base.getAbsolutePath());
+
 // absoluteBase also needs to be normalized. Using the canonical path 
is
 // the simplest way of doing this.
 try {
-this.absoluteBase = base.getCanonicalPath();
+this.canonicalBase = base.getCanonicalPath();
 } catch (IOException e) {
-log.warn(sm.getString("fileResources.canonical.fail", 
base.getPath()));
-// Fall back to the absolute path
-this.absoluteBase = base.getAbsolutePath();
+throw new IllegalArgumentException(e);
 }
 super.setDocBase(docBase);
 }
@@ -827,8 +826,15 @@ public class FileDirContext extends Base
 
 // If allow linking is enabled, files are not limited to being located
 // under the fileBase so all further checks are disabled.
-if (allowLinking)
+if (allowLinking) {
 return file;
+}
+
+// Additional Windows specific checks to handle known problems with
+// File.getCanonicalPath()
+if (JrePlatform.IS_WINDOWS && isInvalidWindowsFilename(name)) {
+return null;
+}
 
 // Check that this file is located under the web application root
 String canPath = null;
@@ -837,17 +843,16 @@ public class FileDirContext extends Base
 } catch (IOException e) {
 // Ignore
 }
-if (canPath == null || !canPath.startsWith(absoluteBase)) {
+if (canPath == null || !canPath.startsWith(canonicalBase)) {
 return null;
 }
 
 // Ensure that the file is not outside the fileBase. This should not be
 // possible for standard requests (the request is normalized early in
 // the request processing) but might be possible for some access via 
the
-// Servlet API (RequestDispatcher, HTTP/2 push etc.) therefore these
-// checks are retained as an additional safety measure
-// absoluteBase has been normalized so absPath needs to be normalized 
as
-// well.
+// Servlet API (RequestDispatcheretc.) therefore these checks are
+// retained as an additional safety measure absoluteBase has been
+// normalized so absPath needs to be normalized as well.
 String absPath = normalize(file.getAbsolutePath());
 if ((absoluteBase.length() > absPath.length())) {
 return null;
@@ -857,7 +862,7 @@ public class FileDirContext extends Base
 // was not part of the requested path and the remaining check only
 // applies to the request path
 absPath = absPath.substring(absoluteBase.length());
-canPath = canPath.substring(absoluteBase.length());
+canPath = canPath.substring(canonicalBase.length());
 
 // Case sensitivity check
 // The normalized requested path should be an exact match the 
equivalent
@@ -870,9 +875,8 @@ public class FileDirContext extends Base
 //
 // absPath is normalized so canPath needs to be normalized as well
 // Can't normalize canPath earlier as canonicalBase is not normalized
-canPath = normalize(canPath);
-if (absPath.length() == 0) {
-absPath = "/";
+if 

Re: [VOTE] Release Apache Tomcat 8.5.23

[Mark Thomas]

On 28/09/17 12:21, Mark Thomas wrote:
> The proposed Apache Tomcat 8.5.23 release is now available for voting.
> 
> The major changes compared to the 8.5.21 release are:
> 
> - Fix CVE-2017-12617
> 
> - Add ExtractingRoot, a new WebResourceRoot implementation that extracts
>   JARs to the work directory for improved performance when deploying
>   packed WAR files.
> 
> Along with lots of other bug fixes and improvements.
> 
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.23/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1157/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_23/
> 
> The proposed 8.5.23 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.23

Unit tests pass for NIO, NIO2 and APR/native (with 1.2.14) on Windows,
OSX and Linux.

Mark

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

[VOTE] Release Apache Tomcat 8.5.23

[Mark Thomas]

The proposed Apache Tomcat 8.5.23 release is now available for voting.

The major changes compared to the 8.5.21 release are:

- Fix CVE-2017-12617

- Add ExtractingRoot, a new WebResourceRoot implementation that extracts
  JARs to the work directory for improved performance when deploying
  packed WAR files.

Along with lots of other bug fixes and improvements.


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.23/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1157/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_23/

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

-
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

[buildbot]

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

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 tomcat/tc7.0.x/trunk] 1809968
Blamelist: markt

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

Re: [VOTE] Release Apache Tomcat 9.0.1

[Rémy Maucherat]

On Wed, Sep 27, 2017 at 8:43 PM, Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.1 release is now available for voting.
>
> The major changes compared to the 9.0.0.M27 release are:
>
> - Fix CVE-2017-12617
>
> - Servlet 4.0 implementation is complete
>
> - Add the ability to reconfigure TLS connectors at runtime without
>   stopping the connector
>
> - Stricter validation of the Host header
>
> Along with lots of other bug fixes and improvements.
>
>
> For full details, see the changelog:
> http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.1/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1156/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_1/
>
> The proposed 9.0.1 release is:
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release as 9.0.1
> [X] Beta   - go ahead and release as 9.0.1
> [ ] Stable - go ahead and release as 9.0.1
>
> Rémy

svn commit: r22025 - in /dev/tomcat/tomcat-8/v8.5.23: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Author: markt
Date: Thu Sep 28 10:53:19 2017
New Revision: 22025

Log:
Upload 8.5.23 for voting

Added:
dev/tomcat/tomcat-8/v8.5.23/
dev/tomcat/tomcat-8/v8.5.23/KEYS
dev/tomcat/tomcat-8/v8.5.23/README.html
dev/tomcat/tomcat-8/v8.5.23/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.23/bin/
dev/tomcat/tomcat-8/v8.5.23/bin/README.html
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-deployer.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-deployer.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-deployer.zip.md5
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-deployer.zip.sha1
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-fulldocs.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-windows-x64.zip.md5
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-windows-x64.zip.sha1
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-windows-x86.zip.md5
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23-windows-x86.zip.sha1
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.exe   (with props)
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.exe.asc
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.exe.md5
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.exe.sha1
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.zip   (with props)
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.zip.asc
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.zip.md5
dev/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.zip.sha1
dev/tomcat/tomcat-8/v8.5.23/bin/embed/
dev/tomcat/tomcat-8/v8.5.23/bin/embed/apache-tomcat-8.5.23-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.23/bin/embed/apache-tomcat-8.5.23-embed.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.23/bin/embed/apache-tomcat-8.5.23-embed.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.23/bin/embed/apache-tomcat-8.5.23-embed.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.23/bin/embed/apache-tomcat-8.5.23-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.23/bin/embed/apache-tomcat-8.5.23-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.23/bin/embed/apache-tomcat-8.5.23-embed.zip.md5
dev/tomcat/tomcat-8/v8.5.23/bin/embed/apache-tomcat-8.5.23-embed.zip.sha1
dev/tomcat/tomcat-8/v8.5.23/bin/extras/
dev/tomcat/tomcat-8/v8.5.23/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-8/v8.5.23/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.23/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-8/v8.5.23/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-8/v8.5.23/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.23/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.23/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-8/v8.5.23/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-8/v8.5.23/src/
dev/tomcat/tomcat-8/v8.5.23/src/apache-tomcat-8.5.23-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.23/src/apache-tomcat-8.5.23-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.23/src/apache-tomcat-8.5.23-src.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.23/src/apache-tomcat-8.5.23-src.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.23/src/apache-tomcat-8.5.23-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.23/src/apache-tomcat-8.5.23-src.zip.asc
dev/tomcat/tomcat-8/v8.5.23/src/apache-tomcat-8.5.23-src.zip.md5
dev/tomcat/tomcat-8/v8.5.23/src/apache-tomcat-8.5.23-src.zip.sha1

Added: dev/tomcat/tomcat-8/v8.5.23/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.23/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.23/KEYS Thu Sep 28 10:53:19 2017
@@ -0,0 +1,616 @@
+This file contains the PGP keys of various Apache 

svn commit: r1809972 - in /tomcat/tc8.5.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Sep 28 10:49:22 2017
New Revision: 1809972

URL: http://svn.apache.org/viewvc?rev=1809972=rev
Log:
Bump version number for next dev cycle

Modified:
tomcat/tc8.5.x/trunk/build.properties.default
tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.5.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1809972=1809971=1809972=diff
==
--- tomcat/tc8.5.x/trunk/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/build.properties.default Thu Sep 28 10:49:22 2017
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=23
+version.build=24
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default?rev=1809972=1809971=1809972=diff
==
--- tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Thu Sep 28 10:49:22 
2017
@@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.23
+maven.asf.release.deploy.version=8.5.24
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1809972=1809971=1809972=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Sep 28 10:49:22 2017
@@ -44,7 +44,9 @@
   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

svn commit: r1809969 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_23: ./ build.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Sep 28 10:20:08 2017
New Revision: 1809969

URL: http://svn.apache.org/viewvc?rev=1809969=rev
Log:
Tag 8.5.23

Added:
tomcat/tc8.5.x/tags/TOMCAT_8_5_23/   (props changed)
  - copied from r1809968, tomcat/tc8.5.x/trunk/
Modified:
tomcat/tc8.5.x/tags/TOMCAT_8_5_23/build.properties.default
tomcat/tc8.5.x/tags/TOMCAT_8_5_23/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_23/
--
bugtraq:append = false

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_23/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_23/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Thu Sep 28 10:20:08 2017
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_23/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_23/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_23/
--
--- svn:ignore (added)
+++ svn:ignore Thu Sep 28 10:20:08 2017
@@ -0,0 +1,8 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml
+temp

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_23/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 28 10:20:08 2017
@@ -0,0 +1,2 @@
+/tomcat/tc8.0.x/trunk:1809644
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747
 
536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1
 

svn commit: r1809968 - in /tomcat/tc7.0.x/trunk: ./ res/META-INF/tomcat7-websocket.jar/services/ res/rat/ test/webapp-3.0/ webapps/ROOT/ webapps/docs/ webapps/docs/images/ webapps/host-manager/images/

[markt]

Author: markt
Date: Thu Sep 28 10:18:12 2017
New Revision: 1809968

URL: http://svn.apache.org/viewvc?rev=1809968=rev
Log:
Review current RAT failures
Add headers to files that should have them.
Exclude files where a header cannot be added.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.servlet.ServletContainerInitializer

tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.websocket.ContainerProvider

tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt
tomcat/tc7.0.x/trunk/test/webapp-3.0/index.html
tomcat/tc7.0.x/trunk/webapps/ROOT/asf-logo-wide.svg
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/images/asf-logo.svg
tomcat/tc7.0.x/trunk/webapps/host-manager/images/asf-logo.svg
tomcat/tc7.0.x/trunk/webapps/manager/images/asf-logo.svg

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 28 10:18:12 2017
@@ -1,3 +1,3 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 

Re: [PROPOSAL] Deprecate and eventually remove the o.a.c.servlet4preview package in 8.5.x

[Martin Grigorov]

On Thu, Sep 28, 2017 at 12:00 PM, Mark Thomas  wrote:

> On 28/09/17 06:56, Martin Grigorov wrote:
> > Hi,
> >
> > On Thu, Sep 28, 2017 at 8:45 AM, Huxing Zhang <
> huxing@alibaba-inc.com>
> > wrote:
> >
> >> +1 to remove the preview packages.
> >>
> >> --
> >> Mark Thomas 
> >> 2017 Sep 28 (Thu) 03:08
> >> Tomcat Developers List 
> >> [PROPOSAL] Deprecate and eventually remove the o.a.c.servlet4preview
> >> package in 8.5.x
> >>
> >>
> >> All,
> >>
> >> I'd like to propose removing this for the following reasons:
> >>
> >> 1. Now the Servlet 4.0 spec is final, users can use Tomcat 9 for Servlet
> >> 4.0 features.
> >>
> >> 2. The preview is not complete and may be out of date in places.
> >>
> >> 3. I'm not aware of any user feedback so usage seems to be very low.
> >>
> >> My proposal is to deprecate it now with the intention to remove it after
> >> a year.
> >>
> >> As an alternative is deprecate it now with the intention to remove it 1
> >> year after the first stable 9.0.x release.
> >>
> >> Thoughts? Comments? Questions?
> >>
> >
> > We use the preview in Apache Wicket:
> > https://github.com/apache/wicket/blob/77d8bf32d2063ac0174fc383da81ac
> 2d6bcc482b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/
> java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java#L40
> >
> > But we can rework it!
>
> Great to know that someone is using it.
>
> It looks like reworking that could be as simple as switching to the
> concrete implementation (ApplicationPushBuilder) rather than the preview
> interface.
>

Wicket 8.0.0-M8 will use the ApplicationPushBuilder directly!

https://git1-us-west.apache.org/repos/asf?p=wicket.git;a=commitdiff;h=35a7d6d5;hp=77d8bf32d2063ac0174fc383da81ac2d6bcc482b

Regards,
Martin


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

Re: [PROPOSAL] Deprecate and eventually remove the o.a.c.servlet4preview package in 8.5.x

[Mark Thomas]

On 28/09/17 06:56, Martin Grigorov wrote:
> Hi,
> 
> On Thu, Sep 28, 2017 at 8:45 AM, Huxing Zhang 
> wrote:
> 
>> +1 to remove the preview packages.
>>
>> --
>> Mark Thomas 
>> 2017 Sep 28 (Thu) 03:08
>> Tomcat Developers List 
>> [PROPOSAL] Deprecate and eventually remove the o.a.c.servlet4preview
>> package in 8.5.x
>>
>>
>> All,
>>
>> I'd like to propose removing this for the following reasons:
>>
>> 1. Now the Servlet 4.0 spec is final, users can use Tomcat 9 for Servlet
>> 4.0 features.
>>
>> 2. The preview is not complete and may be out of date in places.
>>
>> 3. I'm not aware of any user feedback so usage seems to be very low.
>>
>> My proposal is to deprecate it now with the intention to remove it after
>> a year.
>>
>> As an alternative is deprecate it now with the intention to remove it 1
>> year after the first stable 9.0.x release.
>>
>> Thoughts? Comments? Questions?
>>
> 
> We use the preview in Apache Wicket:
> https://github.com/apache/wicket/blob/77d8bf32d2063ac0174fc383da81ac2d6bcc482b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java#L40
> 
> But we can rework it!

Great to know that someone is using it.

It looks like reworking that could be as simple as switching to the
concrete implementation (ApplicationPushBuilder) rather than the preview
interface.

Mark

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