[GitHub] [tomcat-maven-plugin] glendagonzales closed pull request #38: PDS-3713 bump tomcat to 9.0.69

[GitBox]

glendagonzales closed pull request #38: PDS-3713 bump tomcat to 9.0.69
URL: https://github.com/apache/tomcat-maven-plugin/pull/38


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[GitHub] [tomcat-maven-plugin] glendagonzales opened a new pull request, #38: PDS-3713 bump tomcat to 9.0.69

[GitBox]

glendagonzales opened a new pull request, #38:
URL: https://github.com/apache/tomcat-maven-plugin/pull/38

   [PDS-3713](https://keap.atlassian.net/browse/PDS-3713)
   
   Upgrade to tomcat 9.0.69 for security reasons.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

Re: [VOTE] Release Apache Tomcat 8.5.84

[Han Li]

I think that I encounter a problem, shown below:

org.apache.jasper.JasperException: Unable to compile class for JSP: 

An error occurred at line: [17] in the jsp file: [/jsp/include/foo.jsp]
System cannot be resolved
14:   See the License for the specific language governing permissions and
15:   limitations under the License.
16: 
17: --%><%= System.currentTimeMillis() %>


Stacktrace:

org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHandler.java:102)

org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.java:213)

org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:589)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:380)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:350)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:334)

org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:597)

org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:398)
org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:383)
org.apache.jasper.servlet.JspServlet.service(JspServlet.java:331)
javax.servlet.http.HttpServlet.service(HttpServlet.java:765)
org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)

org.apache.catalina.filters.HttpHeaderSecurityFilter.doFilter(HttpHeaderSecurityFilter.java:126)

org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:109)

Ant test show passes, but there are problems. (I downloaded 8.5.83 from the 
official website, then accessed example webapp
 and also have this problem). I don’t know JDT, but I tested again by upgrading 
ecj version to 4.25 and this 
problem was solved.


Han

> 2022年11月17日 00:03，Christopher Schultz  写道：
> 
> The proposed Apache Tomcat 8.5.84 release is now available for voting.
> 
> The notable changes compared to 8.5.83 are:
> 
> - Fix concurrency issue in evaluation of expression language containing
>   lambda expressions.
> 
> - Correct the date format used with the expires attribute of HTTP
>   cookies. A single space rather than a single dash should be used to
>   separate the day, month and year components to be compliant with RFC
>   6265.
> 
> - Update to Commons Daemon 1.3.2.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.84/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1407
> 
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.84/
> 079a46c1c1e56b1743e752a44450469690880a56
> 
> The proposed 8.5.84 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 8.5.84 (stable)
> 
> -
> 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
> 


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

Re: [tomcat] branch main updated: URI(String) can also throw an IAE

[Han Li]

> 2022年11月17日 00:19，ma...@apache.org 写道：
> 
> This is an automated email from the ASF dual-hosted git repository.
> 
> markt pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/main by this push:
> new a52538baad URI(String) can also throw an IAE
> a52538baad is described below
> 
> commit a52538baadbd355837526f00f3ecae0c33d23660
> Author: Mark Thomas 
> AuthorDate: Wed Nov 16 16:19:02 2022 +
> 
>URI(String) can also throw an IAE
> ---
> java/org/apache/catalina/startup/Bootstrap.java | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
> b/java/org/apache/catalina/startup/Bootstrap.java
> index 2f8999a829..461d54b304 100644
> --- a/java/org/apache/catalina/startup/Bootstrap.java
> +++ b/java/org/apache/catalina/startup/Bootstrap.java
> @@ -179,7 +179,7 @@ public final class Bootstrap {
> URL url = uri.toURL();
> repositories.add(new Repository(repository, 
> RepositoryType.URL));
> continue;
> -} catch (MalformedURLException | URISyntaxException e) {
> +} catch (IllegalArgumentException | MalformedURLException | 
> URISyntaxException e) {
I think that we can use URI#create factory method instead of manually invoke 
constructor so that we need only caught IAE.

Han
> // Ignore
> }
> 
> 
> 
> -
> 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

[tomcat] branch 9.0.x updated: fix issue id in changelog

[lihan]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new e54f9221ad fix issue id in changelog
e54f9221ad is described below

commit e54f9221ad26cf2db842b62adfa2013ffa78acbd
Author: Clément Guillaume 
AuthorDate: Wed Nov 16 10:58:02 2022 -0800

fix issue id in changelog
---
 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 35eec47201..10e83b3e75 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -130,7 +130,7 @@
   
 
   
-66029: Add a configuration option to allow bloom filters 
used
+66209: Add a configuration option to allow bloom filters 
used
 to index JAR files to be retained for the lifetime of the web
 application. Prior to this addition, the indexes were always flushed by
 the periodic calls to WebResourceRoot.gc(). As part of 
this


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

[tomcat] branch 10.1.x updated: fix issue id in changelog

[lihan]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new dc0f2553de fix issue id in changelog
dc0f2553de is described below

commit dc0f2553deae9c37e546a5ab811601028ca83d1f
Author: Clément Guillaume 
AuthorDate: Wed Nov 16 10:58:02 2022 -0800

fix issue id in changelog
---
 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 22261bf43e..26d06bb7bd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,7 +135,7 @@
   
 
   
-66029: Add a configuration option to allow bloom filters 
used
+66209: Add a configuration option to allow bloom filters 
used
 to index JAR files to be retained for the lifetime of the web
 application. Prior to this addition, the indexes were always flushed by
 the periodic calls to WebResourceRoot.gc(). As part of 
this


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

[tomcat] branch main updated: fix issue id in changelog

[lihan]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 30383129d2 fix issue id in changelog
30383129d2 is described below

commit 30383129d229f4831a8c551b597a4f1e11908f2c
Author: Clément Guillaume 
AuthorDate: Wed Nov 16 10:58:02 2022 -0800

fix issue id in changelog
---
 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 753b22eea8..0b1f08c1ce 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,7 +116,7 @@
   
 
   
-66029: Add a configuration option to allow bloom filters 
used
+66209: Add a configuration option to allow bloom filters 
used
 to index JAR files to be retained for the lifetime of the web
 application. Prior to this addition, the indexes were always flushed by
 the periodic calls to WebResourceRoot.gc(). As part of 
this


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

[GitHub] [tomcat] aooohan merged pull request #570: fix issue id in changelog

[GitBox]

aooohan merged PR #570:
URL: https://github.com/apache/tomcat/pull/570


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[Bug 66350] tomcat-websocket 9.0.69, pom.xml can not download from maven central

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66350

--- Comment #3 from songyeon0...@gmail.com ---
(In reply to Remy Maucherat from comment #2)
> I don't understand what's going on though: the file is there ...
> https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-websocket/9.0.69/

I can check the 'tomcat-websocket-9.0.69.pom' file in the list on the page.
(https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-websocket/9.0.69/)
However, 404 error occurs,when i click the 'tomcat-websocket-9.0.69.pom' file
on the page.
also, when downloading through maven, pom file download fails.(i can download
jar file)

when i check 9.0.68 version, i can see pom file in browser
(https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-websocket/9.0.68/tomcat-websocket-9.0.68.pom)

I am inquiring here because I do not know who is deploying tomcat-websocket in
Maven Central.

-- 
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 66349] Why does LockOutRealm not support CredentialHandler?

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66349

Christopher Schultz  changed:

   What|Removed |Added

 Resolution|WORKSFORME  |INVALID

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

Re: [VOTE] Release Apache Tomcat 8.5.84

[Christopher Schultz]

All,

On 11/16/22 11:03, Christopher Schultz wrote:

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

The notable changes compared to 8.5.83 are:

- Fix concurrency issue in evaluation of expression language containing
    lambda expressions.

- Correct the date format used with the expires attribute of HTTP
    cookies. A single space rather than a single dash should be used to
    separate the day, month and year components to be compliant with RFC
    6265.

- Update to Commons Daemon 1.3.2.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.84/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1407

The tag is:
https://github.com/apache/tomcat/tree/8.5.84/
079a46c1c1e56b1743e752a44450469690880a56

The proposed 8.5.84 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 8.5.84 (stable)


+1 to release

Works on a vanilla servlet-based application in a development 
environment. Tests pass on Linux and Windows, with some exceptions:


1. On Microsoft Windows 10:

 * javax.servlet.http.TestHttpServletDoHeadValidWrite513.NIO.txt

This appears to be a problem with either the environment or the test case.

2. On Debian Linux:

 * org.apache.tomcat.util.net.jsse.TestPEMFile.APR.txt
 * org.apache.tomcat.util.net.jsse.TestPEMFile.NIO.txt
 * org.apache.tomcat.util.net.jsse.TestPEMFile.NIO2.txt

Testcase: testKeyEncryptedPkcs8 took 0.003 sec
Caused an ERROR
ObjectIdentifier() -- data isn't an object ID (tag = 48)
java.io.IOException: ObjectIdentifier() -- data isn't an object ID (tag 
= 48)


The problem is with my Java version which is missing support for a 
certain aspect of some key stores.


Details:

* Environment
*  Java (build): openjdk version "1.8.0_292" OpenJDK Runtime 
Environment (build 1.8.0_292-8u292-b10-0+deb9u1-b10) OpenJDK 64-Bit 
Server VM (build 25.292-b10, mixed mode)
*  Java (test): openjdk version "1.8.0_292" OpenJDK Runtime 
Environment (build 1.8.0_292-8u292-b10-0+deb9u1-b10) OpenJDK 64-Bit 
Server VM (build 25.292-b10, mixed mode)

*  OS:   Linux 5.10.0-17-amd64 x86_64
*  cc:   cc (Debian 10.2.1-6) 10.2.1 20210110
*  make: GNU Make 4.3
*  OpenSSL:  OpenSSL 1.1.1 11 Sep 2018
*  APR:  1.7.0
*
* Valid SHA-512 signature for apache-tomcat-8.5.84.zip
* Valid GPG signature for apache-tomcat-8.5.84.zip
* Valid SHA-512 signature for apache-tomcat-8.5.84.tar.gz
* Valid GPG signature for apache-tomcat-8.5.84.tar.gz
* Valid SHA-512 signature for apache-tomcat-8.5.84.exe
* Valid GPG signature for apache-tomcat-8.5.84.exe
* Valid Windows Digital Signature for apache-tomcat-8.5.84.exe
* Valid SHA512 signature for apache-tomcat-8.5.84-src.zip
* Valid GPG signature for apache-tomcat-8.5.84-src.zip
* Valid SHA512 signature for apache-tomcat-8.5.84-src.tar.gz
* Valid GPG signature for apache-tomcat-8.5.84-src.tar.gz
*
* Binary Zip and tarball: Same
* Source Zip and tarball: Same
*
* Building dependencies returned: 0
* tcnative builds cleanly
* Tomcat builds cleanly
* Junit Tests: FAILED
*
* Tests that failed:
* org.apache.tomcat.util.net.jsse.TestPEMFile.APR.txt
* org.apache.tomcat.util.net.jsse.TestPEMFile.NIO.txt
* org.apache.tomcat.util.net.jsse.TestPEMFile.NIO2.txt

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

[tomcat] branch main updated: Final URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 77f98c1c3c Final URL -> URI refactoring
77f98c1c3c is described below

commit 77f98c1c3c6397066ed9be01fad3834c71cc3a0a
Author: Mark Thomas 
AuthorDate: Wed Nov 16 19:19:43 2022 +

Final URL -> URI refactoring

These require API changes so no plans to back-port.
---
 .../AbstractSingleArchiveResourceSet.java|  3 +--
 .../catalina/webresources/JarWarResourceSet.java |  3 +--
 java/org/apache/tomcat/util/scan/JarFactory.java | 14 ++
 .../apache/tomcat/util/buf/TesterUriUtilBase.java| 20 ++--
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git 
a/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java 
b/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
index 5edf114f77..688e2128ae 100644
--- 
a/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
+++ 
b/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
@@ -18,7 +18,6 @@ package org.apache.catalina.webresources;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
@@ -144,7 +143,7 @@ public abstract class AbstractSingleArchiveResourceSet 
extends AbstractArchiveRe
 
 try {
 setBaseUrl(UriUtil.buildJarSafeUrl(new File(getBase(;
-} catch (MalformedURLException e) {
+} catch (IOException e) {
 throw new IllegalArgumentException(e);
 }
 }
diff --git a/java/org/apache/catalina/webresources/JarWarResourceSet.java 
b/java/org/apache/catalina/webresources/JarWarResourceSet.java
index 37253fc390..215cf3b07f 100644
--- a/java/org/apache/catalina/webresources/JarWarResourceSet.java
+++ b/java/org/apache/catalina/webresources/JarWarResourceSet.java
@@ -19,7 +19,6 @@ package org.apache.catalina.webresources;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -250,7 +249,7 @@ public class JarWarResourceSet extends 
AbstractArchiveResourceSet {
 
 try {
 setBaseUrl(UriUtil.buildJarSafeUrl(new File(getBase(;
-} catch (MalformedURLException e) {
+} catch (IOException e) {
 throw new IllegalArgumentException(e);
 }
 }
diff --git a/java/org/apache/tomcat/util/scan/JarFactory.java 
b/java/org/apache/tomcat/util/scan/JarFactory.java
index 51c0011ed1..ec6a438ad8 100644
--- a/java/org/apache/tomcat/util/scan/JarFactory.java
+++ b/java/org/apache/tomcat/util/scan/JarFactory.java
@@ -17,7 +17,8 @@
 package org.apache.tomcat.util.scan;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.regex.Matcher;
 
@@ -53,8 +54,7 @@ public class JarFactory {
 }
 
 
-public static URL getJarEntryURL(URL baseUrl, String entryName)
-throws MalformedURLException {
+public static URL getJarEntryURL(URL baseUrl, String entryName) throws 
IOException {
 
 String baseExternal = baseUrl.toExternalForm();
 
@@ -66,6 +66,12 @@ public class JarFactory {
 Matcher.quoteReplacement(UriUtil.getWarSeparator()));
 }
 
-return new URL("jar:" + baseExternal + "!/" + entryName);
+URI uri;
+try {
+uri = new URI("jar:" + baseExternal + "!/" + entryName);
+} catch (URISyntaxException e) {
+throw new IOException(e);
+}
+return uri.toURL();
 }
 }
diff --git a/test/org/apache/tomcat/util/buf/TesterUriUtilBase.java 
b/test/org/apache/tomcat/util/buf/TesterUriUtilBase.java
index b176788bf4..9980669aa2 100644
--- a/test/org/apache/tomcat/util/buf/TesterUriUtilBase.java
+++ b/test/org/apache/tomcat/util/buf/TesterUriUtilBase.java
@@ -17,7 +17,7 @@
 package org.apache.tomcat.util.buf;
 
 import java.io.File;
-import java.net.MalformedURLException;
+import java.io.IOException;
 import java.net.URL;
 
 import org.junit.Assert;
@@ -37,7 +37,7 @@ public abstract class TesterUriUtilBase {
 
 
 @Test
-public void testBuildJarUrl01() throws MalformedURLException {
+public void testBuildJarUrl01() throws IOException {
 File jarFile = new File("/patha/pathb!/pathc");
 String result = UriUtil.buildJarUrl(jarFile).toString();
 
@@ -47,7 +47,7 @@ public abstract class TesterUriUtilBase {
 
 
 @Test
-public void testBuildJarUrl02() throws MalformedURLException {
+public void testBuildJarUrl02() throws IOException {
 File jarFile = new File("

[tomcat] branch 8.5.x updated: More URL -> URI refactoring

[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 8beef73fe8 More URL -> URI refactoring
8beef73fe8 is described below

commit 8beef73fe8d1d055a94315f231415fe388bba2a8
Author: Mark Thomas 
AuthorDate: Wed Nov 16 19:04:55 2022 +

More URL -> URI refactoring

This one is a little more interesting as we were deliberately using one
of the URL constructors.
---
 java/org/apache/tomcat/util/buf/UriUtil.java   | 37 
 .../tomcat/util/descriptor/LocalResolver.java  |  8 +--
 test/org/apache/tomcat/util/buf/TestUriUtil.java   | 67 ++
 webapps/docs/changelog.xml |  9 +++
 4 files changed, 115 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/UriUtil.java 
b/java/org/apache/tomcat/util/buf/UriUtil.java
index a1c56e51c7..22dfb2dc98 100644
--- a/java/org/apache/tomcat/util/buf/UriUtil.java
+++ b/java/org/apache/tomcat/util/buf/UriUtil.java
@@ -18,6 +18,8 @@ package org.apache.tomcat.util.buf;
 
 import java.io.File;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.regex.Pattern;
 
@@ -228,4 +230,39 @@ public final class UriUtil {
 }
 return false;
 }
+
+
+/**
+ * Replicates the behaviour of {@link URI#resolve(String)} and adds support
+ * for URIs of the form {@code jar:file:/... }.
+ *
+ * @param base  The base URI to resolve against
+ * @param targetThe path to resolve
+ *
+ * @return  The resulting URI as per {@link URI#resolve(String)}
+ *
+ * @throws MalformedURLException
+ *  If the base URI cannot be converted to a URL
+ * @throws URISyntaxException
+ *  If the resulting URL cannot be converted to a URI
+ */
+public static URI resolve(URI base, String target) throws 
MalformedURLException, URISyntaxException {
+if (base.getScheme().equals("jar")) {
+/*
+ * Previously used:
+ * new URL(base.toURL(), target).toURI()
+ * This delegated the work to the jar stream handler which 
correctly
+ * resolved the target against the base.
+ *
+ * Deprecation of all the URL constructors mean a different 
approach
+ * is required.
+ */
+URI fileUri = new URI(base.getSchemeSpecificPart());
+URI fileUriResolved = fileUri.resolve(target);
+
+return new URI("jar:" + fileUriResolved.toString());
+} else {
+return base.resolve(target);
+}
+}
 }
diff --git a/java/org/apache/tomcat/util/descriptor/LocalResolver.java 
b/java/org/apache/tomcat/util/descriptor/LocalResolver.java
index 37a952bf39..ac641f7a18 100644
--- a/java/org/apache/tomcat/util/descriptor/LocalResolver.java
+++ b/java/org/apache/tomcat/util/descriptor/LocalResolver.java
@@ -21,9 +21,9 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.Map;
 
+import org.apache.tomcat.util.buf.UriUtil;
 import org.apache.tomcat.util.res.StringManager;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -118,12 +118,8 @@ public class LocalResolver implements EntityResolver2 {
 if (base == null) {
 systemUri = new URI(systemId);
 } else {
-// Can't use URI.resolve() because "jar:..." URLs are not valid
-// hierarchical URIs so resolve() does not work. new URL()
-// delegates to the jar: stream handler and it manages to 
figure
-// it out.
 URI baseUri = new URI(base);
-systemUri = new URL(baseUri.toURL(), systemId).toURI();
+systemUri = UriUtil.resolve(baseUri, systemId);
 }
 systemUri = systemUri.normalize();
 } catch (URISyntaxException e) {
diff --git a/test/org/apache/tomcat/util/buf/TestUriUtil.java 
b/test/org/apache/tomcat/util/buf/TestUriUtil.java
new file mode 100644
index 00..fc7531c13e
--- /dev/null
+++ b/test/org/apache/tomcat/util/buf/TestUriUtil.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by appl

[tomcat] branch 9.0.x updated: More URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 3de18e4cf6 More URL -> URI refactoring
3de18e4cf6 is described below

commit 3de18e4cf6c730e572933120d88d83be802ed717
Author: Mark Thomas 
AuthorDate: Wed Nov 16 19:04:55 2022 +

More URL -> URI refactoring

This one is a little more interesting as we were deliberately using one
of the URL constructors.
---
 java/org/apache/tomcat/util/buf/UriUtil.java   | 37 
 .../tomcat/util/descriptor/LocalResolver.java  |  8 +--
 test/org/apache/tomcat/util/buf/TestUriUtil.java   | 67 ++
 webapps/docs/changelog.xml |  9 +++
 4 files changed, 115 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/UriUtil.java 
b/java/org/apache/tomcat/util/buf/UriUtil.java
index a1c56e51c7..22dfb2dc98 100644
--- a/java/org/apache/tomcat/util/buf/UriUtil.java
+++ b/java/org/apache/tomcat/util/buf/UriUtil.java
@@ -18,6 +18,8 @@ package org.apache.tomcat.util.buf;
 
 import java.io.File;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.regex.Pattern;
 
@@ -228,4 +230,39 @@ public final class UriUtil {
 }
 return false;
 }
+
+
+/**
+ * Replicates the behaviour of {@link URI#resolve(String)} and adds support
+ * for URIs of the form {@code jar:file:/... }.
+ *
+ * @param base  The base URI to resolve against
+ * @param targetThe path to resolve
+ *
+ * @return  The resulting URI as per {@link URI#resolve(String)}
+ *
+ * @throws MalformedURLException
+ *  If the base URI cannot be converted to a URL
+ * @throws URISyntaxException
+ *  If the resulting URL cannot be converted to a URI
+ */
+public static URI resolve(URI base, String target) throws 
MalformedURLException, URISyntaxException {
+if (base.getScheme().equals("jar")) {
+/*
+ * Previously used:
+ * new URL(base.toURL(), target).toURI()
+ * This delegated the work to the jar stream handler which 
correctly
+ * resolved the target against the base.
+ *
+ * Deprecation of all the URL constructors mean a different 
approach
+ * is required.
+ */
+URI fileUri = new URI(base.getSchemeSpecificPart());
+URI fileUriResolved = fileUri.resolve(target);
+
+return new URI("jar:" + fileUriResolved.toString());
+} else {
+return base.resolve(target);
+}
+}
 }
diff --git a/java/org/apache/tomcat/util/descriptor/LocalResolver.java 
b/java/org/apache/tomcat/util/descriptor/LocalResolver.java
index 37a952bf39..ac641f7a18 100644
--- a/java/org/apache/tomcat/util/descriptor/LocalResolver.java
+++ b/java/org/apache/tomcat/util/descriptor/LocalResolver.java
@@ -21,9 +21,9 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.Map;
 
+import org.apache.tomcat.util.buf.UriUtil;
 import org.apache.tomcat.util.res.StringManager;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -118,12 +118,8 @@ public class LocalResolver implements EntityResolver2 {
 if (base == null) {
 systemUri = new URI(systemId);
 } else {
-// Can't use URI.resolve() because "jar:..." URLs are not valid
-// hierarchical URIs so resolve() does not work. new URL()
-// delegates to the jar: stream handler and it manages to 
figure
-// it out.
 URI baseUri = new URI(base);
-systemUri = new URL(baseUri.toURL(), systemId).toURI();
+systemUri = UriUtil.resolve(baseUri, systemId);
 }
 systemUri = systemUri.normalize();
 } catch (URISyntaxException e) {
diff --git a/test/org/apache/tomcat/util/buf/TestUriUtil.java 
b/test/org/apache/tomcat/util/buf/TestUriUtil.java
new file mode 100644
index 00..fc7531c13e
--- /dev/null
+++ b/test/org/apache/tomcat/util/buf/TestUriUtil.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by appl

[tomcat] branch 10.1.x updated (a742639e9e -> 561f8a0f7e)

[markt]

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

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


from a742639e9e Correct entry location
 add 561f8a0f7e Revert changes only intended to 11.0.x since they change 
the API

No new revisions were added by this update.

Summary of changes:
 java/org/apache/tomcat/util/buf/UriUtil.java | 40 
 1 file changed, 11 insertions(+), 29 deletions(-)


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

[tomcat] branch 10.1.x updated: Correct entry location

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new a742639e9e Correct entry location
a742639e9e is described below

commit a742639e9e69c8d081f3809a618dbe5946d8a512
Author: Mark Thomas 
AuthorDate: Wed Nov 16 19:06:49 2022 +

Correct entry location
---
 webapps/docs/changelog.xml | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 30784dc855..22261bf43e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,15 @@
   
 
   
+  
+
+  
+Refactor code base to replace use of URL constructors. While they are
+deprecated in Java 20 onwards, the reasons for deprecation are valid 
for
+all versions so move away from them now. (markt)
+  
+
+  
 
 
   
@@ -234,11 +243,6 @@
 Update the packaged version of the Apache Tomcat Migration Tool for
 Jakarta EE to 1.0.5. (markt)
   
-  
-Refactor code base to replace use of URL constructors. While they are
-deprecated in Java 20 onwards, the reasons for deprecation are valid 
for
-all versions so move away from them now. (markt)
-  
 
   
 


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

[tomcat] branch 10.1.x updated: More URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 9b2051d4f1 More URL -> URI refactoring
9b2051d4f1 is described below

commit 9b2051d4f1403684feb7c93306be73eadf054186
Author: Mark Thomas 
AuthorDate: Wed Nov 16 19:04:55 2022 +

More URL -> URI refactoring

This one is a little more interesting as we were deliberately using one
of the URL constructors.
---
 java/org/apache/tomcat/util/buf/UriUtil.java   | 77 ++
 .../tomcat/util/descriptor/LocalResolver.java  |  8 +--
 test/org/apache/tomcat/util/buf/TestUriUtil.java   | 67 +++
 webapps/docs/changelog.xml |  5 ++
 4 files changed, 140 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/UriUtil.java 
b/java/org/apache/tomcat/util/buf/UriUtil.java
index a1c56e51c7..12a1280ace 100644
--- a/java/org/apache/tomcat/util/buf/UriUtil.java
+++ b/java/org/apache/tomcat/util/buf/UriUtil.java
@@ -17,7 +17,10 @@
 package org.apache.tomcat.util.buf;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.regex.Pattern;
 
@@ -102,22 +105,22 @@ public final class UriUtil {
 }
 
 
-public static URL buildJarUrl(File jarFile) throws MalformedURLException {
+public static URL buildJarUrl(File jarFile) throws IOException {
 return buildJarUrl(jarFile, null);
 }
 
 
-public static URL buildJarUrl(File jarFile, String entryPath) throws 
MalformedURLException {
+public static URL buildJarUrl(File jarFile, String entryPath) throws 
IOException {
 return buildJarUrl(jarFile.toURI().toString(), entryPath);
 }
 
 
-public static URL buildJarUrl(String fileUrlString) throws 
MalformedURLException {
+public static URL buildJarUrl(String fileUrlString) throws IOException {
 return buildJarUrl(fileUrlString, null);
 }
 
 
-public static URL buildJarUrl(String fileUrlString, String entryPath) 
throws MalformedURLException {
+public static URL buildJarUrl(String fileUrlString, String entryPath) 
throws IOException {
 String safeString = makeSafeForJarUrl(fileUrlString);
 StringBuilder sb = new StringBuilder();
 sb.append(safeString);
@@ -125,13 +128,25 @@ public final class UriUtil {
 if (entryPath != null) {
 sb.append(makeSafeForJarUrl(entryPath));
 }
-return new URL("jar", null, -1, sb.toString());
+URI uri;
+try {
+uri = new URI("jar", sb.toString(), null);
+} catch (URISyntaxException e) {
+throw new IOException(e);
+}
+return uri.toURL();
 }
 
 
-public static URL buildJarSafeUrl(File file) throws MalformedURLException {
+public static URL buildJarSafeUrl(File file) throws IOException {
 String safe = makeSafeForJarUrl(file.toURI().toString());
-return new URL(safe);
+URI uri;
+try {
+uri = new URI(safe);
+} catch (URISyntaxException e) {
+throw new IOException(e);
+}
+return uri.toURL();
 }
 
 
@@ -173,9 +188,9 @@ public final class UriUtil {
  *
  * @return The equivalent JAR URL
  *
- * @throws MalformedURLException If the conversion fails
+ * @throws IOException If the conversion fails
  */
-public static URL warToJar(URL warUrl) throws MalformedURLException {
+public static URL warToJar(URL warUrl) throws IOException {
 // Assumes that the spec is absolute and starts war:file:/...
 String file = warUrl.getFile();
 if (file.contains("*/")) {
@@ -185,8 +200,13 @@ public final class UriUtil {
 } else if (PATTERN_CUSTOM != null) {
 file = file.replaceFirst(PATTERN_CUSTOM.pattern(), "!/");
 }
-
-return new URL("jar", warUrl.getHost(), warUrl.getPort(), file);
+URI uri;
+try {
+uri = new URI("jar", file, null);
+} catch (URISyntaxException e) {
+throw new IOException(e);
+}
+return uri.toURL();
 }
 
 
@@ -228,4 +248,39 @@ public final class UriUtil {
 }
 return false;
 }
+
+
+/**
+ * Replicates the behaviour of {@link URI#resolve(String)} and adds support
+ * for URIs of the form {@code jar:file:/... }.
+ *
+ * @param base  The base URI to resolve against
+ * @param targetThe path to resolve
+ *
+ * @return  The resulting URI as per {@link URI#resolve(String)}
+ *
+ * @throws MalformedURLException
+ *  If the base URI cannot be converted to a URL
+ * @throws URISyntaxException
+ *  If the resulting 

[tomcat] branch main updated: More URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new e9d1404b2d More URL -> URI refactoring
e9d1404b2d is described below

commit e9d1404b2d8c7713847592023771d58e032423c5
Author: Mark Thomas 
AuthorDate: Wed Nov 16 19:04:55 2022 +

More URL -> URI refactoring

This one is a little more interesting as we were deliberately using one
of the URL constructors.
---
 java/org/apache/tomcat/util/buf/UriUtil.java   | 77 ++
 .../tomcat/util/descriptor/LocalResolver.java  |  8 +--
 test/org/apache/tomcat/util/buf/TestUriUtil.java   | 67 +++
 webapps/docs/changelog.xml |  5 ++
 4 files changed, 140 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/UriUtil.java 
b/java/org/apache/tomcat/util/buf/UriUtil.java
index a1c56e51c7..12a1280ace 100644
--- a/java/org/apache/tomcat/util/buf/UriUtil.java
+++ b/java/org/apache/tomcat/util/buf/UriUtil.java
@@ -17,7 +17,10 @@
 package org.apache.tomcat.util.buf;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.regex.Pattern;
 
@@ -102,22 +105,22 @@ public final class UriUtil {
 }
 
 
-public static URL buildJarUrl(File jarFile) throws MalformedURLException {
+public static URL buildJarUrl(File jarFile) throws IOException {
 return buildJarUrl(jarFile, null);
 }
 
 
-public static URL buildJarUrl(File jarFile, String entryPath) throws 
MalformedURLException {
+public static URL buildJarUrl(File jarFile, String entryPath) throws 
IOException {
 return buildJarUrl(jarFile.toURI().toString(), entryPath);
 }
 
 
-public static URL buildJarUrl(String fileUrlString) throws 
MalformedURLException {
+public static URL buildJarUrl(String fileUrlString) throws IOException {
 return buildJarUrl(fileUrlString, null);
 }
 
 
-public static URL buildJarUrl(String fileUrlString, String entryPath) 
throws MalformedURLException {
+public static URL buildJarUrl(String fileUrlString, String entryPath) 
throws IOException {
 String safeString = makeSafeForJarUrl(fileUrlString);
 StringBuilder sb = new StringBuilder();
 sb.append(safeString);
@@ -125,13 +128,25 @@ public final class UriUtil {
 if (entryPath != null) {
 sb.append(makeSafeForJarUrl(entryPath));
 }
-return new URL("jar", null, -1, sb.toString());
+URI uri;
+try {
+uri = new URI("jar", sb.toString(), null);
+} catch (URISyntaxException e) {
+throw new IOException(e);
+}
+return uri.toURL();
 }
 
 
-public static URL buildJarSafeUrl(File file) throws MalformedURLException {
+public static URL buildJarSafeUrl(File file) throws IOException {
 String safe = makeSafeForJarUrl(file.toURI().toString());
-return new URL(safe);
+URI uri;
+try {
+uri = new URI(safe);
+} catch (URISyntaxException e) {
+throw new IOException(e);
+}
+return uri.toURL();
 }
 
 
@@ -173,9 +188,9 @@ public final class UriUtil {
  *
  * @return The equivalent JAR URL
  *
- * @throws MalformedURLException If the conversion fails
+ * @throws IOException If the conversion fails
  */
-public static URL warToJar(URL warUrl) throws MalformedURLException {
+public static URL warToJar(URL warUrl) throws IOException {
 // Assumes that the spec is absolute and starts war:file:/...
 String file = warUrl.getFile();
 if (file.contains("*/")) {
@@ -185,8 +200,13 @@ public final class UriUtil {
 } else if (PATTERN_CUSTOM != null) {
 file = file.replaceFirst(PATTERN_CUSTOM.pattern(), "!/");
 }
-
-return new URL("jar", warUrl.getHost(), warUrl.getPort(), file);
+URI uri;
+try {
+uri = new URI("jar", file, null);
+} catch (URISyntaxException e) {
+throw new IOException(e);
+}
+return uri.toURL();
 }
 
 
@@ -228,4 +248,39 @@ public final class UriUtil {
 }
 return false;
 }
+
+
+/**
+ * Replicates the behaviour of {@link URI#resolve(String)} and adds support
+ * for URIs of the form {@code jar:file:/... }.
+ *
+ * @param base  The base URI to resolve against
+ * @param targetThe path to resolve
+ *
+ * @return  The resulting URI as per {@link URI#resolve(String)}
+ *
+ * @throws MalformedURLException
+ *  If the base URI cannot be converted to a URL
+ * @throws URISyntaxException
+ *  If the resulting URL 

[GitHub] [tomcat] guillaumecle opened a new pull request, #570: fix issue id in changelog

[GitBox]

guillaumecle opened a new pull request, #570:
URL: https://github.com/apache/tomcat/pull/570

   https://bz.apache.org/bugzilla/show_bug.cgi?id=66029 poi 5.0 generated xlsx 
file RUN TO EMAIL APPENDS .TXT TO OUTPUT
   
   https://bz.apache.org/bugzilla/show_bug.cgi?id=66209 CPU regression when 
classpath Bloom filters are active


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
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: More URL -> URI refactoring

[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 eb129327b9 More URL -> URI refactoring
eb129327b9 is described below

commit eb129327b95d2b904355c0657ea1b29fefe1ff00
Author: Mark Thomas 
AuthorDate: Wed Nov 16 18:50:38 2022 +

More URL -> URI refactoring
---
 .../factory/webservices/ServiceRefFactory.java | 30 +-
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java 
b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
index 909f3d3c72..d58933c8ce 100644
--- a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
+++ b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
@@ -19,7 +19,7 @@ package org.apache.naming.factory.webservices;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.net.URL;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -64,8 +64,8 @@ public class ServiceRefFactory implements ObjectFactory {
  * @param obj The reference object describing the webservice
  */
 @Override
-public Object getObjectInstance(Object obj, Name name, Context nameCtx,
-Hashtable environment) throws Exception {
+public Object getObjectInstance(Object obj, Name name, Context nameCtx, 
Hashtable environment)
+throws Exception {
 
 if (obj instanceof ServiceRef) {
 ServiceRef ref = (ServiceRef) obj;
@@ -105,8 +105,7 @@ public class ServiceRefFactory implements ObjectFactory {
 serviceQname = new QName(serviceLocalPart);
 } else {
 String serviceNamespace = (String) tmp.getContent();
-serviceQname = new QName(serviceNamespace,
-serviceLocalPart);
+serviceQname = new QName(serviceNamespace, 
serviceLocalPart);
 }
 }
 Class serviceInterfaceClass = null;
@@ -114,15 +113,13 @@ public class ServiceRefFactory implements ObjectFactory {
 // Create service object
 if (serviceInterface == null) {
 if (serviceQname == null) {
-throw new NamingException
-("Could not create service-ref instance");
+throw new NamingException("Could not create service-ref 
instance");
 }
 try {
 if (wsdlRefAddr == null) {
 service = factory.createService( serviceQname );
 } else {
-service = factory.createService( new URL(wsdlRefAddr),
-serviceQname );
+service = factory.createService(new 
URI(wsdlRefAddr).toURL(), serviceQname);
 }
 } catch (Exception e) {
 NamingException ex = new NamingException("Could not create 
service");
@@ -139,19 +136,17 @@ public class ServiceRefFactory implements ObjectFactory {
 throw ex;
 }
 if (serviceInterfaceClass == null) {
-throw new NamingException
-("Could not load service Interface");
+throw new NamingException("Could not load service 
Interface");
 }
 try {
 if (wsdlRefAddr == null) {
 if 
(!Service.class.isAssignableFrom(serviceInterfaceClass)) {
 throw new NamingException("service Interface 
should extend javax.xml.rpc.Service");
 }
-service = factory.loadService( serviceInterfaceClass );
+service = factory.loadService(serviceInterfaceClass);
 } else {
-service = factory.loadService( new URL(wsdlRefAddr),
-serviceInterfaceClass,
-new Properties() );
+service = factory.loadService(
+new URI(wsdlRefAddr).toURL(), 
serviceInterfaceClass, new Properties());
 }
 } catch (Exception e) {
 NamingException ex = new NamingException("Could not create 
service");
@@ -160,8 +155,7 @@ public class ServiceRefFactory implements ObjectFactory {
 }
 }
 if (service == null) {
-throw new NamingException
-("Cannot create service object");
+throw new NamingException("Cannot create service object");
 }

[tomcat] branch main updated: More URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 985c18a8bc More URL -> URI refactoring
985c18a8bc is described below

commit 985c18a8bcc55a434ddfe59189924b83dc4aac98
Author: Mark Thomas 
AuthorDate: Wed Nov 16 18:50:38 2022 +

More URL -> URI refactoring
---
 .../factory/webservices/ServiceRefFactory.java | 30 +-
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java 
b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
index 909f3d3c72..d58933c8ce 100644
--- a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
+++ b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
@@ -19,7 +19,7 @@ package org.apache.naming.factory.webservices;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.net.URL;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -64,8 +64,8 @@ public class ServiceRefFactory implements ObjectFactory {
  * @param obj The reference object describing the webservice
  */
 @Override
-public Object getObjectInstance(Object obj, Name name, Context nameCtx,
-Hashtable environment) throws Exception {
+public Object getObjectInstance(Object obj, Name name, Context nameCtx, 
Hashtable environment)
+throws Exception {
 
 if (obj instanceof ServiceRef) {
 ServiceRef ref = (ServiceRef) obj;
@@ -105,8 +105,7 @@ public class ServiceRefFactory implements ObjectFactory {
 serviceQname = new QName(serviceLocalPart);
 } else {
 String serviceNamespace = (String) tmp.getContent();
-serviceQname = new QName(serviceNamespace,
-serviceLocalPart);
+serviceQname = new QName(serviceNamespace, 
serviceLocalPart);
 }
 }
 Class serviceInterfaceClass = null;
@@ -114,15 +113,13 @@ public class ServiceRefFactory implements ObjectFactory {
 // Create service object
 if (serviceInterface == null) {
 if (serviceQname == null) {
-throw new NamingException
-("Could not create service-ref instance");
+throw new NamingException("Could not create service-ref 
instance");
 }
 try {
 if (wsdlRefAddr == null) {
 service = factory.createService( serviceQname );
 } else {
-service = factory.createService( new URL(wsdlRefAddr),
-serviceQname );
+service = factory.createService(new 
URI(wsdlRefAddr).toURL(), serviceQname);
 }
 } catch (Exception e) {
 NamingException ex = new NamingException("Could not create 
service");
@@ -139,19 +136,17 @@ public class ServiceRefFactory implements ObjectFactory {
 throw ex;
 }
 if (serviceInterfaceClass == null) {
-throw new NamingException
-("Could not load service Interface");
+throw new NamingException("Could not load service 
Interface");
 }
 try {
 if (wsdlRefAddr == null) {
 if 
(!Service.class.isAssignableFrom(serviceInterfaceClass)) {
 throw new NamingException("service Interface 
should extend javax.xml.rpc.Service");
 }
-service = factory.loadService( serviceInterfaceClass );
+service = factory.loadService(serviceInterfaceClass);
 } else {
-service = factory.loadService( new URL(wsdlRefAddr),
-serviceInterfaceClass,
-new Properties() );
+service = factory.loadService(
+new URI(wsdlRefAddr).toURL(), 
serviceInterfaceClass, new Properties());
 }
 } catch (Exception e) {
 NamingException ex = new NamingException("Could not create 
service");
@@ -160,8 +155,7 @@ public class ServiceRefFactory implements ObjectFactory {
 }
 }
 if (service == null) {
-throw new NamingException
-("Cannot create service object");
+throw new NamingException("Cannot create service object");
 }
 

[tomcat] branch 9.0.x updated: More URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new ba8e8eed56 More URL -> URI refactoring
ba8e8eed56 is described below

commit ba8e8eed5611989739a4e26b5599615d7f4eb89c
Author: Mark Thomas 
AuthorDate: Wed Nov 16 18:50:38 2022 +

More URL -> URI refactoring
---
 .../factory/webservices/ServiceRefFactory.java | 30 +-
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java 
b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
index 909f3d3c72..d58933c8ce 100644
--- a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
+++ b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
@@ -19,7 +19,7 @@ package org.apache.naming.factory.webservices;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.net.URL;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -64,8 +64,8 @@ public class ServiceRefFactory implements ObjectFactory {
  * @param obj The reference object describing the webservice
  */
 @Override
-public Object getObjectInstance(Object obj, Name name, Context nameCtx,
-Hashtable environment) throws Exception {
+public Object getObjectInstance(Object obj, Name name, Context nameCtx, 
Hashtable environment)
+throws Exception {
 
 if (obj instanceof ServiceRef) {
 ServiceRef ref = (ServiceRef) obj;
@@ -105,8 +105,7 @@ public class ServiceRefFactory implements ObjectFactory {
 serviceQname = new QName(serviceLocalPart);
 } else {
 String serviceNamespace = (String) tmp.getContent();
-serviceQname = new QName(serviceNamespace,
-serviceLocalPart);
+serviceQname = new QName(serviceNamespace, 
serviceLocalPart);
 }
 }
 Class serviceInterfaceClass = null;
@@ -114,15 +113,13 @@ public class ServiceRefFactory implements ObjectFactory {
 // Create service object
 if (serviceInterface == null) {
 if (serviceQname == null) {
-throw new NamingException
-("Could not create service-ref instance");
+throw new NamingException("Could not create service-ref 
instance");
 }
 try {
 if (wsdlRefAddr == null) {
 service = factory.createService( serviceQname );
 } else {
-service = factory.createService( new URL(wsdlRefAddr),
-serviceQname );
+service = factory.createService(new 
URI(wsdlRefAddr).toURL(), serviceQname);
 }
 } catch (Exception e) {
 NamingException ex = new NamingException("Could not create 
service");
@@ -139,19 +136,17 @@ public class ServiceRefFactory implements ObjectFactory {
 throw ex;
 }
 if (serviceInterfaceClass == null) {
-throw new NamingException
-("Could not load service Interface");
+throw new NamingException("Could not load service 
Interface");
 }
 try {
 if (wsdlRefAddr == null) {
 if 
(!Service.class.isAssignableFrom(serviceInterfaceClass)) {
 throw new NamingException("service Interface 
should extend javax.xml.rpc.Service");
 }
-service = factory.loadService( serviceInterfaceClass );
+service = factory.loadService(serviceInterfaceClass);
 } else {
-service = factory.loadService( new URL(wsdlRefAddr),
-serviceInterfaceClass,
-new Properties() );
+service = factory.loadService(
+new URI(wsdlRefAddr).toURL(), 
serviceInterfaceClass, new Properties());
 }
 } catch (Exception e) {
 NamingException ex = new NamingException("Could not create 
service");
@@ -160,8 +155,7 @@ public class ServiceRefFactory implements ObjectFactory {
 }
 }
 if (service == null) {
-throw new NamingException
-("Cannot create service object");
+throw new NamingException("Cannot create service object");
 }

[tomcat] branch 10.1.x updated: More URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new d3bc4dabdb More URL -> URI refactoring
d3bc4dabdb is described below

commit d3bc4dabdbb58068034f950b69ad474bad226efb
Author: Mark Thomas 
AuthorDate: Wed Nov 16 18:50:38 2022 +

More URL -> URI refactoring
---
 .../factory/webservices/ServiceRefFactory.java | 30 +-
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java 
b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
index 909f3d3c72..d58933c8ce 100644
--- a/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
+++ b/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
@@ -19,7 +19,7 @@ package org.apache.naming.factory.webservices;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.net.URL;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -64,8 +64,8 @@ public class ServiceRefFactory implements ObjectFactory {
  * @param obj The reference object describing the webservice
  */
 @Override
-public Object getObjectInstance(Object obj, Name name, Context nameCtx,
-Hashtable environment) throws Exception {
+public Object getObjectInstance(Object obj, Name name, Context nameCtx, 
Hashtable environment)
+throws Exception {
 
 if (obj instanceof ServiceRef) {
 ServiceRef ref = (ServiceRef) obj;
@@ -105,8 +105,7 @@ public class ServiceRefFactory implements ObjectFactory {
 serviceQname = new QName(serviceLocalPart);
 } else {
 String serviceNamespace = (String) tmp.getContent();
-serviceQname = new QName(serviceNamespace,
-serviceLocalPart);
+serviceQname = new QName(serviceNamespace, 
serviceLocalPart);
 }
 }
 Class serviceInterfaceClass = null;
@@ -114,15 +113,13 @@ public class ServiceRefFactory implements ObjectFactory {
 // Create service object
 if (serviceInterface == null) {
 if (serviceQname == null) {
-throw new NamingException
-("Could not create service-ref instance");
+throw new NamingException("Could not create service-ref 
instance");
 }
 try {
 if (wsdlRefAddr == null) {
 service = factory.createService( serviceQname );
 } else {
-service = factory.createService( new URL(wsdlRefAddr),
-serviceQname );
+service = factory.createService(new 
URI(wsdlRefAddr).toURL(), serviceQname);
 }
 } catch (Exception e) {
 NamingException ex = new NamingException("Could not create 
service");
@@ -139,19 +136,17 @@ public class ServiceRefFactory implements ObjectFactory {
 throw ex;
 }
 if (serviceInterfaceClass == null) {
-throw new NamingException
-("Could not load service Interface");
+throw new NamingException("Could not load service 
Interface");
 }
 try {
 if (wsdlRefAddr == null) {
 if 
(!Service.class.isAssignableFrom(serviceInterfaceClass)) {
 throw new NamingException("service Interface 
should extend javax.xml.rpc.Service");
 }
-service = factory.loadService( serviceInterfaceClass );
+service = factory.loadService(serviceInterfaceClass);
 } else {
-service = factory.loadService( new URL(wsdlRefAddr),
-serviceInterfaceClass,
-new Properties() );
+service = factory.loadService(
+new URI(wsdlRefAddr).toURL(), 
serviceInterfaceClass, new Properties());
 }
 } catch (Exception e) {
 NamingException ex = new NamingException("Could not create 
service");
@@ -160,8 +155,7 @@ public class ServiceRefFactory implements ObjectFactory {
 }
 }
 if (service == null) {
-throw new NamingException
-("Cannot create service object");
+throw new NamingException("Cannot create service object");

Buildbot success in on tomcat-10.1.x

[buildbot]

Build status: Build succeeded!
Worker used: bb2_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/579
Blamelist: Mark Thomas 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch 10.1.x] 028d87f9054564f36a34f7a362e4560e59efdcde


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

[GitHub] [tomcat] sdeleuze commented on a diff in pull request #569: Refine native resources metadata

[GitBox]

sdeleuze commented on code in PR #569:
URL: https://github.com/apache/tomcat/pull/569#discussion_r1024337553


##
modules/stuffed/tomcat-resource.json:
##
@@ -73,9 +73,13 @@
 {"name":"org.apache.tomcat.websocket.server.LocalStrings"}
   ],
   "resources":[
-{"pattern":".*/mbeans-descriptors.xml$"},
-{"pattern":".*/*.properties$"},
-{"pattern":".*/*.dtd$"},
-{"pattern":".*/*.xsd$"}

Review Comment:
   They are now included via `{"pattern":"^jakarta/servlet/resources/.*"}`.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[GitHub] [tomcat] ChristopherSchultz commented on a diff in pull request #569: Refine native resources metadata

[GitBox]

ChristopherSchultz commented on code in PR #569:
URL: https://github.com/apache/tomcat/pull/569#discussion_r1024327589


##
modules/stuffed/tomcat-resource.json:
##
@@ -73,9 +73,13 @@
 {"name":"org.apache.tomcat.websocket.server.LocalStrings"}
   ],
   "resources":[
-{"pattern":".*/mbeans-descriptors.xml$"},
-{"pattern":".*/*.properties$"},
-{"pattern":".*/*.dtd$"},
-{"pattern":".*/*.xsd$"}

Review Comment:
   Is a pattern no longer (or was never?) necessary for `.xsd`?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[GitHub] [tomcat] sdeleuze opened a new pull request, #569: Refine native resources metadata

[GitBox]

sdeleuze opened a new pull request, #569:
URL: https://github.com/apache/tomcat/pull/569

   This commit updates the native resources hints in order to avoid classpath 
wide inclusion of resources.
   
   @markt-asf @mhalbritter Please check I did not make any mistake.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

Re: [VOTE] Release Apache Tomcat 8.5.84 [test-failure question]

[Mark Thomas]

On 16/11/2022 16:48, Christopher Schultz wrote:

All,

I'm getting a test failure on Windows for this test:

TEST-javax.servlet.http.TestHttpServletDoHeadValidWrite513.NIO.txt

Looking at the log file, it seems to be complaining that it can't 
clean-up after itself:


Testsuite: javax.servlet.http.TestHttpServletDoHeadValidWrite513
Tests run: 288, Failures: 25, Errors: 0, Skipped: 0, Time elapsed: 
41.399 sec


[...]

Testcase: testDoHead[10: 16 false 1 FULL 513 false] took 0.177 sec
 FAILED
Failed to delete at least one file
junit.framework.AssertionFailedError: Failed to delete at least one file
 at 
org.apache.catalina.startup.LoggingBaseTest.tearDown(LoggingBaseTest.java:142)
 at 
org.apache.catalina.startup.TomcatBaseTest.tearDown(TomcatBaseTest.java:243)
 at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native 
Method)
 at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 at 
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)


Then lots more like this.

This appears to be a problem with the test case itself, agreed?


Agreed.

Mark


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

Re: [VOTE] Release Apache Tomcat 8.5.84 [test-failure question]

[Christopher Schultz]

All,

I'm getting a test failure on Windows for this test:

TEST-javax.servlet.http.TestHttpServletDoHeadValidWrite513.NIO.txt

Looking at the log file, it seems to be complaining that it can't 
clean-up after itself:


Testsuite: javax.servlet.http.TestHttpServletDoHeadValidWrite513
Tests run: 288, Failures: 25, Errors: 0, Skipped: 0, Time elapsed: 
41.399 sec


[...]

Testcase: testDoHead[10: 16 false 1 FULL 513 false] took 0.177 sec
FAILED
Failed to delete at least one file
junit.framework.AssertionFailedError: Failed to delete at least one file
	at 
org.apache.catalina.startup.LoggingBaseTest.tearDown(LoggingBaseTest.java:142)
	at 
org.apache.catalina.startup.TomcatBaseTest.tearDown(TomcatBaseTest.java:243)
	at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native 
Method)
	at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at 
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)


Then lots more like this.

This appears to be a problem with the test case itself, agreed?

Thanks,
-chris

On 11/16/22 11:03, Christopher Schultz wrote:

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

The notable changes compared to 8.5.83 are:

- Fix concurrency issue in evaluation of expression language containing
    lambda expressions.

- Correct the date format used with the expires attribute of HTTP
    cookies. A single space rather than a single dash should be used to
    separate the day, month and year components to be compliant with RFC
    6265.

- Update to Commons Daemon 1.3.2.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.84/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1407

The tag is:
https://github.com/apache/tomcat/tree/8.5.84/
079a46c1c1e56b1743e752a44450469690880a56

The proposed 8.5.84 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.84 (stable)

-
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

[tomcat] branch 8.5.x updated: URI(String) can also throw an IAE

[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 74ef7be03d URI(String) can also throw an IAE
74ef7be03d is described below

commit 74ef7be03dd8e140168152ae457faefb6a1a8adb
Author: Mark Thomas 
AuthorDate: Wed Nov 16 16:19:02 2022 +

URI(String) can also throw an IAE
---
 java/org/apache/catalina/startup/Bootstrap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
b/java/org/apache/catalina/startup/Bootstrap.java
index 307c8b4cb6..018b899bb1 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -179,7 +179,7 @@ public final class Bootstrap {
 URL url = uri.toURL();
 repositories.add(new Repository(repository, 
RepositoryType.URL));
 continue;
-} catch (MalformedURLException | URISyntaxException e) {
+} catch (IllegalArgumentException | MalformedURLException | 
URISyntaxException e) {
 // Ignore
 }
 


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

[tomcat] branch 9.0.x updated: URI(String) can also throw an IAE

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 91ab315f9a URI(String) can also throw an IAE
91ab315f9a is described below

commit 91ab315f9acbc1ff5beea47cf18783d0d6680503
Author: Mark Thomas 
AuthorDate: Wed Nov 16 16:19:02 2022 +

URI(String) can also throw an IAE
---
 java/org/apache/catalina/startup/Bootstrap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
b/java/org/apache/catalina/startup/Bootstrap.java
index 2f8999a829..461d54b304 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -179,7 +179,7 @@ public final class Bootstrap {
 URL url = uri.toURL();
 repositories.add(new Repository(repository, 
RepositoryType.URL));
 continue;
-} catch (MalformedURLException | URISyntaxException e) {
+} catch (IllegalArgumentException | MalformedURLException | 
URISyntaxException e) {
 // Ignore
 }
 


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

[tomcat] branch 10.1.x updated: URI(String) can also throw an IAE

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 028d87f905 URI(String) can also throw an IAE
028d87f905 is described below

commit 028d87f9054564f36a34f7a362e4560e59efdcde
Author: Mark Thomas 
AuthorDate: Wed Nov 16 16:19:02 2022 +

URI(String) can also throw an IAE
---
 java/org/apache/catalina/startup/Bootstrap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
b/java/org/apache/catalina/startup/Bootstrap.java
index 2f8999a829..461d54b304 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -179,7 +179,7 @@ public final class Bootstrap {
 URL url = uri.toURL();
 repositories.add(new Repository(repository, 
RepositoryType.URL));
 continue;
-} catch (MalformedURLException | URISyntaxException e) {
+} catch (IllegalArgumentException | MalformedURLException | 
URISyntaxException e) {
 // Ignore
 }
 


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

[tomcat] branch main updated: URI(String) can also throw an IAE

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new a52538baad URI(String) can also throw an IAE
a52538baad is described below

commit a52538baadbd355837526f00f3ecae0c33d23660
Author: Mark Thomas 
AuthorDate: Wed Nov 16 16:19:02 2022 +

URI(String) can also throw an IAE
---
 java/org/apache/catalina/startup/Bootstrap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
b/java/org/apache/catalina/startup/Bootstrap.java
index 2f8999a829..461d54b304 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -179,7 +179,7 @@ public final class Bootstrap {
 URL url = uri.toURL();
 repositories.add(new Repository(repository, 
RepositoryType.URL));
 continue;
-} catch (MalformedURLException | URISyntaxException e) {
+} catch (IllegalArgumentException | MalformedURLException | 
URISyntaxException e) {
 // Ignore
 }
 


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

Re: Tomcat 8.5.84

[Christopher Schultz]

Jon,

On 11/16/22 11:06, jonmcalexan...@wellsfargo.com.INVALID wrote:

I feel for ya man. Sounds like my typical day.


It's always /something/ with VirtualBox.

-chris


-Original Message-
From: Christopher Schultz 
Sent: Wednesday, November 16, 2022 9:55 AM
To: Tomcat Developers List 
Subject: Re: Tomcat 8.5.84

All,

On 11/16/22 10:11, Christopher Schultz wrote:

All,

On 11/15/22 21:43, Christopher Schultz wrote:

All,

Sorry, I've been MIA the past few days and haven't yet rolled an
8.5.84 release.

I will begin the process tomorrow.

-chris


Ugh, I'm having VirtualBox problems. Again. I don't store my
code-signing cert in the virtual machine, I keep it on my real machine
and mount a directory from host to guest to access it. And the mapping
isn't working for some reason.


D'oh. VitualBox hadn't been given access to my "Downloads" folder and the
program on the guest isn't smart enough to notify the user in the guest that
it's a problem. :/

-chris

-
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



-
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: Bump to next version.

[schultz]

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

schultz 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 6b28c90e16 Bump to next version.
6b28c90e16 is described below

commit 6b28c90e169c2ab48b2433f05e6789764a0a1d7a
Author: Christopher Schultz 
AuthorDate: Wed Nov 16 11:07:58 2022 -0500

Bump to next version.
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index da38ec799b..0f4fb8a63b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=84
+version.build=85
 version.patch=0
 version.suffix=
 version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 6d3e6d2f88..aa09085888 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.84
+maven.asf.release.deploy.version=8.5.85
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 76af06a4f0..673194e1db 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,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

RE: Tomcat 8.5.84

[jonmcalexander]

I feel for ya man. Sounds like my typical day.

Dream * Excel * Explore * Inspire
Jon McAlexander
Senior Infrastructure Engineer
Asst. Vice President
He/His

Middleware Product Engineering
Enterprise CIO | EAS | Middleware | Infrastructure Solutions

8080 Cobblestone Rd | Urbandale, IA 50322
MAC: F4469-010
Tel 515-988-2508 | Cell 515-988-2508

jonmcalexan...@wellsfargo.com
This message may contain confidential and/or privileged information. If you are 
not the addressee or authorized to receive this for the addressee, you must not 
use, copy, disclose, or take any action based on this message or any 
information herein. If you have received this message in error, please advise 
the sender immediately by reply e-mail and delete this message. Thank you for 
your cooperation.

> -Original Message-
> From: Christopher Schultz 
> Sent: Wednesday, November 16, 2022 9:55 AM
> To: Tomcat Developers List 
> Subject: Re: Tomcat 8.5.84
> 
> All,
> 
> On 11/16/22 10:11, Christopher Schultz wrote:
> > All,
> >
> > On 11/15/22 21:43, Christopher Schultz wrote:
> >> All,
> >>
> >> Sorry, I've been MIA the past few days and haven't yet rolled an
> >> 8.5.84 release.
> >>
> >> I will begin the process tomorrow.
> >>
> >> -chris
> >
> > Ugh, I'm having VirtualBox problems. Again. I don't store my
> > code-signing cert in the virtual machine, I keep it on my real machine
> > and mount a directory from host to guest to access it. And the mapping
> > isn't working for some reason.
> 
> D'oh. VitualBox hadn't been given access to my "Downloads" folder and the
> program on the guest isn't smart enough to notify the user in the guest that
> it's a problem. :/
> 
> -chris
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional
> commands, e-mail: dev-h...@tomcat.apache.org

Buildbot success in on tomcat-11.0.x

[buildbot]

Build status: Build succeeded!
Worker used: bb2_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/48
Blamelist: Mark Thomas 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch main] cf50db9346164a9772d285331fa887c6b09491f6


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

[Christopher Schultz]

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

The notable changes compared to 8.5.83 are:

- Fix concurrency issue in evaluation of expression language containing
   lambda expressions.

- Correct the date format used with the expires attribute of HTTP
   cookies. A single space rather than a single dash should be used to
   separate the day, month and year components to be compliant with RFC
   6265.

- Update to Commons Daemon 1.3.2.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.84/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1407

The tag is:
https://github.com/apache/tomcat/tree/8.5.84/
079a46c1c1e56b1743e752a44450469690880a56

The proposed 8.5.84 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.84 (stable)

-
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

Re: Tomcat 8.5.84

[Christopher Schultz]

All,

On 11/16/22 10:11, Christopher Schultz wrote:

All,

On 11/15/22 21:43, Christopher Schultz wrote:

All,

Sorry, I've been MIA the past few days and haven't yet rolled an 
8.5.84 release.


I will begin the process tomorrow.

-chris


Ugh, I'm having VirtualBox problems. Again. I don't store my 
code-signing cert in the virtual machine, I keep it on my real machine 
and mount a directory from host to guest to access it. And the mapping 
isn't working for some reason.


D'oh. VitualBox hadn't been given access to my "Downloads" folder and 
the program on the guest isn't smart enough to notify the user in the 
guest that it's a problem. :/


-chris

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

svn commit: r58047 [1/2] - in /dev/tomcat/tomcat-8/v8.5.84: ./ bin/ bin/embed/ bin/extras/ src/

[schultz]

Author: schultz
Date: Wed Nov 16 15:51:54 2022
New Revision: 58047

Log:
Upload 8.5.84 for voting

Added:
dev/tomcat/tomcat-8/v8.5.84/
dev/tomcat/tomcat-8/v8.5.84/KEYS
dev/tomcat/tomcat-8/v8.5.84/README.html
dev/tomcat/tomcat-8/v8.5.84/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.84/bin/
dev/tomcat/tomcat-8/v8.5.84/bin/README.html
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-deployer.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-deployer.zip.sha512
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-windows-x64.zip.sha512
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84-windows-x86.zip.sha512
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84.exe   (with props)
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84.exe.asc
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84.exe.sha512
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84.zip   (with props)
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84.zip.asc
dev/tomcat/tomcat-8/v8.5.84/bin/apache-tomcat-8.5.84.zip.sha512
dev/tomcat/tomcat-8/v8.5.84/bin/embed/
dev/tomcat/tomcat-8/v8.5.84/bin/embed/apache-tomcat-8.5.84-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.84/bin/embed/apache-tomcat-8.5.84-embed.tar.gz.asc

dev/tomcat/tomcat-8/v8.5.84/bin/embed/apache-tomcat-8.5.84-embed.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.84/bin/embed/apache-tomcat-8.5.84-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.84/bin/embed/apache-tomcat-8.5.84-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.84/bin/embed/apache-tomcat-8.5.84-embed.zip.sha512
dev/tomcat/tomcat-8/v8.5.84/bin/extras/
dev/tomcat/tomcat-8/v8.5.84/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.84/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.84/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-8/v8.5.84/src/
dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.zip.asc
dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.zip.sha512

Added: dev/tomcat/tomcat-8/v8.5.84/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.84/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.84/KEYS Wed Nov 16 15:51:54 2022
@@ -0,0 +1,785 @@
+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+49rSuQn7Lo9l02OUbLQgQW5

svn commit: r58047 [2/2] - in /dev/tomcat/tomcat-8/v8.5.84: ./ bin/ bin/embed/ bin/extras/ src/

[schultz]

Added: dev/tomcat/tomcat-8/v8.5.84/bin/extras/catalina-ws.jar.asc
==
--- dev/tomcat/tomcat-8/v8.5.84/bin/extras/catalina-ws.jar.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.84/bin/extras/catalina-ws.jar.asc Wed Nov 16 
15:51:54 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmN1Ba4ACgkQHPApP6U8
+pFh2pA/6AusEUO/C1pJA7yIzJNGnRIHRa2IKs+3TEtU7QhfGDJOVqdyMRHzSzX6s
+wHTDsswelvSsWyBVCLc0PqGh1hEPyg3xPJeHiD7aen6VCscR28M6PljTGC6UVUMk
+Ksz5n0vwMSeH0xBjGycVX7mp6IYse9dIMC4VICSwOoHKMYLKxNcsEcJ+LyIg+9pa
+XtkQm9XSh9GeiYGpPIAgBjx2kSFCTzRmXD3uI+h2Cygll1nZEYd82BjHCgYCpo7k
+dKtJ5WDSp6rnbNGDnJ0/+NEfvZJ/dUhpO1SkNpyzp8rR7BQG8aaW1UYLlaV/NyXW
+MD0hFDtACytZBfsMFhE2tgsrIXR89xlBdz+sOkXtQx1qvhtt7b0Xfnl6TWp1tW8C
+Jo91OPj+Cg68vVWtA3JpCwdZD679E0bZeK8b7s4hNzVM1ZgkJprc/0Bj91ov4nR7
+wWrKzSoCQ7WPhBKdnaE/AHK30i1ZSTnvJkdJU7nwSvCgxibzh7gO0BKARL6rQBaD
+ccGh1qsRvLu30FJegGi8jIgr2th2sqOopJVbfqAetkoPY/ZTI9VURsiZpNIS336A
+JtW8wcsYYtJyODu7kdAi4RsRLcZcfJvdLrIAlLQ0HldV9x6po8RwCjLIPdu3xOpL
+W91Otda181ZaAYewuun+O05nbbCvwtNu/A1Upiv86sX91cOnhMg=
+=h5SH
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.84/bin/extras/catalina-ws.jar.sha512
==
--- dev/tomcat/tomcat-8/v8.5.84/bin/extras/catalina-ws.jar.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.84/bin/extras/catalina-ws.jar.sha512 Wed Nov 16 
15:51:54 2022
@@ -0,0 +1 @@
+2e0ef5e91e8253a50155f5227c06c07bf89e177c3f86d699d16181bf9a8963efff45e64f168573dbe45f57b81743511322302131b25c9323b641fb1ea7b76ff6
 *catalina-ws.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.tar.gz.asc
==
--- dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.tar.gz.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.tar.gz.asc Wed Nov 
16 15:51:54 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmN1BqgACgkQHPApP6U8
+pFiuxxAAkjpJYRDydolCmTIbCRUKa6FFQI0/a9NAcn/4A0UhxJ3thZfi86fDwr1W
+0K1/M9Ov74KrIuPkcsPsxv9RgiTLy5GnF4PIYy+VKPCuCXmSPBJ1edL5oOYIO4Ps
+A/XO75wSkBQZV0em+ZLzkhti3cs4gIXAFmDFBEP1WP8f5kRDFTJTfe369uEDoDqb
++WzacgzawsaNiFfBfwUN3vKBQaS5C7KLshbB9V8RTG3r5lPJZW5OHSVeiCZeKHpd
+9KVcstfCYuMHhMWBf5njpfkJlOlYG/viTewwxoTj+4PUpI4t3d8iLyaNTpDDNlhN
+hzyxzo58Bn2c2gzmgJjC4pdLBPr4Q7VDNh6+HVR6CdjupptuKx4lS+lipM+EPySN
+TxUZTCWEmJcbr0+lgxyUViv2eOJohhVOw+9UrZWSmOYzfSf42nCbMnQDXS9H1cce
+l2UqHtucO7vC9xpGoiBJ6Ze/0lOs+f7KunsuYjyRvTFQIWS4ngeeZQsyNI98IMnr
+Gis0XV5uB7R059m69h2RpMZoYbGTSi0c72VNSbNwbskTeFoa0S6ZaMDGlFLPQ+ww
+QdWLaww1PSKQ+QoztjC8nMOF+ctJ8VTmPr4rwEFxT/cJ2OJP6qKwpdP12a/e4Yu7
+JdZmZkdl4jaNxx6Dn+kk0wBUFLHYhuNYNjYVUVvR15ZWfNZ8vj8=
+=Kqbc
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.tar.gz.sha512
==
--- dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.tar.gz.sha512 
(added)
+++ dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.tar.gz.sha512 Wed 
Nov 16 15:51:54 2022
@@ -0,0 +1 @@
+5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 *apache-tomcat-8.5.84-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.zip
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.84/src/apache-tomcat-8.5.84-src.zip.asc Wed Nov 16 
15:51:54 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmN1Bo4ACgkQHPApP6U8
+pFhsGw//d46Y4mWEqjU1EzkMDR4CB6U5BxdbQKeSQdW4eZtVA3aHbxE4gXsl42MY
+R/jG7tiAVZeAa2d9WQQtw4jUdJmXF8c2bzree2oPk4YMhBBZ2SSLbFWAbfH/9+yl
+qlPtika3jj+Rq57+qwPCI2/9VR7waEs9pk0Odew3Oe927mn+SlDCIeqax3agcYha
+2UvR2FrZajiKtNfrtNVnszmsNsPNWc4tgMTxecyOOSpc81SPAGswzOBnlpC/kbr7
+IxzJ9FqEPVcdpvrvUoMDa37kxcih6XMukFxyDq0mdPHGKK3jFC3olS2mIiir011y
+cVXARuvJVPajjIPUxhikUFBw4ZOcZKNBb23H7Njv

[tomcat] branch 8.5.x updated: More URL -> URI refactoring

[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 3d958a042b More URL -> URI refactoring
3d958a042b is described below

commit 3d958a042b85c2c48366723ae5a874ba3fe1c9d3
Author: Mark Thomas 
AuthorDate: Wed Nov 16 15:28:40 2022 +

More URL -> URI refactoring
---
 java/org/apache/catalina/startup/CatalinaProperties.java   |  2 +-
 java/org/apache/catalina/startup/ClassLoaderFactory.java   |  4 ++--
 java/org/apache/catalina/webresources/JarResourceRoot.java |  4 ++--
 java/org/apache/jasper/compiler/Compiler.java  |  5 +++--
 java/org/apache/jasper/compiler/TagLibraryInfoImpl.java|  2 +-
 java/org/apache/jasper/servlet/JspCServletContext.java | 14 ++
 java/org/apache/jasper/servlet/TldPreScanned.java  |  3 ++-
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/catalina/startup/CatalinaProperties.java 
b/java/org/apache/catalina/startup/CatalinaProperties.java
index 7ed368a5da..82ce77cc21 100644
--- a/java/org/apache/catalina/startup/CatalinaProperties.java
+++ b/java/org/apache/catalina/startup/CatalinaProperties.java
@@ -63,7 +63,7 @@ public class CatalinaProperties {
 try {
 String configUrl = System.getProperty("catalina.config");
 if (configUrl != null) {
-is = (new URI(configUrl)).toURL().openStream();
+is = new URI(configUrl).toURL().openStream();
 }
 } catch (Throwable t) {
 handleThrowable(t);
diff --git a/java/org/apache/catalina/startup/ClassLoaderFactory.java 
b/java/org/apache/catalina/startup/ClassLoaderFactory.java
index 08387e47d0..684b707e52 100644
--- a/java/org/apache/catalina/startup/ClassLoaderFactory.java
+++ b/java/org/apache/catalina/startup/ClassLoaderFactory.java
@@ -302,7 +302,7 @@ public final class ClassLoaderFactory {
 // the URL will be used as is. It is therefore necessary to ensure that
 // the sequence "!/" is not present in a class loader URL.
 String result = urlString.replaceAll("!/", "%21/");
-return (new URI(result)).toURL();
+return new URI(result).toURL();
 }
 
 
@@ -310,7 +310,7 @@ public final class ClassLoaderFactory {
 // Could be a directory or a file
 String fileUrlString = file.toURI().toString();
 fileUrlString = fileUrlString.replaceAll("!/", "%21/");
-return (new URI(fileUrlString)).toURL();
+return new URI(fileUrlString).toURL();
 }
 
 
diff --git a/java/org/apache/catalina/webresources/JarResourceRoot.java 
b/java/org/apache/catalina/webresources/JarResourceRoot.java
index 48d1d366e0..fc11a47b05 100644
--- a/java/org/apache/catalina/webresources/JarResourceRoot.java
+++ b/java/org/apache/catalina/webresources/JarResourceRoot.java
@@ -126,7 +126,7 @@ public class JarResourceRoot extends AbstractResource {
 public URL getURL() {
 String url = baseUrl + "!/";
 try {
-return (new URI(url)).toURL();
+return new URI(url).toURL();
 } catch (MalformedURLException | URISyntaxException e) {
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("fileResource.getUrlFail", url), e);
@@ -138,7 +138,7 @@ public class JarResourceRoot extends AbstractResource {
 @Override
 public URL getCodeBase() {
 try {
-return (new URI(baseUrl)).toURL();
+return new URI(baseUrl).toURL();
 } catch (MalformedURLException | URISyntaxException e) {
 if (getLog().isDebugEnabled()) {
 getLog().debug(sm.getString("fileResource.getUrlFail", 
baseUrl), e);
diff --git a/java/org/apache/jasper/compiler/Compiler.java 
b/java/org/apache/jasper/compiler/Compiler.java
index 3be9e58c89..935c19ca1b 100644
--- a/java/org/apache/jasper/compiler/Compiler.java
+++ b/java/org/apache/jasper/compiler/Compiler.java
@@ -23,6 +23,7 @@ import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.JarURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Map;
@@ -506,12 +507,12 @@ public abstract class Compiler {
 // Assume we constructed this correctly
 int entryStart = key.lastIndexOf("!/");
 String entry = key.substring(entryStart + 2);
-try (Jar jar = JarFactory.newInstance(new 
URL(key.substring(4, entryStart {
+try (Jar jar = JarFactory.newInstance(new 
URI(key.substring(4, entryStart)).toURL())) {
 includeLastModified = jar.getLastModified(entry);
 }
 } else {
 if (key.startsWith("jar:") || key.startsWith("f

[tomcat] branch 9.0.x updated: More URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 10353648bc More URL -> URI refactoring
10353648bc is described below

commit 10353648bcb0500e1c89c64946ab145a4bd50a70
Author: Mark Thomas 
AuthorDate: Wed Nov 16 15:28:40 2022 +

More URL -> URI refactoring
---
 java/org/apache/catalina/startup/CatalinaProperties.java   |  2 +-
 java/org/apache/catalina/startup/ClassLoaderFactory.java   |  4 ++--
 java/org/apache/catalina/webresources/JarResourceRoot.java |  4 ++--
 java/org/apache/jasper/compiler/Compiler.java  |  5 +++--
 java/org/apache/jasper/compiler/TagLibraryInfoImpl.java|  2 +-
 java/org/apache/jasper/servlet/JspCServletContext.java | 14 ++
 java/org/apache/jasper/servlet/TldPreScanned.java  |  3 ++-
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/catalina/startup/CatalinaProperties.java 
b/java/org/apache/catalina/startup/CatalinaProperties.java
index 9bdad9d300..2bf690705b 100644
--- a/java/org/apache/catalina/startup/CatalinaProperties.java
+++ b/java/org/apache/catalina/startup/CatalinaProperties.java
@@ -69,7 +69,7 @@ public class CatalinaProperties {
 // No '/'. Must be a file name rather than a URL
 fileName = configUrl;
 } else {
-is = (new URI(configUrl)).toURL().openStream();
+is = new URI(configUrl).toURL().openStream();
 }
 }
 } catch (Throwable t) {
diff --git a/java/org/apache/catalina/startup/ClassLoaderFactory.java 
b/java/org/apache/catalina/startup/ClassLoaderFactory.java
index 6935071db7..0fc76f3fcd 100644
--- a/java/org/apache/catalina/startup/ClassLoaderFactory.java
+++ b/java/org/apache/catalina/startup/ClassLoaderFactory.java
@@ -296,7 +296,7 @@ public final class ClassLoaderFactory {
 // the URL will be used as is. It is therefore necessary to ensure that
 // the sequence "!/" is not present in a class loader URL.
 String result = urlString.replaceAll("!/", "%21/");
-return (new URI(result)).toURL();
+return new URI(result).toURL();
 }
 
 
@@ -304,7 +304,7 @@ public final class ClassLoaderFactory {
 // Could be a directory or a file
 String fileUrlString = file.toURI().toString();
 fileUrlString = fileUrlString.replaceAll("!/", "%21/");
-return (new URI(fileUrlString)).toURL();
+return new URI(fileUrlString).toURL();
 }
 
 
diff --git a/java/org/apache/catalina/webresources/JarResourceRoot.java 
b/java/org/apache/catalina/webresources/JarResourceRoot.java
index 48d1d366e0..fc11a47b05 100644
--- a/java/org/apache/catalina/webresources/JarResourceRoot.java
+++ b/java/org/apache/catalina/webresources/JarResourceRoot.java
@@ -126,7 +126,7 @@ public class JarResourceRoot extends AbstractResource {
 public URL getURL() {
 String url = baseUrl + "!/";
 try {
-return (new URI(url)).toURL();
+return new URI(url).toURL();
 } catch (MalformedURLException | URISyntaxException e) {
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("fileResource.getUrlFail", url), e);
@@ -138,7 +138,7 @@ public class JarResourceRoot extends AbstractResource {
 @Override
 public URL getCodeBase() {
 try {
-return (new URI(baseUrl)).toURL();
+return new URI(baseUrl).toURL();
 } catch (MalformedURLException | URISyntaxException e) {
 if (getLog().isDebugEnabled()) {
 getLog().debug(sm.getString("fileResource.getUrlFail", 
baseUrl), e);
diff --git a/java/org/apache/jasper/compiler/Compiler.java 
b/java/org/apache/jasper/compiler/Compiler.java
index 9008a63b0c..5668065c59 100644
--- a/java/org/apache/jasper/compiler/Compiler.java
+++ b/java/org/apache/jasper/compiler/Compiler.java
@@ -23,6 +23,7 @@ import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.JarURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Map;
@@ -516,12 +517,12 @@ public abstract class Compiler {
 // Assume we constructed this correctly
 int entryStart = key.lastIndexOf("!/");
 String entry = key.substring(entryStart + 2);
-try (Jar jar = JarFactory.newInstance(new 
URL(key.substring(4, entryStart {
+try (Jar jar = JarFactory.newInstance(new 
URI(key.substring(4, entryStart)).toURL())) {
 includeLastModified = jar.getLastModified(entry);
 }
 } else {
 if (key.startsWith("jar:") || key.star

[tomcat] branch 10.1.x updated: More URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 59a860c3de More URL -> URI refactoring
59a860c3de is described below

commit 59a860c3de900bfdafd9d9371a181d9442049f4f
Author: Mark Thomas 
AuthorDate: Wed Nov 16 15:28:40 2022 +

More URL -> URI refactoring
---
 java/org/apache/catalina/startup/CatalinaProperties.java   |  2 +-
 java/org/apache/catalina/startup/ClassLoaderFactory.java   |  4 ++--
 java/org/apache/catalina/webresources/JarResourceRoot.java |  4 ++--
 java/org/apache/jasper/compiler/Compiler.java  |  5 +++--
 java/org/apache/jasper/compiler/TagLibraryInfoImpl.java|  2 +-
 java/org/apache/jasper/servlet/JspCServletContext.java | 14 ++
 java/org/apache/jasper/servlet/TldPreScanned.java  |  3 ++-
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/catalina/startup/CatalinaProperties.java 
b/java/org/apache/catalina/startup/CatalinaProperties.java
index 9bdad9d300..2bf690705b 100644
--- a/java/org/apache/catalina/startup/CatalinaProperties.java
+++ b/java/org/apache/catalina/startup/CatalinaProperties.java
@@ -69,7 +69,7 @@ public class CatalinaProperties {
 // No '/'. Must be a file name rather than a URL
 fileName = configUrl;
 } else {
-is = (new URI(configUrl)).toURL().openStream();
+is = new URI(configUrl).toURL().openStream();
 }
 }
 } catch (Throwable t) {
diff --git a/java/org/apache/catalina/startup/ClassLoaderFactory.java 
b/java/org/apache/catalina/startup/ClassLoaderFactory.java
index a104f57b66..394e8a0606 100644
--- a/java/org/apache/catalina/startup/ClassLoaderFactory.java
+++ b/java/org/apache/catalina/startup/ClassLoaderFactory.java
@@ -296,7 +296,7 @@ public final class ClassLoaderFactory {
 // the URL will be used as is. It is therefore necessary to ensure that
 // the sequence "!/" is not present in a class loader URL.
 String result = urlString.replaceAll("!/", "%21/");
-return (new URI(result)).toURL();
+return new URI(result).toURL();
 }
 
 
@@ -304,7 +304,7 @@ public final class ClassLoaderFactory {
 // Could be a directory or a file
 String fileUrlString = file.toURI().toString();
 fileUrlString = fileUrlString.replaceAll("!/", "%21/");
-return (new URI(fileUrlString)).toURL();
+return new URI(fileUrlString).toURL();
 }
 
 
diff --git a/java/org/apache/catalina/webresources/JarResourceRoot.java 
b/java/org/apache/catalina/webresources/JarResourceRoot.java
index 48d1d366e0..fc11a47b05 100644
--- a/java/org/apache/catalina/webresources/JarResourceRoot.java
+++ b/java/org/apache/catalina/webresources/JarResourceRoot.java
@@ -126,7 +126,7 @@ public class JarResourceRoot extends AbstractResource {
 public URL getURL() {
 String url = baseUrl + "!/";
 try {
-return (new URI(url)).toURL();
+return new URI(url).toURL();
 } catch (MalformedURLException | URISyntaxException e) {
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("fileResource.getUrlFail", url), e);
@@ -138,7 +138,7 @@ public class JarResourceRoot extends AbstractResource {
 @Override
 public URL getCodeBase() {
 try {
-return (new URI(baseUrl)).toURL();
+return new URI(baseUrl).toURL();
 } catch (MalformedURLException | URISyntaxException e) {
 if (getLog().isDebugEnabled()) {
 getLog().debug(sm.getString("fileResource.getUrlFail", 
baseUrl), e);
diff --git a/java/org/apache/jasper/compiler/Compiler.java 
b/java/org/apache/jasper/compiler/Compiler.java
index b38edae2be..6dca35c4a3 100644
--- a/java/org/apache/jasper/compiler/Compiler.java
+++ b/java/org/apache/jasper/compiler/Compiler.java
@@ -23,6 +23,7 @@ import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.JarURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Map;
@@ -520,12 +521,12 @@ public abstract class Compiler {
 // Assume we constructed this correctly
 int entryStart = key.lastIndexOf("!/");
 String entry = key.substring(entryStart + 2);
-try (Jar jar = JarFactory.newInstance(new 
URL(key.substring(4, entryStart {
+try (Jar jar = JarFactory.newInstance(new 
URI(key.substring(4, entryStart)).toURL())) {
 includeLastModified = jar.getLastModified(entry);
 }
 } else {
 if (key.startsWith("jar:") || key.st

[tomcat] branch main updated: More URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 50795b5cd7 More URL -> URI refactoring
50795b5cd7 is described below

commit 50795b5cd767e5f06db7c9348c187c12c0537644
Author: Mark Thomas 
AuthorDate: Wed Nov 16 15:28:40 2022 +

More URL -> URI refactoring
---
 java/org/apache/catalina/startup/CatalinaProperties.java   |  2 +-
 java/org/apache/catalina/startup/ClassLoaderFactory.java   |  4 ++--
 java/org/apache/catalina/webresources/JarResourceRoot.java |  4 ++--
 java/org/apache/jasper/compiler/Compiler.java  |  5 +++--
 java/org/apache/jasper/compiler/TagLibraryInfoImpl.java|  2 +-
 java/org/apache/jasper/servlet/JspCServletContext.java | 14 ++
 java/org/apache/jasper/servlet/TldPreScanned.java  |  3 ++-
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/catalina/startup/CatalinaProperties.java 
b/java/org/apache/catalina/startup/CatalinaProperties.java
index 9bdad9d300..2bf690705b 100644
--- a/java/org/apache/catalina/startup/CatalinaProperties.java
+++ b/java/org/apache/catalina/startup/CatalinaProperties.java
@@ -69,7 +69,7 @@ public class CatalinaProperties {
 // No '/'. Must be a file name rather than a URL
 fileName = configUrl;
 } else {
-is = (new URI(configUrl)).toURL().openStream();
+is = new URI(configUrl).toURL().openStream();
 }
 }
 } catch (Throwable t) {
diff --git a/java/org/apache/catalina/startup/ClassLoaderFactory.java 
b/java/org/apache/catalina/startup/ClassLoaderFactory.java
index a104f57b66..394e8a0606 100644
--- a/java/org/apache/catalina/startup/ClassLoaderFactory.java
+++ b/java/org/apache/catalina/startup/ClassLoaderFactory.java
@@ -296,7 +296,7 @@ public final class ClassLoaderFactory {
 // the URL will be used as is. It is therefore necessary to ensure that
 // the sequence "!/" is not present in a class loader URL.
 String result = urlString.replaceAll("!/", "%21/");
-return (new URI(result)).toURL();
+return new URI(result).toURL();
 }
 
 
@@ -304,7 +304,7 @@ public final class ClassLoaderFactory {
 // Could be a directory or a file
 String fileUrlString = file.toURI().toString();
 fileUrlString = fileUrlString.replaceAll("!/", "%21/");
-return (new URI(fileUrlString)).toURL();
+return new URI(fileUrlString).toURL();
 }
 
 
diff --git a/java/org/apache/catalina/webresources/JarResourceRoot.java 
b/java/org/apache/catalina/webresources/JarResourceRoot.java
index 48d1d366e0..fc11a47b05 100644
--- a/java/org/apache/catalina/webresources/JarResourceRoot.java
+++ b/java/org/apache/catalina/webresources/JarResourceRoot.java
@@ -126,7 +126,7 @@ public class JarResourceRoot extends AbstractResource {
 public URL getURL() {
 String url = baseUrl + "!/";
 try {
-return (new URI(url)).toURL();
+return new URI(url).toURL();
 } catch (MalformedURLException | URISyntaxException e) {
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("fileResource.getUrlFail", url), e);
@@ -138,7 +138,7 @@ public class JarResourceRoot extends AbstractResource {
 @Override
 public URL getCodeBase() {
 try {
-return (new URI(baseUrl)).toURL();
+return new URI(baseUrl).toURL();
 } catch (MalformedURLException | URISyntaxException e) {
 if (getLog().isDebugEnabled()) {
 getLog().debug(sm.getString("fileResource.getUrlFail", 
baseUrl), e);
diff --git a/java/org/apache/jasper/compiler/Compiler.java 
b/java/org/apache/jasper/compiler/Compiler.java
index b38edae2be..6dca35c4a3 100644
--- a/java/org/apache/jasper/compiler/Compiler.java
+++ b/java/org/apache/jasper/compiler/Compiler.java
@@ -23,6 +23,7 @@ import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.JarURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Map;
@@ -520,12 +521,12 @@ public abstract class Compiler {
 // Assume we constructed this correctly
 int entryStart = key.lastIndexOf("!/");
 String entry = key.substring(entryStart + 2);
-try (Jar jar = JarFactory.newInstance(new 
URL(key.substring(4, entryStart {
+try (Jar jar = JarFactory.newInstance(new 
URI(key.substring(4, entryStart)).toURL())) {
 includeLastModified = jar.getLastModified(entry);
 }
 } else {
 if (key.startsWith("jar:") || key.starts

Buildbot failure in on tomcat-10.1.x

[buildbot]

Build status: BUILD FAILED: failed compile (failure)
Worker used: bb2_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/578
Blamelist: Mark Thomas 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 10.1.x] 4b29f8108b6ad1de800134712d1767a10670c03a


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

Re: Tomcat 8.5.84

[Christopher Schultz]

All,

On 11/15/22 21:43, Christopher Schultz wrote:

All,

Sorry, I've been MIA the past few days and haven't yet rolled an 8.5.84 
release.


I will begin the process tomorrow.

-chris


Ugh, I'm having VirtualBox problems. Again. I don't store my 
code-signing cert in the virtual machine, I keep it on my real machine 
and mount a directory from host to guest to access it. And the mapping 
isn't working for some reason.


If I can figure it out soon, I'll just copy the keystore into the VM and 
keep going.


(We need a step early in the build process which tests to see if GPG and 
jsign are going to work later in the build. I hate waiting 10 minutes to 
encounter these failures.)


-chris

-
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: More URL -> URI refactoring

[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 2e4330ddc4 More URL -> URI refactoring
2e4330ddc4 is described below

commit 2e4330ddc418c4a4e7cf4abb2e177ddb96dbc13f
Author: Mark Thomas 
AuthorDate: Wed Nov 16 14:53:17 2022 +

More URL -> URI refactoring
---
 java/org/apache/catalina/connector/Response.java |  7 +--
 java/org/apache/catalina/core/NamingContextListener.java | 12 
 java/org/apache/catalina/startup/Bootstrap.java  | 10 ++
 java/org/apache/catalina/startup/CatalinaProperties.java |  4 ++--
 java/org/apache/catalina/startup/ClassLoaderFactory.java | 10 ++
 java/org/apache/catalina/startup/ContextConfig.java  | 11 +++
 java/org/apache/catalina/startup/WebappServiceLoader.java| 11 ++-
 .../catalina/webresources/AbstractArchiveResource.java   | 10 ++
 java/org/apache/catalina/webresources/CachedResource.java| 11 ++-
 java/org/apache/catalina/webresources/JarResourceRoot.java   | 10 ++
 java/org/apache/catalina/webresources/StandardRoot.java  |  6 +++---
 11 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/java/org/apache/catalina/connector/Response.java 
b/java/org/apache/catalina/connector/Response.java
index 67dc666fdc..c9e8d479e3 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -19,6 +19,8 @@ package org.apache.catalina.connector;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.security.AccessController;
@@ -1576,8 +1578,9 @@ public class Response implements HttpServletResponse {
 // Is this a valid absolute URL?
 URL url = null;
 try {
-url = new URL(location);
-} catch (MalformedURLException e) {
+URI uri = new URI(location);
+url = uri.toURL();
+} catch (MalformedURLException | URISyntaxException e) {
 return false;
 }
 
diff --git a/java/org/apache/catalina/core/NamingContextListener.java 
b/java/org/apache/catalina/core/NamingContextListener.java
index 0eb9b99827..90cde74adc 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -21,6 +21,8 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Collection;
 import java.util.HashMap;
@@ -852,8 +854,9 @@ public class NamingContextListener
 URL wsdlURL = null;
 
 try {
-wsdlURL = new URL(service.getWsdlfile());
-} catch (MalformedURLException e) {
+URI wsdlURI = new URI(service.getWsdlfile());
+wsdlURL = wsdlURI.toURL();
+} catch (MalformedURLException | URISyntaxException e) {
 // Ignore and carry on
 }
 if (wsdlURL == null) {
@@ -885,8 +888,9 @@ public class NamingContextListener
 URL jaxrpcURL = null;
 
 try {
-jaxrpcURL = new URL(service.getJaxrpcmappingfile());
-} catch (MalformedURLException e) {
+URI jaxrpcURI = new URI(service.getJaxrpcmappingfile());
+jaxrpcURL = jaxrpcURI.toURL();
+} catch (MalformedURLException | URISyntaxException e) {
 // Ignore and carry on
 }
 if (jaxrpcURL == null) {
diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
b/java/org/apache/catalina/startup/Bootstrap.java
index 0a55f69c8d..307c8b4cb6 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -21,6 +21,8 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -156,8 +158,7 @@ public final class Bootstrap {
 }
 
 
-private ClassLoader createClassLoader(String name, ClassLoader parent)
-throws Exception {
+private ClassLoader createClassLoader(String name, ClassLoader parent) 
throws Exception {
 
 String value = CatalinaProperties.getProperty(name + ".loader");
 if ((value == null) || (value.equals(

[tomcat] branch 9.0.x updated: More URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 2a03ff1b77 More URL -> URI refactoring
2a03ff1b77 is described below

commit 2a03ff1b778e6f4d05a60c3a9597b42ed4176aed
Author: Mark Thomas 
AuthorDate: Wed Nov 16 14:53:17 2022 +

More URL -> URI refactoring
---
 java/org/apache/catalina/connector/Response.java |  7 +--
 java/org/apache/catalina/core/NamingContextListener.java | 12 
 java/org/apache/catalina/startup/Bootstrap.java  | 10 ++
 java/org/apache/catalina/startup/CatalinaProperties.java |  4 ++--
 java/org/apache/catalina/startup/ClassLoaderFactory.java | 10 ++
 java/org/apache/catalina/startup/ContextConfig.java  | 11 +++
 java/org/apache/catalina/startup/WebappServiceLoader.java| 11 ++-
 .../tribes/membership/cloud/AbstractStreamProvider.java  | 11 +--
 .../catalina/webresources/AbstractArchiveResource.java   | 10 ++
 java/org/apache/catalina/webresources/CachedResource.java| 11 ++-
 java/org/apache/catalina/webresources/JarResourceRoot.java   | 10 ++
 java/org/apache/catalina/webresources/StandardRoot.java  |  6 +++---
 12 files changed, 78 insertions(+), 35 deletions(-)

diff --git a/java/org/apache/catalina/connector/Response.java 
b/java/org/apache/catalina/connector/Response.java
index 7b6cfb3ff1..e18d3dbad6 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -20,6 +20,8 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.security.AccessController;
@@ -1577,8 +1579,9 @@ public class Response implements HttpServletResponse {
 // Is this a valid absolute URL?
 URL url = null;
 try {
-url = new URL(location);
-} catch (MalformedURLException e) {
+URI uri = new URI(location);
+url = uri.toURL();
+} catch (MalformedURLException | URISyntaxException e) {
 return false;
 }
 
diff --git a/java/org/apache/catalina/core/NamingContextListener.java 
b/java/org/apache/catalina/core/NamingContextListener.java
index 8d3092ca49..77070a10f5 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -21,6 +21,8 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Collection;
 import java.util.HashMap;
@@ -852,8 +854,9 @@ public class NamingContextListener
 URL wsdlURL = null;
 
 try {
-wsdlURL = new URL(service.getWsdlfile());
-} catch (MalformedURLException e) {
+URI wsdlURI = new URI(service.getWsdlfile());
+wsdlURL = wsdlURI.toURL();
+} catch (MalformedURLException | URISyntaxException e) {
 // Ignore and carry on
 }
 if (wsdlURL == null) {
@@ -885,8 +888,9 @@ public class NamingContextListener
 URL jaxrpcURL = null;
 
 try {
-jaxrpcURL = new URL(service.getJaxrpcmappingfile());
-} catch (MalformedURLException e) {
+URI jaxrpcURI = new URI(service.getJaxrpcmappingfile());
+jaxrpcURL = jaxrpcURI.toURL();
+} catch (MalformedURLException | URISyntaxException e) {
 // Ignore and carry on
 }
 if (jaxrpcURL == null) {
diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
b/java/org/apache/catalina/startup/Bootstrap.java
index 6a16c8b330..2f8999a829 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -21,6 +21,8 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -156,8 +158,7 @@ public final class Bootstrap {
 }
 
 
-private ClassLoader createClassLoader(String name, ClassLoader parent)
-throws Exception {
+private ClassLoader createClassLoader(String name, ClassLoader parent) 
throws Exception {
 
 String value = CatalinaPro

[tomcat] branch 10.1.x updated: More URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 88640cc1c7 More URL -> URI refactoring
88640cc1c7 is described below

commit 88640cc1c77c4fc5fc99d4d6fb4e4e06abc82f45
Author: Mark Thomas 
AuthorDate: Wed Nov 16 14:53:17 2022 +

More URL -> URI refactoring
---
 java/org/apache/catalina/connector/Response.java |  7 +--
 java/org/apache/catalina/core/NamingContextListener.java | 12 
 java/org/apache/catalina/startup/Bootstrap.java  | 10 ++
 java/org/apache/catalina/startup/CatalinaProperties.java |  4 ++--
 java/org/apache/catalina/startup/ClassLoaderFactory.java | 10 ++
 java/org/apache/catalina/startup/ContextConfig.java  | 11 +++
 java/org/apache/catalina/startup/WebappServiceLoader.java| 11 ++-
 .../tribes/membership/cloud/AbstractStreamProvider.java  | 11 +--
 .../catalina/webresources/AbstractArchiveResource.java   | 10 ++
 java/org/apache/catalina/webresources/CachedResource.java| 11 ++-
 java/org/apache/catalina/webresources/JarResourceRoot.java   | 10 ++
 java/org/apache/catalina/webresources/StandardRoot.java  |  6 +++---
 12 files changed, 78 insertions(+), 35 deletions(-)

diff --git a/java/org/apache/catalina/connector/Response.java 
b/java/org/apache/catalina/connector/Response.java
index 4349c8867e..394614a9aa 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -20,6 +20,8 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.security.AccessController;
@@ -1482,8 +1484,9 @@ public class Response implements HttpServletResponse {
 // Is this a valid absolute URL?
 URL url = null;
 try {
-url = new URL(location);
-} catch (MalformedURLException e) {
+URI uri = new URI(location);
+url = uri.toURL();
+} catch (MalformedURLException | URISyntaxException e) {
 return false;
 }
 
diff --git a/java/org/apache/catalina/core/NamingContextListener.java 
b/java/org/apache/catalina/core/NamingContextListener.java
index 964ee8648d..b5a691a8bd 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -21,6 +21,8 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Collection;
 import java.util.HashMap;
@@ -831,8 +833,9 @@ public class NamingContextListener implements 
LifecycleListener, PropertyChangeL
 URL wsdlURL = null;
 
 try {
-wsdlURL = new URL(service.getWsdlfile());
-} catch (MalformedURLException e) {
+URI wsdlURI = new URI(service.getWsdlfile());
+wsdlURL = wsdlURI.toURL();
+} catch (MalformedURLException | URISyntaxException e) {
 // Ignore and carry on
 }
 if (wsdlURL == null) {
@@ -864,8 +867,9 @@ public class NamingContextListener implements 
LifecycleListener, PropertyChangeL
 URL jaxrpcURL = null;
 
 try {
-jaxrpcURL = new URL(service.getJaxrpcmappingfile());
-} catch (MalformedURLException e) {
+URI jaxrpcURI = new URI(service.getJaxrpcmappingfile());
+jaxrpcURL = jaxrpcURI.toURL();
+} catch (MalformedURLException | URISyntaxException e) {
 // Ignore and carry on
 }
 if (jaxrpcURL == null) {
diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
b/java/org/apache/catalina/startup/Bootstrap.java
index 6a16c8b330..2f8999a829 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -21,6 +21,8 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -156,8 +158,7 @@ public final class Bootstrap {
 }
 
 
-private ClassLoader createClassLoader(String name, ClassLoader parent)
-throws Exception {
+private ClassLoader createClassL

[tomcat] branch main updated: More URL -> URI refactoring

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new cf50db9346 More URL -> URI refactoring
cf50db9346 is described below

commit cf50db9346164a9772d285331fa887c6b09491f6
Author: Mark Thomas 
AuthorDate: Wed Nov 16 14:53:17 2022 +

More URL -> URI refactoring
---
 java/org/apache/catalina/connector/Response.java |  7 +--
 java/org/apache/catalina/core/NamingContextListener.java | 12 
 java/org/apache/catalina/startup/Bootstrap.java  | 10 ++
 java/org/apache/catalina/startup/CatalinaProperties.java |  4 ++--
 java/org/apache/catalina/startup/ClassLoaderFactory.java | 10 ++
 java/org/apache/catalina/startup/ContextConfig.java  | 11 +++
 java/org/apache/catalina/startup/WebappServiceLoader.java| 11 ++-
 .../tribes/membership/cloud/AbstractStreamProvider.java  | 11 +--
 .../catalina/webresources/AbstractArchiveResource.java   | 10 ++
 java/org/apache/catalina/webresources/CachedResource.java| 11 ++-
 java/org/apache/catalina/webresources/JarResourceRoot.java   | 10 ++
 java/org/apache/catalina/webresources/StandardRoot.java  |  6 +++---
 12 files changed, 78 insertions(+), 35 deletions(-)

diff --git a/java/org/apache/catalina/connector/Response.java 
b/java/org/apache/catalina/connector/Response.java
index 4349c8867e..394614a9aa 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -20,6 +20,8 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.security.AccessController;
@@ -1482,8 +1484,9 @@ public class Response implements HttpServletResponse {
 // Is this a valid absolute URL?
 URL url = null;
 try {
-url = new URL(location);
-} catch (MalformedURLException e) {
+URI uri = new URI(location);
+url = uri.toURL();
+} catch (MalformedURLException | URISyntaxException e) {
 return false;
 }
 
diff --git a/java/org/apache/catalina/core/NamingContextListener.java 
b/java/org/apache/catalina/core/NamingContextListener.java
index 964ee8648d..b5a691a8bd 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -21,6 +21,8 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Collection;
 import java.util.HashMap;
@@ -831,8 +833,9 @@ public class NamingContextListener implements 
LifecycleListener, PropertyChangeL
 URL wsdlURL = null;
 
 try {
-wsdlURL = new URL(service.getWsdlfile());
-} catch (MalformedURLException e) {
+URI wsdlURI = new URI(service.getWsdlfile());
+wsdlURL = wsdlURI.toURL();
+} catch (MalformedURLException | URISyntaxException e) {
 // Ignore and carry on
 }
 if (wsdlURL == null) {
@@ -864,8 +867,9 @@ public class NamingContextListener implements 
LifecycleListener, PropertyChangeL
 URL jaxrpcURL = null;
 
 try {
-jaxrpcURL = new URL(service.getJaxrpcmappingfile());
-} catch (MalformedURLException e) {
+URI jaxrpcURI = new URI(service.getJaxrpcmappingfile());
+jaxrpcURL = jaxrpcURI.toURL();
+} catch (MalformedURLException | URISyntaxException e) {
 // Ignore and carry on
 }
 if (jaxrpcURL == null) {
diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
b/java/org/apache/catalina/startup/Bootstrap.java
index 6a16c8b330..2f8999a829 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -21,6 +21,8 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -156,8 +158,7 @@ public final class Bootstrap {
 }
 
 
-private ClassLoader createClassLoader(String name, ClassLoader parent)
-throws Exception {
+private ClassLoader createClassLoade

[tomcat] branch 8.5.x updated: URL wasn't valid (un-encoded spaces). URL class was tolerant. URI is not

[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 e424c5ffc8 URL wasn't valid (un-encoded spaces). URL class was 
tolerant. URI is not
e424c5ffc8 is described below

commit e424c5ffc89cd773683eeb59dc616a41abfc393e
Author: Mark Thomas 
AuthorDate: Wed Nov 16 14:41:49 2022 +

URL wasn't valid (un-encoded spaces). URL class was tolerant. URI is not
---
 test/org/apache/catalina/ant/TestDeployTask.java | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/catalina/ant/TestDeployTask.java 
b/test/org/apache/catalina/ant/TestDeployTask.java
index 8fc3ed2daf..0441d01284 100644
--- a/test/org/apache/catalina/ant/TestDeployTask.java
+++ b/test/org/apache/catalina/ant/TestDeployTask.java
@@ -52,7 +52,6 @@ public class TestDeployTask extends TomcatBaseTest {
 testExecute(deployTask, new 
File("test/deployment/context.war").toURI().toString());
 testExecute(deployTask, new 
File("test/deployment/context.war").getAbsolutePath());
 testExecute(deployTask, "jar:" + new 
File("test/deployment/context.jar").toURI().toString() + "!/context.war");
-testExecute(deployTask, "file:./test/deployment/dir with 
spaces/context.war");
 testExecute(deployTask, new File("test/deployment/dir with 
spaces/context.war").toURI().toString());
 testExecute(deployTask, new File("test/deployment/dir with 
spaces/context.war").getAbsolutePath());
 testExecute(deployTask, "jar:" + new File("test/deployment/dir with 
spaces/context.jar").toURI().toString()
@@ -74,8 +73,16 @@ public class TestDeployTask extends TomcatBaseTest {
 testExecute(deployTask, "sc:./test/deployment/context.war");
 }
 
+@Test(expected = BuildException.class)
+public void bug58086d() {
+DeployTask deployTask = new DeployTask();
+setDefaults(deployTask);
+testExecute(deployTask, "file:./test/deployment/dir with 
spaces/context.war");
+}
+
+
 @Test
-public void bug58086d() throws Exception {
+public void bug58086e() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
 File root = new File("test/deployment");


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

[tomcat] branch main updated: URL wasn't valid (un-encoded spaces). URL class was tolerant. URI is not

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 2df8bdc5b1 URL wasn't valid (un-encoded spaces). URL class was 
tolerant. URI is not
2df8bdc5b1 is described below

commit 2df8bdc5b1002c5857cc1f8afdff7a39ed1a2ff9
Author: Mark Thomas 
AuthorDate: Wed Nov 16 14:41:49 2022 +

URL wasn't valid (un-encoded spaces). URL class was tolerant. URI is not
---
 test/org/apache/catalina/ant/TestDeployTask.java | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/catalina/ant/TestDeployTask.java 
b/test/org/apache/catalina/ant/TestDeployTask.java
index 8fc3ed2daf..0441d01284 100644
--- a/test/org/apache/catalina/ant/TestDeployTask.java
+++ b/test/org/apache/catalina/ant/TestDeployTask.java
@@ -52,7 +52,6 @@ public class TestDeployTask extends TomcatBaseTest {
 testExecute(deployTask, new 
File("test/deployment/context.war").toURI().toString());
 testExecute(deployTask, new 
File("test/deployment/context.war").getAbsolutePath());
 testExecute(deployTask, "jar:" + new 
File("test/deployment/context.jar").toURI().toString() + "!/context.war");
-testExecute(deployTask, "file:./test/deployment/dir with 
spaces/context.war");
 testExecute(deployTask, new File("test/deployment/dir with 
spaces/context.war").toURI().toString());
 testExecute(deployTask, new File("test/deployment/dir with 
spaces/context.war").getAbsolutePath());
 testExecute(deployTask, "jar:" + new File("test/deployment/dir with 
spaces/context.jar").toURI().toString()
@@ -74,8 +73,16 @@ public class TestDeployTask extends TomcatBaseTest {
 testExecute(deployTask, "sc:./test/deployment/context.war");
 }
 
+@Test(expected = BuildException.class)
+public void bug58086d() {
+DeployTask deployTask = new DeployTask();
+setDefaults(deployTask);
+testExecute(deployTask, "file:./test/deployment/dir with 
spaces/context.war");
+}
+
+
 @Test
-public void bug58086d() throws Exception {
+public void bug58086e() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
 File root = new File("test/deployment");


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

[tomcat] branch 9.0.x updated: URL wasn't valid (un-encoded spaces). URL class was tolerant. URI is not

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new f486a60ff2 URL wasn't valid (un-encoded spaces). URL class was 
tolerant. URI is not
f486a60ff2 is described below

commit f486a60ff281ab4d7973af3f5802c55851abd9d6
Author: Mark Thomas 
AuthorDate: Wed Nov 16 14:41:49 2022 +

URL wasn't valid (un-encoded spaces). URL class was tolerant. URI is not
---
 test/org/apache/catalina/ant/TestDeployTask.java | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/catalina/ant/TestDeployTask.java 
b/test/org/apache/catalina/ant/TestDeployTask.java
index 8fc3ed2daf..0441d01284 100644
--- a/test/org/apache/catalina/ant/TestDeployTask.java
+++ b/test/org/apache/catalina/ant/TestDeployTask.java
@@ -52,7 +52,6 @@ public class TestDeployTask extends TomcatBaseTest {
 testExecute(deployTask, new 
File("test/deployment/context.war").toURI().toString());
 testExecute(deployTask, new 
File("test/deployment/context.war").getAbsolutePath());
 testExecute(deployTask, "jar:" + new 
File("test/deployment/context.jar").toURI().toString() + "!/context.war");
-testExecute(deployTask, "file:./test/deployment/dir with 
spaces/context.war");
 testExecute(deployTask, new File("test/deployment/dir with 
spaces/context.war").toURI().toString());
 testExecute(deployTask, new File("test/deployment/dir with 
spaces/context.war").getAbsolutePath());
 testExecute(deployTask, "jar:" + new File("test/deployment/dir with 
spaces/context.jar").toURI().toString()
@@ -74,8 +73,16 @@ public class TestDeployTask extends TomcatBaseTest {
 testExecute(deployTask, "sc:./test/deployment/context.war");
 }
 
+@Test(expected = BuildException.class)
+public void bug58086d() {
+DeployTask deployTask = new DeployTask();
+setDefaults(deployTask);
+testExecute(deployTask, "file:./test/deployment/dir with 
spaces/context.war");
+}
+
+
 @Test
-public void bug58086d() throws Exception {
+public void bug58086e() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
 File root = new File("test/deployment");


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

[tomcat] branch 10.1.x updated: URL wasn't valid (un-encoded spaces). URL class was tolerant. URI is not

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new bbdcc8724a URL wasn't valid (un-encoded spaces). URL class was 
tolerant. URI is not
bbdcc8724a is described below

commit bbdcc8724a59f0f455610db859bcf9ccbd798993
Author: Mark Thomas 
AuthorDate: Wed Nov 16 14:41:49 2022 +

URL wasn't valid (un-encoded spaces). URL class was tolerant. URI is not
---
 test/org/apache/catalina/ant/TestDeployTask.java | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/catalina/ant/TestDeployTask.java 
b/test/org/apache/catalina/ant/TestDeployTask.java
index 8fc3ed2daf..0441d01284 100644
--- a/test/org/apache/catalina/ant/TestDeployTask.java
+++ b/test/org/apache/catalina/ant/TestDeployTask.java
@@ -52,7 +52,6 @@ public class TestDeployTask extends TomcatBaseTest {
 testExecute(deployTask, new 
File("test/deployment/context.war").toURI().toString());
 testExecute(deployTask, new 
File("test/deployment/context.war").getAbsolutePath());
 testExecute(deployTask, "jar:" + new 
File("test/deployment/context.jar").toURI().toString() + "!/context.war");
-testExecute(deployTask, "file:./test/deployment/dir with 
spaces/context.war");
 testExecute(deployTask, new File("test/deployment/dir with 
spaces/context.war").toURI().toString());
 testExecute(deployTask, new File("test/deployment/dir with 
spaces/context.war").getAbsolutePath());
 testExecute(deployTask, "jar:" + new File("test/deployment/dir with 
spaces/context.jar").toURI().toString()
@@ -74,8 +73,16 @@ public class TestDeployTask extends TomcatBaseTest {
 testExecute(deployTask, "sc:./test/deployment/context.war");
 }
 
+@Test(expected = BuildException.class)
+public void bug58086d() {
+DeployTask deployTask = new DeployTask();
+setDefaults(deployTask);
+testExecute(deployTask, "file:./test/deployment/dir with 
spaces/context.war");
+}
+
+
 @Test
-public void bug58086d() throws Exception {
+public void bug58086e() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
 File root = new File("test/deployment");


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

Buildbot failure in on tomcat-11.0.x

[buildbot]

Build status: BUILD FAILED: failed compile (failure)
Worker used: bb2_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/47
Blamelist: Mark Thomas 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch main] ecb697edd51b1af18c8489388ae9d5ee8182608b


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


-
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: Java 20 deprecates all the URL constructors.

[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 aa3466745f Java 20 deprecates all the URL constructors.
aa3466745f is described below

commit aa3466745f074eb0f5de0bc23c69cba4db366cc6
Author: Mark Thomas 
AuthorDate: Wed Nov 16 13:41:47 2022 +

Java 20 deprecates all the URL constructors.

The recommendation is to use URI instead (better input validation)
Start the refactoring process.
---
 java/org/apache/catalina/ant/AbstractCatalinaTask.java | 13 +
 java/org/apache/catalina/ant/DeployTask.java   |  9 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index c1457afbe5..75676e2960 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -23,7 +23,8 @@ import java.io.OutputStream;
 import java.net.Authenticator;
 import java.net.HttpURLConnection;
 import java.net.PasswordAuthentication;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLConnection;
 
 import org.apache.catalina.util.IOTools;
@@ -179,7 +180,9 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
 Authenticator.setDefault(new TaskAuthenticator(username, 
password));
 
 // Create a connection for this command
-conn = (new URL(url + command)).openConnection();
+URI uri = new URI(url + command);
+uri.parseServerAuthority();
+conn = uri.toURL().openConnection();
 HttpURLConnection hconn = (HttpURLConnection) conn;
 
 // Set up standard connection characteristics
@@ -300,11 +303,13 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
  * host is cached and used to provide an appropriate Authorization when the
  * next request is made (that includes a request body).
  */
-private void preAuthenticate() throws IOException {
+private void preAuthenticate() throws IOException, URISyntaxException {
 URLConnection conn = null;
 
 // Create a connection for this command
-conn = (new URL(url)).openConnection();
+URI uri = new URI(url);
+uri.parseServerAuthority();
+conn = uri.toURL().openConnection();
 HttpURLConnection hconn = (HttpURLConnection) conn;
 
 // Set up standard connection characteristics
diff --git a/java/org/apache/catalina/ant/DeployTask.java 
b/java/org/apache/catalina/ant/DeployTask.java
index 54cb8a0c59..bf4bc673e9 100644
--- a/java/org/apache/catalina/ant/DeployTask.java
+++ b/java/org/apache/catalina/ant/DeployTask.java
@@ -20,7 +20,8 @@ import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.nio.channels.FileChannel;
@@ -132,11 +133,11 @@ public class DeployTask extends 
AbstractCatalinaCommandTask {
 if (war != null) {
 if (PROTOCOL_PATTERN.matcher(war).lookingAt()) {
 try {
-URL url = new URL(war);
-URLConnection conn = url.openConnection();
+URI uri = new URI(war);
+URLConnection conn = uri.toURL().openConnection();
 contentLength = conn.getContentLengthLong();
 stream = new BufferedInputStream(conn.getInputStream(), 
1024);
-} catch (IOException e) {
+} catch (IOException | URISyntaxException e) {
 throw new BuildException(e);
 }
 } else {


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

[tomcat] branch 9.0.x updated: Java 20 deprecates all the URL constructors.

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 221d28822a Java 20 deprecates all the URL constructors.
221d28822a is described below

commit 221d28822a334cdf4acb7b4240a9233ef9b9db05
Author: Mark Thomas 
AuthorDate: Wed Nov 16 13:41:47 2022 +

Java 20 deprecates all the URL constructors.

The recommendation is to use URI instead (better input validation)
Start the refactoring process.
---
 java/org/apache/catalina/ant/AbstractCatalinaTask.java | 13 +
 java/org/apache/catalina/ant/DeployTask.java   |  9 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index c1457afbe5..75676e2960 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -23,7 +23,8 @@ import java.io.OutputStream;
 import java.net.Authenticator;
 import java.net.HttpURLConnection;
 import java.net.PasswordAuthentication;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLConnection;
 
 import org.apache.catalina.util.IOTools;
@@ -179,7 +180,9 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
 Authenticator.setDefault(new TaskAuthenticator(username, 
password));
 
 // Create a connection for this command
-conn = (new URL(url + command)).openConnection();
+URI uri = new URI(url + command);
+uri.parseServerAuthority();
+conn = uri.toURL().openConnection();
 HttpURLConnection hconn = (HttpURLConnection) conn;
 
 // Set up standard connection characteristics
@@ -300,11 +303,13 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
  * host is cached and used to provide an appropriate Authorization when the
  * next request is made (that includes a request body).
  */
-private void preAuthenticate() throws IOException {
+private void preAuthenticate() throws IOException, URISyntaxException {
 URLConnection conn = null;
 
 // Create a connection for this command
-conn = (new URL(url)).openConnection();
+URI uri = new URI(url);
+uri.parseServerAuthority();
+conn = uri.toURL().openConnection();
 HttpURLConnection hconn = (HttpURLConnection) conn;
 
 // Set up standard connection characteristics
diff --git a/java/org/apache/catalina/ant/DeployTask.java 
b/java/org/apache/catalina/ant/DeployTask.java
index 54cb8a0c59..bf4bc673e9 100644
--- a/java/org/apache/catalina/ant/DeployTask.java
+++ b/java/org/apache/catalina/ant/DeployTask.java
@@ -20,7 +20,8 @@ import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.nio.channels.FileChannel;
@@ -132,11 +133,11 @@ public class DeployTask extends 
AbstractCatalinaCommandTask {
 if (war != null) {
 if (PROTOCOL_PATTERN.matcher(war).lookingAt()) {
 try {
-URL url = new URL(war);
-URLConnection conn = url.openConnection();
+URI uri = new URI(war);
+URLConnection conn = uri.toURL().openConnection();
 contentLength = conn.getContentLengthLong();
 stream = new BufferedInputStream(conn.getInputStream(), 
1024);
-} catch (IOException e) {
+} catch (IOException | URISyntaxException e) {
 throw new BuildException(e);
 }
 } else {


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

[tomcat] branch 10.1.x updated: Java 20 deprecates all the URL constructors.

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 4b29f8108b Java 20 deprecates all the URL constructors.
4b29f8108b is described below

commit 4b29f8108b6ad1de800134712d1767a10670c03a
Author: Mark Thomas 
AuthorDate: Wed Nov 16 13:41:47 2022 +

Java 20 deprecates all the URL constructors.

The recommendation is to use URI instead (better input validation)
Start the refactoring process.
---
 java/org/apache/catalina/ant/AbstractCatalinaTask.java | 13 +
 java/org/apache/catalina/ant/DeployTask.java   |  9 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index c1457afbe5..75676e2960 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -23,7 +23,8 @@ import java.io.OutputStream;
 import java.net.Authenticator;
 import java.net.HttpURLConnection;
 import java.net.PasswordAuthentication;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLConnection;
 
 import org.apache.catalina.util.IOTools;
@@ -179,7 +180,9 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
 Authenticator.setDefault(new TaskAuthenticator(username, 
password));
 
 // Create a connection for this command
-conn = (new URL(url + command)).openConnection();
+URI uri = new URI(url + command);
+uri.parseServerAuthority();
+conn = uri.toURL().openConnection();
 HttpURLConnection hconn = (HttpURLConnection) conn;
 
 // Set up standard connection characteristics
@@ -300,11 +303,13 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
  * host is cached and used to provide an appropriate Authorization when the
  * next request is made (that includes a request body).
  */
-private void preAuthenticate() throws IOException {
+private void preAuthenticate() throws IOException, URISyntaxException {
 URLConnection conn = null;
 
 // Create a connection for this command
-conn = (new URL(url)).openConnection();
+URI uri = new URI(url);
+uri.parseServerAuthority();
+conn = uri.toURL().openConnection();
 HttpURLConnection hconn = (HttpURLConnection) conn;
 
 // Set up standard connection characteristics
diff --git a/java/org/apache/catalina/ant/DeployTask.java 
b/java/org/apache/catalina/ant/DeployTask.java
index 54cb8a0c59..bf4bc673e9 100644
--- a/java/org/apache/catalina/ant/DeployTask.java
+++ b/java/org/apache/catalina/ant/DeployTask.java
@@ -20,7 +20,8 @@ import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.nio.channels.FileChannel;
@@ -132,11 +133,11 @@ public class DeployTask extends 
AbstractCatalinaCommandTask {
 if (war != null) {
 if (PROTOCOL_PATTERN.matcher(war).lookingAt()) {
 try {
-URL url = new URL(war);
-URLConnection conn = url.openConnection();
+URI uri = new URI(war);
+URLConnection conn = uri.toURL().openConnection();
 contentLength = conn.getContentLengthLong();
 stream = new BufferedInputStream(conn.getInputStream(), 
1024);
-} catch (IOException e) {
+} catch (IOException | URISyntaxException e) {
 throw new BuildException(e);
 }
 } else {


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

[Bug 66351] Tomcat 10.1.2 failed to start up

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66351

--- Comment #2 from zx  ---
Ok thanks for information. I see other people reported it. Waiting for 10.1.3
release.

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

[tomcat] branch main updated: Java 20 deprecates all the URL constructors.

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new ecb697edd5 Java 20 deprecates all the URL constructors.
ecb697edd5 is described below

commit ecb697edd51b1af18c8489388ae9d5ee8182608b
Author: Mark Thomas 
AuthorDate: Wed Nov 16 13:41:47 2022 +

Java 20 deprecates all the URL constructors.

The recommendation is to use URI instead (better input validation)
Start the refactoring process.
---
 java/org/apache/catalina/ant/AbstractCatalinaTask.java | 13 +
 java/org/apache/catalina/ant/DeployTask.java   |  9 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index c1457afbe5..75676e2960 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -23,7 +23,8 @@ import java.io.OutputStream;
 import java.net.Authenticator;
 import java.net.HttpURLConnection;
 import java.net.PasswordAuthentication;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLConnection;
 
 import org.apache.catalina.util.IOTools;
@@ -179,7 +180,9 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
 Authenticator.setDefault(new TaskAuthenticator(username, 
password));
 
 // Create a connection for this command
-conn = (new URL(url + command)).openConnection();
+URI uri = new URI(url + command);
+uri.parseServerAuthority();
+conn = uri.toURL().openConnection();
 HttpURLConnection hconn = (HttpURLConnection) conn;
 
 // Set up standard connection characteristics
@@ -300,11 +303,13 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
  * host is cached and used to provide an appropriate Authorization when the
  * next request is made (that includes a request body).
  */
-private void preAuthenticate() throws IOException {
+private void preAuthenticate() throws IOException, URISyntaxException {
 URLConnection conn = null;
 
 // Create a connection for this command
-conn = (new URL(url)).openConnection();
+URI uri = new URI(url);
+uri.parseServerAuthority();
+conn = uri.toURL().openConnection();
 HttpURLConnection hconn = (HttpURLConnection) conn;
 
 // Set up standard connection characteristics
diff --git a/java/org/apache/catalina/ant/DeployTask.java 
b/java/org/apache/catalina/ant/DeployTask.java
index 54cb8a0c59..bf4bc673e9 100644
--- a/java/org/apache/catalina/ant/DeployTask.java
+++ b/java/org/apache/catalina/ant/DeployTask.java
@@ -20,7 +20,8 @@ import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.nio.channels.FileChannel;
@@ -132,11 +133,11 @@ public class DeployTask extends 
AbstractCatalinaCommandTask {
 if (war != null) {
 if (PROTOCOL_PATTERN.matcher(war).lookingAt()) {
 try {
-URL url = new URL(war);
-URLConnection conn = url.openConnection();
+URI uri = new URI(war);
+URLConnection conn = uri.toURL().openConnection();
 contentLength = conn.getContentLengthLong();
 stream = new BufferedInputStream(conn.getInputStream(), 
1024);
-} catch (IOException e) {
+} catch (IOException | URISyntaxException e) {
 throw new BuildException(e);
 }
 } else {


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

[Bug 66348] new jars in lib

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66348

Han Li  changed:

   What|Removed |Added

 CC||z...@zxinc.org

--- Comment #4 from Han Li  ---
*** Bug 66351 has been marked as a duplicate of this bug. ***

-- 
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 66351] Tomcat 10.1.2 failed to start up

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66351

Han Li  changed:

   What|Removed |Added

 OS||All
 Resolution|--- |DUPLICATE
 Status|NEW |RESOLVED

--- Comment #1 from Han Li  ---


*** This bug has been marked as a duplicate of bug 66348 ***

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

[tomcat] 01/01: Tag 8.5.84

[schultz]

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

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

commit 079a46c1c1e56b1743e752a44450469690880a56
Author: schultz 
AuthorDate: Wed Nov 16 05:37:51 2022 -0800

Tag 8.5.84
---
 build.properties.release   | 52 ++
 webapps/docs/changelog.xml |  2 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..97b5cb75c1
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,52 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Any unwanted settings may be over-ridden in a build.properties file located
+# in the same directory as this file.
+
+# Set the version-dev to "" (empty string) as this is not a development 
release.
+version.dev=
+
+# Ensure consistent timestamps for reproducible builds.
+ant.tstamp.now.iso=2022-11-16T13:34:24Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/gnupg/bin/gpg.exe
+
+# Reproducible builds require the use of the build tools defined below. The
+# vendors (where appropriate) and versions must match exactly for a 
reproducible
+# build since this data is embedded in various files, particularly JAR file
+# manifests, as part of the build process.
+#
+# Apache Ant:  Apache Ant(TM) version 1.10.12 compiled on October 13 2021
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:11.0.17+8
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment in consistent with this information.
+#
+# OS:  amd64 Windows 10 10.0
+# File encoding:   Cp1252
+#
+# Release Manager: schultz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 76af06a4f0..8eca9d3316 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,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 8.5.84 created (now 079a46c1c1)

[schultz]

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

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


  at 079a46c1c1 (commit)
This tag includes the following new commits:

 new 079a46c1c1 Tag 8.5.84

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

[Bug 66351] New: Tomcat 10.1.2 failed to start up

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66351

Bug ID: 66351
   Summary: Tomcat 10.1.2 failed to start up
   Product: Tomcat 10
   Version: unspecified
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: z...@zxinc.org
  Target Milestone: --

Tomcat 10.1.2 failed to start up the following code, but Tomcat 10.1.1 and
earlier are able to start up.

= pom.xml =

http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0
simpletest
simpletest
1.0.0

   
UTF-8
17
17
17



org.apache.tomcat.embed
tomcat-embed-core
10.1.1




= Main.java =

package simpletest;

import java.io.File;
import org.apache.catalina.Context;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;

public class Main {
public static void main(String[] args) throws Exception  {
Tomcat tomcat = new Tomcat();
Connector connector = tomcat.getConnector();
connector.setPort(24700);
tomcat.setBaseDir("./tmp");
String contextPath = "";
Context context = tomcat.addContext(contextPath, new
File(".").getAbsolutePath());

tomcat.addServlet(contextPath, "main", new MainServlet());
context.addServletMappingDecoded("/", "main");

tomcat.start();
tomcat.getService().addConnector(connector);
tomcat.getServer().await();
}
}

= MainServlet.java =

package simpletest;

import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;

@WebServlet("/")
public class MainServlet extends HttpServlet {
private static final long serialVersionUID = 1L;

@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.setCharacterEncoding("UTF-8");
PrintWriter w = resp.getWriter();
w.println("Hello World");
w.close();
}
}

==
Here is the error log:

11月 16, 2022 9:36:10 下午 org.apache.coyote.AbstractProtocol init
信息: Initializing ProtocolHandler ["http-nio-24700"]
11月 16, 2022 9:36:10 下午 org.apache.catalina.core.StandardService startInternal
信息: Starting service [Tomcat]
11月 16, 2022 9:36:10 下午 org.apache.catalina.core.StandardEngine startInternal
信息: Starting Servlet engine: [Apache Tomcat/10.1.2]
11月 16, 2022 9:36:10 下午 org.apache.catalina.core.ContainerBase startInternal
严重: A child container failed during start
java.util.concurrent.ExecutionException:
org.apache.catalina.LifecycleException: Failed to start component
[StandardEngine[Tomcat].StandardHost[localhost].StandardContext[]]
at
java.base/java.util.concurrent.FutureTask.report(FutureTask.java:122)
at java.base/java.util.concurrent.FutureTask.get(FutureTask.java:191)
at
org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:923)
at
org.apache.catalina.core.StandardHost.startInternal(StandardHost.java:886)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183)
at
org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1393)
at
org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1383)
at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
at
org.apache.tomcat.util.threads.InlineExecutorService.execute(InlineExecutorService.java:75)
at
java.base/java.util.concurrent.AbstractExecutorService.submit(AbstractExecutorService.java:145)
at
org.apache.catalina.core.ContainerBase.startInternal(ContainerBase.java:916)
at
org.apache.catalina.core.StandardEngine.startInternal(StandardEngine.java:252)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183)
at
org.apache.catalina.core.StandardService.startInternal(StandardService.java:430)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183)
at
org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:926)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183)
at org.apache.catalina.startup.Tomcat.start(Tomcat.java:485)
   

[Bug 66350] tomcat-websocket 9.0.69, pom.xml can not download from maven central

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66350

--- Comment #2 from Remy Maucherat  ---
I don't understand what's going on though: the file is there ...
https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-websocket/9.0.69/

-- 
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 66350] tomcat-websocket 9.0.69, pom.xml can not download from maven central

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66350

Mark Thomas  changed:

   What|Removed |Added

 OS||All
 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #1 from Mark Thomas  ---
The Tomcat project has no control over Maven Central. You'l need to raise this
directly with them.

-- 
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 66349] Why does LockOutRealm not support CredentialHandler?

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66349

Thorsten Schöning  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #2 from Thorsten Schöning  ---
I was wrong, the setup DOES work as intended now. Looking at my configs again,
I recognized that auth-method in web.xml was still configured to DIGEST instead
of BASIC and DIGEST in combination with a digest as password in
tomcat-users.xml doesn't work. That's most likely simply the reason why login
using the DIGEST instead of the original clear-text-password worked.

Changing things back to BASIC, checking configured realms and the credential
helper again, putting the correctly digested password into tomcat-users.xml
etc. made the login work as expected. I have a secure DIGEST in
tomcat-users.xml now, but need to provide the plain-text password in the
browser.

I guess the reason for LockOutRealm warning about an explicitly configured
credential handler is that LockOutRealm itself doesn't mutate passwords on its
own for login purposes. It forwards to other realms only and those seem to take
THEIR configured credential handlers into account properly, at least in my
described setup.

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