Why no ALPN with HTTP/1.1?
Folks,
on Tomcat 9.0 with OpenSSL I see the following with curl:
> $ curl https://dw-eng-apps-dev.innomotics.net:8444 --verbose -Ss > /dev/null
> * Uses proxy env variable NO_PROXY ==
> 'localhost,.siemens.net,.siemens.com,.siemens.de,.siemens.cloud,.siemens.io,.innomotics.net,.innomotics.com'
> * Host dw-eng-apps-dev.innomotics.net:8444 was resolved.
> * IPv6: (none)
> * IPv4: 10.64.105.136
> * Trying 10.64.105.136:8444...
> * ALPN: curl offers h2,http/1.1
> } [5 bytes data]
> * TLSv1.3 (OUT), TLS handshake, Client hello (1):
> } [512 bytes data]
> * TLSv1.3 (IN), TLS handshake, Server hello (2):
> { [122 bytes data]
> * TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
> { [10 bytes data]
> * TLSv1.3 (IN), TLS handshake, Certificate (11):
> { [2256 bytes data]
> * TLSv1.3 (IN), TLS handshake, CERT verify (15):
> { [520 bytes data]
> * TLSv1.3 (IN), TLS handshake, Finished (20):
> { [52 bytes data]
> * TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
> } [1 bytes data]
> * TLSv1.3 (OUT), TLS handshake, Finished (20):
> } [52 bytes data]
> * SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384 / [blank] / UNDEF
> * ALPN: server did not agree on a protocol. Uses default.
Upgrade to h2 isn't configured, we don't need it, why doesn't Tomcat offer
http/1.1 via ALPN and curl has to fall back?
The same with Apache HTTPd configured for http/1.1 only:
> $ curl https://dw-eng-rsc.innomotics.net --verbose
> * Uses proxy env variable NO_PROXY ==
> 'localhost,.siemens.net,.siemens.com,.siemens.de,.siemens.cloud,.siemens.io,.innomotics.net,.innomotics.com'
> * Host dw-eng-rsc.innomotics.net:443 was resolved.
> * IPv6: (none)
> * IPv4: 10.64.105.147
> * Trying 10.64.105.147:443...
> * ALPN: curl offers h2,http/1.1
> * TLSv1.3 (OUT), TLS handshake, Client hello (1):
> * TLSv1.3 (IN), TLS handshake, Server hello (2):
> * TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
> * TLSv1.3 (IN), TLS handshake, Certificate (11):
> * TLSv1.3 (IN), TLS handshake, CERT verify (15):
> * TLSv1.3 (IN), TLS handshake, Finished (20):
> * TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
> * TLSv1.3 (OUT), TLS handshake, Finished (20):
> * SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384 / [blank] / UNDEF
> * ALPN: server accepted http/1.1
Michael
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: jakarta.servlet cleanup
This is an automated email from the ASF dual-hosted git repository.
remm 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 dc52ba02cd jakarta.servlet cleanup
dc52ba02cd is described below
commit dc52ba02cd439720c2c64a3668f4e87cddca1b72
Author: remm
AuthorDate: Mon Mar 24 21:17:54 2025 +0100
jakarta.servlet cleanup
---
java/jakarta/servlet/GenericFilter.java| 4 +-
java/jakarta/servlet/GenericServlet.java | 2 +
.../servlet/HttpMethodConstraintElement.java | 4 +-
java/jakarta/servlet/MultipartConfigElement.java | 32 ++
java/jakarta/servlet/Servlet.java | 2 +-
java/jakarta/servlet/ServletConnection.java| 2 +-
java/jakarta/servlet/ServletContext.java | 12 +-
.../servlet/ServletContextAttributeEvent.java | 4 +
java/jakarta/servlet/ServletContextEvent.java | 3 +
java/jakarta/servlet/ServletException.java | 3 +
java/jakarta/servlet/ServletRegistration.java | 4 +-
java/jakarta/servlet/ServletRequest.java | 2 +-
.../servlet/ServletRequestAttributeEvent.java | 4 +
java/jakarta/servlet/ServletRequestEvent.java | 4 +
java/jakarta/servlet/ServletResponse.java | 6 +-
java/jakarta/servlet/ServletSecurityElement.java | 8 +-
java/jakarta/servlet/SessionCookieConfig.java | 2 +-
java/jakarta/servlet/UnavailableException.java | 3 +
java/jakarta/servlet/WriteListener.java| 4 +-
.../servlet/annotation/MultipartConfig.java| 3 +-
.../descriptor/JspPropertyGroupDescriptor.java | 2 +-
java/jakarta/servlet/http/Cookie.java | 15 ++-
java/jakarta/servlet/http/HttpFilter.java | 2 +
java/jakarta/servlet/http/HttpServlet.java | 125 +
java/jakarta/servlet/http/HttpServletRequest.java | 18 +--
java/jakarta/servlet/http/HttpServletResponse.java | 16 +--
java/jakarta/servlet/http/HttpSession.java | 8 +-
.../servlet/http/HttpSessionBindingEvent.java | 3 +
java/jakarta/servlet/http/HttpSessionEvent.java| 3 +
java/jakarta/servlet/http/Part.java| 6 +-
java/jakarta/servlet/jsp/JspException.java | 5 +-
java/jakarta/servlet/jsp/JspTagException.java | 3 +
java/jakarta/servlet/jsp/JspWriter.java| 10 +-
java/jakarta/servlet/jsp/PageContext.java | 12 +-
java/jakarta/servlet/jsp/SkipPageException.java| 3 +
.../servlet/jsp/el/ImplicitObjectELResolver.java | 8 +-
java/jakarta/servlet/jsp/el/ImportELResolver.java | 2 +-
.../servlet/jsp/el/ScopedAttributeELResolver.java | 8 +-
java/jakarta/servlet/jsp/tagext/BodyContent.java | 2 +-
java/jakarta/servlet/jsp/tagext/BodyTag.java | 4 +-
.../jakarta/servlet/jsp/tagext/BodyTagSupport.java | 5 +-
.../servlet/jsp/tagext/SimpleTagSupport.java | 2 +-
java/jakarta/servlet/jsp/tagext/Tag.java | 4 +-
.../servlet/jsp/tagext/TagAttributeInfo.java | 20 ++--
java/jakarta/servlet/jsp/tagext/TagData.java | 2 +-
java/jakarta/servlet/jsp/tagext/TagExtraInfo.java | 2 +-
.../jakarta/servlet/jsp/tagext/TagLibraryInfo.java | 4 +-
.../servlet/jsp/tagext/TagLibraryValidator.java| 4 +-
java/jakarta/servlet/jsp/tagext/TagSupport.java| 12 +-
java/jakarta/servlet/jsp/tagext/VariableInfo.java | 4 +-
50 files changed, 219 insertions(+), 203 deletions(-)
diff --git a/java/jakarta/servlet/GenericFilter.java
b/java/jakarta/servlet/GenericFilter.java
index 3f2eb9d8f9..c7e5ed4969 100644
--- a/java/jakarta/servlet/GenericFilter.java
+++ b/java/jakarta/servlet/GenericFilter.java
@@ -16,6 +16,7 @@
*/
package jakarta.servlet;
+import java.io.Serial;
import java.io.Serializable;
import java.util.Enumeration;
@@ -30,6 +31,7 @@ import java.util.Enumeration;
*/
public abstract class GenericFilter implements Filter, FilterConfig,
Serializable {
+@Serial
private static final long serialVersionUID = 1L;
/**
@@ -74,7 +76,7 @@ public abstract class GenericFilter implements Filter,
FilterConfig, Serializabl
/**
- * Convenience method for sub-classes to save them having to call
super.init(config). This is a NO-OP
+ * Convenience method for subclasses to save them having to call
super.init(config). This is a NO-OP
* by default.
*
* @throws ServletException If an exception occurs that interrupts the
Filter's normal operation
diff --git a/java/jakarta/servlet/GenericServlet.java
b/java/jakarta/servlet/GenericServlet.java
index caf2ab3b88..589b8ba05d 100644
--- a/java/jakarta/servlet/GenericServlet.java
+++ b/java/jakarta/servlet/GenericServlet.java
@@ -17,6 +17,7 @@
package jakarta.servlet;
import java.io.IOException;
+import java.io.Serial;
import java.util.Enumeration;
/**
@@ -36,6 +37,7 @@ impor
(tomcat) branch 11.0.x updated: jakarta.servlet cleanup
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 0121d3ffed jakarta.servlet cleanup
0121d3ffed is described below
commit 0121d3ffed1999359664412b1e168304668a6e29
Author: remm
AuthorDate: Mon Mar 24 21:17:54 2025 +0100
jakarta.servlet cleanup
---
java/jakarta/servlet/GenericFilter.java| 4 +-
java/jakarta/servlet/GenericServlet.java | 2 +
.../servlet/HttpMethodConstraintElement.java | 4 +-
java/jakarta/servlet/MultipartConfigElement.java | 32 ++
java/jakarta/servlet/Servlet.java | 2 +-
java/jakarta/servlet/ServletConnection.java| 2 +-
java/jakarta/servlet/ServletContext.java | 12 +-
.../servlet/ServletContextAttributeEvent.java | 4 +
java/jakarta/servlet/ServletContextEvent.java | 3 +
java/jakarta/servlet/ServletException.java | 3 +
java/jakarta/servlet/ServletRegistration.java | 4 +-
java/jakarta/servlet/ServletRequest.java | 2 +-
.../servlet/ServletRequestAttributeEvent.java | 4 +
java/jakarta/servlet/ServletRequestEvent.java | 4 +
java/jakarta/servlet/ServletResponse.java | 6 +-
java/jakarta/servlet/ServletSecurityElement.java | 8 +-
java/jakarta/servlet/SessionCookieConfig.java | 2 +-
java/jakarta/servlet/UnavailableException.java | 3 +
java/jakarta/servlet/WriteListener.java| 4 +-
.../servlet/annotation/MultipartConfig.java| 3 +-
.../descriptor/JspPropertyGroupDescriptor.java | 2 +-
java/jakarta/servlet/http/Cookie.java | 15 ++-
java/jakarta/servlet/http/HttpFilter.java | 2 +
java/jakarta/servlet/http/HttpServlet.java | 125 +
java/jakarta/servlet/http/HttpServletRequest.java | 18 +--
java/jakarta/servlet/http/HttpServletResponse.java | 16 +--
java/jakarta/servlet/http/HttpSession.java | 8 +-
.../servlet/http/HttpSessionBindingEvent.java | 3 +
java/jakarta/servlet/http/HttpSessionEvent.java| 3 +
java/jakarta/servlet/http/Part.java| 6 +-
java/jakarta/servlet/jsp/JspException.java | 5 +-
java/jakarta/servlet/jsp/JspTagException.java | 3 +
java/jakarta/servlet/jsp/JspWriter.java| 10 +-
java/jakarta/servlet/jsp/PageContext.java | 12 +-
java/jakarta/servlet/jsp/SkipPageException.java| 3 +
.../servlet/jsp/el/ImplicitObjectELResolver.java | 8 +-
java/jakarta/servlet/jsp/el/ImportELResolver.java | 2 +-
.../servlet/jsp/el/ScopedAttributeELResolver.java | 8 +-
java/jakarta/servlet/jsp/tagext/BodyContent.java | 2 +-
java/jakarta/servlet/jsp/tagext/BodyTag.java | 4 +-
.../jakarta/servlet/jsp/tagext/BodyTagSupport.java | 5 +-
.../servlet/jsp/tagext/SimpleTagSupport.java | 2 +-
java/jakarta/servlet/jsp/tagext/Tag.java | 4 +-
.../servlet/jsp/tagext/TagAttributeInfo.java | 20 ++--
java/jakarta/servlet/jsp/tagext/TagData.java | 2 +-
java/jakarta/servlet/jsp/tagext/TagExtraInfo.java | 2 +-
.../jakarta/servlet/jsp/tagext/TagLibraryInfo.java | 4 +-
.../servlet/jsp/tagext/TagLibraryValidator.java| 4 +-
java/jakarta/servlet/jsp/tagext/TagSupport.java| 12 +-
java/jakarta/servlet/jsp/tagext/VariableInfo.java | 4 +-
50 files changed, 219 insertions(+), 203 deletions(-)
diff --git a/java/jakarta/servlet/GenericFilter.java
b/java/jakarta/servlet/GenericFilter.java
index 3f2eb9d8f9..c7e5ed4969 100644
--- a/java/jakarta/servlet/GenericFilter.java
+++ b/java/jakarta/servlet/GenericFilter.java
@@ -16,6 +16,7 @@
*/
package jakarta.servlet;
+import java.io.Serial;
import java.io.Serializable;
import java.util.Enumeration;
@@ -30,6 +31,7 @@ import java.util.Enumeration;
*/
public abstract class GenericFilter implements Filter, FilterConfig,
Serializable {
+@Serial
private static final long serialVersionUID = 1L;
/**
@@ -74,7 +76,7 @@ public abstract class GenericFilter implements Filter,
FilterConfig, Serializabl
/**
- * Convenience method for sub-classes to save them having to call
super.init(config). This is a NO-OP
+ * Convenience method for subclasses to save them having to call
super.init(config). This is a NO-OP
* by default.
*
* @throws ServletException If an exception occurs that interrupts the
Filter's normal operation
diff --git a/java/jakarta/servlet/GenericServlet.java
b/java/jakarta/servlet/GenericServlet.java
index caf2ab3b88..589b8ba05d 100644
--- a/java/jakarta/servlet/GenericServlet.java
+++ b/java/jakarta/servlet/GenericServlet.java
@@ -17,6 +17,7 @@
package jakarta.servlet;
import java.io.IOException;
+import java.io.Serial;
import java.util.Enumeration;
/**
@@ -36,6 +37,7 @@ i
(tomcat) branch main updated: jakarta.websocket and jakarta.security cleanups
This is an automated email from the ASF dual-hosted git repository.
remm 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 2a06bcc66c jakarta.websocket and jakarta.security cleanups
2a06bcc66c is described below
commit 2a06bcc66c5ce45b49e1b8ae800b76079945a027
Author: remm
AuthorDate: Mon Mar 24 21:42:55 2025 +0100
jakarta.websocket and jakarta.security cleanups
---
.../security/auth/message/AuthException.java | 5 +-
java/jakarta/security/auth/message/AuthStatus.java | 2 +-
java/jakarta/security/auth/message/ClientAuth.java | 8 +--
.../jakarta/security/auth/message/MessageInfo.java | 2 +-
.../security/auth/message/MessagePolicy.java | 2 +-
java/jakarta/security/auth/message/ServerAuth.java | 8 +--
.../message/callback/CallerPrincipalCallback.java | 2 +-
.../auth/message/callback/CertStoreCallback.java | 2 +-
.../message/callback/GroupPrincipalCallback.java | 2 +-
.../callback/PasswordValidationCallback.java | 4 +-
.../auth/message/callback/PrivateKeyCallback.java | 2 +-
.../auth/message/callback/SecretKeyCallback.java | 2 +-
.../auth/message/callback/TrustStoreCallback.java | 2 +-
.../security/auth/message/config/AuthConfig.java | 2 +-
.../auth/message/config/AuthConfigFactory.java | 2 +-
.../auth/message/config/AuthConfigProvider.java| 2 +-
.../auth/message/config/ClientAuthConfig.java | 2 +-
.../auth/message/config/ClientAuthContext.java | 2 +-
.../auth/message/config/RegistrationListener.java | 2 +-
.../auth/message/config/ServerAuthConfig.java | 2 +-
.../auth/message/config/ServerAuthContext.java | 2 +-
.../auth/message/module/ClientAuthModule.java | 2 +-
.../auth/message/module/ServerAuthModule.java | 2 +-
java/jakarta/websocket/ClientEndpointConfig.java | 8 +--
java/jakarta/websocket/CloseReason.java| 61 +++---
java/jakarta/websocket/DecodeException.java| 2 +
java/jakarta/websocket/DeploymentException.java| 3 ++
java/jakarta/websocket/EncodeException.java| 5 +-
java/jakarta/websocket/Session.java| 6 +--
java/jakarta/websocket/SessionException.java | 3 ++
java/jakarta/websocket/server/PathParam.java | 2 +-
.../websocket/server/ServerEndpointConfig.java | 8 +--
32 files changed, 77 insertions(+), 84 deletions(-)
diff --git a/java/jakarta/security/auth/message/AuthException.java
b/java/jakarta/security/auth/message/AuthException.java
index 1a2b652ec7..f5a71e44fc 100644
--- a/java/jakarta/security/auth/message/AuthException.java
+++ b/java/jakarta/security/auth/message/AuthException.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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.
@@ -16,9 +16,12 @@
*/
package jakarta.security.auth.message;
+import java.io.Serial;
+
import javax.security.auth.login.LoginException;
public class AuthException extends LoginException {
+@Serial
private static final long serialVersionUID = -1156951780670243758L;
public AuthException() {
diff --git a/java/jakarta/security/auth/message/AuthStatus.java
b/java/jakarta/security/auth/message/AuthStatus.java
index 2e9c10de8a..ec009c80b4 100644
--- a/java/jakarta/security/auth/message/AuthStatus.java
+++ b/java/jakarta/security/auth/message/AuthStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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.
diff --git a/java/jakarta/security/auth/message/ClientAuth.java
b/java/jakarta/security/auth/message/ClientAuth.java
index c4bf93ed14..c907a05644 100644
--- a/java/jakarta/security/auth/message/ClientAuth.java
+++ b/java/jakarta/security/auth/message/ClientAuth.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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.
@@ -28,7 +28,7 @@ public interface ClientAuth {
*
* @return An AuthStatus instance that represents the result of the
authentication
*
- * @throws AuthException If the a failure occurred in a manner that
prevented the failure from being communicated
+ * @throws AuthException If a failure occurred in a manner that prevented
the failure from being communicated
* via messageInfo
*/
AuthStatus secureRequest(MessageInfo messageInfo, Subject clientSubject)
throws AuthException;
@@ -42,7 +42,7 @@ public interface ClientAuth {
*
* @return An AuthStatus ins
(tomcat) branch 11.0.x updated (b96ba58fa8 -> 9159d65cc6)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from b96ba58fa8 Fix IDE warnings new 0e30a232df jakarta.el cleanup new 9159d65cc6 Java 17 compat The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/jakarta/el/BeanELResolver.java | 6 +- java/jakarta/el/BeanNameELResolver.java | 26 +++- java/jakarta/el/BeanSupportFull.java | 18 +++--- java/jakarta/el/BeanSupportStandalone.java| 20 +++--- java/jakarta/el/ELContext.java| 12 +--- java/jakarta/el/ELContextEvent.java | 2 + java/jakarta/el/ELException.java | 3 + java/jakarta/el/ELProcessor.java | 78 +-- java/jakarta/el/ELResolver.java | 4 +- java/jakarta/el/Expression.java | 2 + java/jakarta/el/ExpressionFactory.java| 13 ++-- java/jakarta/el/ImportHandler.java| 25 +++- java/jakarta/el/ListELResolver.java | 9 +-- java/jakarta/el/MapELResolver.java| 3 +- java/jakarta/el/MethodExpression.java | 3 + java/jakarta/el/MethodInfo.java | 9 +-- java/jakarta/el/MethodNotFoundException.java | 3 + java/jakarta/el/MethodReference.java | 9 +-- java/jakarta/el/OptionalELResolver.java | 6 +- java/jakarta/el/PropertyNotFoundException.java| 3 + java/jakarta/el/PropertyNotWritableException.java | 3 + java/jakarta/el/RecordELResolver.java | 2 +- java/jakarta/el/StaticFieldELResolver.java| 17 ++--- java/jakarta/el/Util.java | 36 +++ java/jakarta/el/ValueExpression.java | 3 + java/jakarta/el/ValueReference.java | 2 + 26 files changed, 131 insertions(+), 186 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: jakarta.el cleanup
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0e30a232df78b35dc74def5f28f48eac1d071505
Author: remm
AuthorDate: Mon Mar 24 14:23:36 2025 +0100
jakarta.el cleanup
---
java/jakarta/el/BeanELResolver.java | 6 +-
java/jakarta/el/BeanNameELResolver.java | 26 +++-
java/jakarta/el/BeanSupportFull.java | 18 +++---
java/jakarta/el/BeanSupportStandalone.java| 22 +++
java/jakarta/el/ELContext.java| 12 +---
java/jakarta/el/ELContextEvent.java | 2 +
java/jakarta/el/ELException.java | 3 +
java/jakarta/el/ELProcessor.java | 78 +--
java/jakarta/el/ELResolver.java | 4 +-
java/jakarta/el/Expression.java | 2 +
java/jakarta/el/ExpressionFactory.java| 13 ++--
java/jakarta/el/ImportHandler.java| 25 +++-
java/jakarta/el/ListELResolver.java | 9 +--
java/jakarta/el/MapELResolver.java| 3 +-
java/jakarta/el/MethodExpression.java | 3 +
java/jakarta/el/MethodInfo.java | 9 +--
java/jakarta/el/MethodNotFoundException.java | 3 +
java/jakarta/el/MethodReference.java | 9 +--
java/jakarta/el/OptionalELResolver.java | 6 +-
java/jakarta/el/PropertyNotFoundException.java| 3 +
java/jakarta/el/PropertyNotWritableException.java | 3 +
java/jakarta/el/RecordELResolver.java | 2 +-
java/jakarta/el/StaticFieldELResolver.java| 17 ++---
java/jakarta/el/Util.java | 36 +++
java/jakarta/el/ValueExpression.java | 3 +
java/jakarta/el/ValueReference.java | 2 +
26 files changed, 132 insertions(+), 187 deletions(-)
diff --git a/java/jakarta/el/BeanELResolver.java
b/java/jakarta/el/BeanELResolver.java
index 7577163539..4d1b0ea210 100644
--- a/java/jakarta/el/BeanELResolver.java
+++ b/java/jakarta/el/BeanELResolver.java
@@ -138,7 +138,7 @@ public class BeanELResolver extends ELResolver {
Object[] parameters =
Util.buildParameters(context,
matchingMethod.getParameterTypes(), matchingMethod.isVarArgs(), params);
-Object result = null;
+Object result;
try {
result = matchingMethod.invoke(base, parameters);
} catch (IllegalArgumentException | IllegalAccessException e) {
@@ -222,7 +222,7 @@ public class BeanELResolver extends ELResolver {
this.write = Util.getMethod(this.owner, base,
getWriteMethod());
if (this.write == null) {
throw new PropertyNotWritableException(
-Util.message(ctx, "propertyNotWritable", new
Object[] { owner.getName(), getName() }));
+Util.message(ctx, "propertyNotWritable",
owner.getName(), getName()));
}
}
return this.write;
@@ -233,7 +233,7 @@ public class BeanELResolver extends ELResolver {
this.read = Util.getMethod(this.owner, base, getReadMethod());
if (this.read == null) {
throw new PropertyNotFoundException(
-Util.message(ctx, "propertyNotReadable", new
Object[] { owner.getName(), getName() }));
+Util.message(ctx, "propertyNotReadable",
owner.getName(), getName()));
}
}
return this.read;
diff --git a/java/jakarta/el/BeanNameELResolver.java
b/java/jakarta/el/BeanNameELResolver.java
index 9ef745150a..8331e310f4 100644
--- a/java/jakarta/el/BeanNameELResolver.java
+++ b/java/jakarta/el/BeanNameELResolver.java
@@ -32,16 +32,14 @@ public class BeanNameELResolver extends ELResolver {
@Override
public Object getValue(ELContext context, Object base, Object property) {
Objects.requireNonNull(context);
-if (base != null || !(property instanceof String)) {
+if (base != null || !(property instanceof String beanName)) {
return null;
}
-String beanName = (String) property;
-
if (beanNameResolver.isNameResolved(beanName)) {
try {
Object result = beanNameResolver.getBean(beanName);
-context.setPropertyResolved(base, property);
+context.setPropertyResolved(null, property);
return result;
} catch (Throwable t) {
Util.handleThrowable(t);
@@ -55,17 +53,15 @@ public class BeanNameELResolver extends ELResolver {
@Override
public void setValue(ELContext context, Object base, Object property,
Object value) {
Objects.requireNonNull(context);
-if (base != null || !(property instanceof String)) {
+if (base != null
(tomcat) 02/02: Java 17 compat
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9159d65cc63140c6285281853ffe451101da44fa
Author: remm
AuthorDate: Mon Mar 24 14:32:34 2025 +0100
Java 17 compat
---
java/jakarta/el/BeanSupportStandalone.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/jakarta/el/BeanSupportStandalone.java
b/java/jakarta/el/BeanSupportStandalone.java
index c32c89e2b8..6b05614b76 100644
--- a/java/jakarta/el/BeanSupportStandalone.java
+++ b/java/jakarta/el/BeanSupportStandalone.java
@@ -146,7 +146,7 @@ class BeanSupportStandalone extends BeanSupport {
if (writeMethods.size() > 1) {
writeMethods.sort(WRITE_METHOD_COMPARATOR);
}
-type = writeMethods.getFirst().getParameterTypes()[0];
+type = writeMethods.get(0).getParameterTypes()[0];
}
for (Method candidate : writeMethods) {
if
(type.isAssignableFrom(candidate.getParameterTypes()[0])) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: jakarta.websocket and jakarta.security cleanups
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 8c89327c78 jakarta.websocket and jakarta.security cleanups
8c89327c78 is described below
commit 8c89327c78b5e10c31d821fc5475f5095816cd17
Author: remm
AuthorDate: Mon Mar 24 21:42:55 2025 +0100
jakarta.websocket and jakarta.security cleanups
---
.../security/auth/message/AuthException.java | 5 +-
java/jakarta/security/auth/message/AuthStatus.java | 2 +-
java/jakarta/security/auth/message/ClientAuth.java | 8 +--
.../jakarta/security/auth/message/MessageInfo.java | 2 +-
.../security/auth/message/MessagePolicy.java | 2 +-
java/jakarta/security/auth/message/ServerAuth.java | 8 +--
.../message/callback/CallerPrincipalCallback.java | 2 +-
.../auth/message/callback/CertStoreCallback.java | 2 +-
.../message/callback/GroupPrincipalCallback.java | 2 +-
.../callback/PasswordValidationCallback.java | 4 +-
.../auth/message/callback/PrivateKeyCallback.java | 2 +-
.../auth/message/callback/SecretKeyCallback.java | 2 +-
.../auth/message/callback/TrustStoreCallback.java | 2 +-
.../security/auth/message/config/AuthConfig.java | 2 +-
.../auth/message/config/AuthConfigFactory.java | 2 +-
.../auth/message/config/AuthConfigProvider.java| 2 +-
.../auth/message/config/ClientAuthConfig.java | 2 +-
.../auth/message/config/ClientAuthContext.java | 2 +-
.../auth/message/config/RegistrationListener.java | 2 +-
.../auth/message/config/ServerAuthConfig.java | 2 +-
.../auth/message/config/ServerAuthContext.java | 2 +-
.../auth/message/module/ClientAuthModule.java | 2 +-
.../auth/message/module/ServerAuthModule.java | 2 +-
java/jakarta/websocket/ClientEndpointConfig.java | 8 +--
java/jakarta/websocket/CloseReason.java| 61 +++---
java/jakarta/websocket/DecodeException.java| 2 +
java/jakarta/websocket/DeploymentException.java| 3 ++
java/jakarta/websocket/EncodeException.java| 5 +-
java/jakarta/websocket/Session.java| 6 +--
java/jakarta/websocket/SessionException.java | 3 ++
java/jakarta/websocket/server/PathParam.java | 2 +-
.../websocket/server/ServerEndpointConfig.java | 8 +--
32 files changed, 77 insertions(+), 84 deletions(-)
diff --git a/java/jakarta/security/auth/message/AuthException.java
b/java/jakarta/security/auth/message/AuthException.java
index 1a2b652ec7..f5a71e44fc 100644
--- a/java/jakarta/security/auth/message/AuthException.java
+++ b/java/jakarta/security/auth/message/AuthException.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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.
@@ -16,9 +16,12 @@
*/
package jakarta.security.auth.message;
+import java.io.Serial;
+
import javax.security.auth.login.LoginException;
public class AuthException extends LoginException {
+@Serial
private static final long serialVersionUID = -1156951780670243758L;
public AuthException() {
diff --git a/java/jakarta/security/auth/message/AuthStatus.java
b/java/jakarta/security/auth/message/AuthStatus.java
index 2e9c10de8a..ec009c80b4 100644
--- a/java/jakarta/security/auth/message/AuthStatus.java
+++ b/java/jakarta/security/auth/message/AuthStatus.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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.
diff --git a/java/jakarta/security/auth/message/ClientAuth.java
b/java/jakarta/security/auth/message/ClientAuth.java
index c4bf93ed14..c907a05644 100644
--- a/java/jakarta/security/auth/message/ClientAuth.java
+++ b/java/jakarta/security/auth/message/ClientAuth.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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.
@@ -28,7 +28,7 @@ public interface ClientAuth {
*
* @return An AuthStatus instance that represents the result of the
authentication
*
- * @throws AuthException If the a failure occurred in a manner that
prevented the failure from being communicated
+ * @throws AuthException If a failure occurred in a manner that prevented
the failure from being communicated
* via messageInfo
*/
AuthStatus secureRequest(MessageInfo messageInfo, Subject clientSubject)
throws AuthException;
@@ -42,7 +42,7 @@ public interface ClientAuth {
*
* @return An AuthStatus
(tomcat) branch main updated: jakarta.el cleanup
This is an automated email from the ASF dual-hosted git repository.
remm 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 20921725f2 jakarta.el cleanup
20921725f2 is described below
commit 20921725f201bc2749235ad8f9caf0ca86f0bf8b
Author: remm
AuthorDate: Mon Mar 24 14:23:36 2025 +0100
jakarta.el cleanup
---
java/jakarta/el/BeanELResolver.java | 6 +-
java/jakarta/el/BeanNameELResolver.java | 26 +++-
java/jakarta/el/BeanSupportFull.java | 18 +++---
java/jakarta/el/BeanSupportStandalone.java| 22 +++
java/jakarta/el/ELContext.java| 12 +---
java/jakarta/el/ELContextEvent.java | 2 +
java/jakarta/el/ELException.java | 3 +
java/jakarta/el/ELProcessor.java | 78 +--
java/jakarta/el/ELResolver.java | 4 +-
java/jakarta/el/Expression.java | 2 +
java/jakarta/el/ExpressionFactory.java| 13 ++--
java/jakarta/el/ImportHandler.java| 25 +++-
java/jakarta/el/ListELResolver.java | 9 +--
java/jakarta/el/MapELResolver.java| 3 +-
java/jakarta/el/MethodExpression.java | 3 +
java/jakarta/el/MethodInfo.java | 9 +--
java/jakarta/el/MethodNotFoundException.java | 3 +
java/jakarta/el/MethodReference.java | 9 +--
java/jakarta/el/OptionalELResolver.java | 6 +-
java/jakarta/el/PropertyNotFoundException.java| 3 +
java/jakarta/el/PropertyNotWritableException.java | 3 +
java/jakarta/el/RecordELResolver.java | 2 +-
java/jakarta/el/StaticFieldELResolver.java| 17 ++---
java/jakarta/el/Util.java | 36 +++
java/jakarta/el/ValueExpression.java | 3 +
java/jakarta/el/ValueReference.java | 2 +
26 files changed, 132 insertions(+), 187 deletions(-)
diff --git a/java/jakarta/el/BeanELResolver.java
b/java/jakarta/el/BeanELResolver.java
index 7577163539..4d1b0ea210 100644
--- a/java/jakarta/el/BeanELResolver.java
+++ b/java/jakarta/el/BeanELResolver.java
@@ -138,7 +138,7 @@ public class BeanELResolver extends ELResolver {
Object[] parameters =
Util.buildParameters(context,
matchingMethod.getParameterTypes(), matchingMethod.isVarArgs(), params);
-Object result = null;
+Object result;
try {
result = matchingMethod.invoke(base, parameters);
} catch (IllegalArgumentException | IllegalAccessException e) {
@@ -222,7 +222,7 @@ public class BeanELResolver extends ELResolver {
this.write = Util.getMethod(this.owner, base,
getWriteMethod());
if (this.write == null) {
throw new PropertyNotWritableException(
-Util.message(ctx, "propertyNotWritable", new
Object[] { owner.getName(), getName() }));
+Util.message(ctx, "propertyNotWritable",
owner.getName(), getName()));
}
}
return this.write;
@@ -233,7 +233,7 @@ public class BeanELResolver extends ELResolver {
this.read = Util.getMethod(this.owner, base, getReadMethod());
if (this.read == null) {
throw new PropertyNotFoundException(
-Util.message(ctx, "propertyNotReadable", new
Object[] { owner.getName(), getName() }));
+Util.message(ctx, "propertyNotReadable",
owner.getName(), getName()));
}
}
return this.read;
diff --git a/java/jakarta/el/BeanNameELResolver.java
b/java/jakarta/el/BeanNameELResolver.java
index 9ef745150a..8331e310f4 100644
--- a/java/jakarta/el/BeanNameELResolver.java
+++ b/java/jakarta/el/BeanNameELResolver.java
@@ -32,16 +32,14 @@ public class BeanNameELResolver extends ELResolver {
@Override
public Object getValue(ELContext context, Object base, Object property) {
Objects.requireNonNull(context);
-if (base != null || !(property instanceof String)) {
+if (base != null || !(property instanceof String beanName)) {
return null;
}
-String beanName = (String) property;
-
if (beanNameResolver.isNameResolved(beanName)) {
try {
Object result = beanNameResolver.getBean(beanName);
-context.setPropertyResolved(base, property);
+context.setPropertyResolved(null, property);
return result;
} catch (Throwable t) {
Util.handleThrowable(t);
@@ -55,17 +53,15 @@ public class BeanNameELResolver extends ELResolver {
@Override
public void setValue(ELContext context, Object base, Object property,
Object va
(tomcat) branch 10.1.x updated: Bump version number
This is an automated email from the ASF dual-hosted git repository. remm 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 8deed86273 Bump version number 8deed86273 is described below commit 8deed8627362a0a0e202f833ec1e0541b2671402 Author: remm AuthorDate: Mon Mar 24 15:01:32 2025 +0100 Bump version number Forgotten javax API use. --- modules/cxf/pom.xml| 8 modules/cxf/src/main/java/tomcat/cxf/JsonBean.java | 6 +++--- modules/jdbc-pool/pom.xml | 9 - modules/owb/pom.xml| 6 +++--- modules/stuffed/pom.xml| 10 +++--- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml index ee6f6a6368..8bb21b021b 100644 --- a/modules/cxf/pom.xml +++ b/modules/cxf/pom.xml @@ -21,7 +21,7 @@ org.apache apache -33 +34 org.apache.tomcat @@ -29,14 +29,14 @@ Apache CXF for Apache Tomcat CDI Apache CXF packaged for Apache Tomcat CDI -4.1.0 +4.1.1 jar 4.0.1 2.1.3 -3.0.0 -2.0.0 +3.0.1 +2.0.1 diff --git a/modules/cxf/src/main/java/tomcat/cxf/JsonBean.java b/modules/cxf/src/main/java/tomcat/cxf/JsonBean.java index 88ce138543..019d48cf75 100644 --- a/modules/cxf/src/main/java/tomcat/cxf/JsonBean.java +++ b/modules/cxf/src/main/java/tomcat/cxf/JsonBean.java @@ -16,9 +16,9 @@ */ package tomcat.cxf; -import javax.enterprise.context.Dependent; -import javax.ws.rs.Produces; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.context.Dependent; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.ext.Provider; import org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider; diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml index 986b90d959..30fee646ed 100644 --- a/modules/jdbc-pool/pom.xml +++ b/modules/jdbc-pool/pom.xml @@ -24,12 +24,12 @@ org.apache apache -15 +34 org.apache.tomcat tomcat-jdbc - 8.0.15-SNAPSHOT + 1.1.0-SNAPSHOT jar @@ -65,7 +65,7 @@ org.apache.tomcat tomcat-juli - 10.1.0-M8 + 10.1.39 junit @@ -76,7 +76,7 @@ org.apache.tomcat tomcat-dbcp - 10.1.0-M8 + 10.1.39 test @@ -111,7 +111,6 @@ org.apache.maven.plugins maven-gpg-plugin -1.2 sign-artifacts diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml index 27b996b7dc..eb6d4772ad 100644 --- a/modules/owb/pom.xml +++ b/modules/owb/pom.xml @@ -21,7 +21,7 @@ org.apache apache -30 +34 org.apache.tomcat @@ -29,7 +29,7 @@ Apache Tomcat CDI 4 support Apache Tomcat CDI 4 support using Apache OpenWebBeans -4.0.2 +4.0.3 jar @@ -37,7 +37,7 @@ 2.1.0 4.0.1 2.1.1 -10.1.26 +10.1.39 diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml index e759324e93..0e0e28206e 100644 --- a/modules/stuffed/pom.xml +++ b/modules/stuffed/pom.xml @@ -21,6 +21,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 + +org.apache +apache +34 + + org.apache.tomcat tomcat-stuffed 1.0 @@ -29,7 +35,7 @@ UTF-8 org.apache.catalina.startup.Tomcat -10.1.26 +10.1.39 @@ -76,7 +82,6 @@ org.apache.maven.plugins maven-compiler-plugin -3.11.0 11 @@ -84,7 +89,6 @@ org.apache.maven.plugins maven-shade-plugin -3.5.1 package - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Community over Code North America 2025 Call for Presentations is OPEN
All, Anyone who has ever considered doing a presentation at a Community over Code Conference (formerly ApacheCon), please head over to the Call for Presentations page and submit a proposal: https://communityovercode.org/call-for-presentations/ You do NOT need to have anything ready to submit a proposal. You do NOT need to be committer, etc. to submit a proposal. We would very much like to have submissions from "the community" (that's YOU)! For inspiration, you may want to look at the list of presentations from previous events: https://tomcat.apache.org/presentations.html -chris - 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: Bump version numbers
This is an automated email from the ASF dual-hosted git repository. remm 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 24ae12bec0 Bump version numbers 24ae12bec0 is described below commit 24ae12bec0d3dfc99af771ade97abaa6b41c0714 Author: remm AuthorDate: Mon Mar 24 15:04:00 2025 +0100 Bump version numbers --- modules/cxf/pom.xml | 4 ++-- modules/jdbc-pool/pom.xml | 9 - modules/owb/pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml index 8f5bf838c6..b8d5fe3d07 100644 --- a/modules/cxf/pom.xml +++ b/modules/cxf/pom.xml @@ -21,7 +21,7 @@ org.apache apache -33 +34 org.apache.tomcat @@ -29,7 +29,7 @@ Apache CXF for Apache Tomcat CDI Apache CXF packaged for Apache Tomcat CDI -3.6.5 +3.6.6 jar diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml index 22ad5a764f..69dfe20270 100644 --- a/modules/jdbc-pool/pom.xml +++ b/modules/jdbc-pool/pom.xml @@ -24,12 +24,12 @@ org.apache apache -15 +34 org.apache.tomcat tomcat-jdbc - 8.0.15-SNAPSHOT + 1.1.0-SNAPSHOT jar @@ -65,7 +65,7 @@ org.apache.tomcat tomcat-juli - 9.0.56 + 9.0.102 junit @@ -76,7 +76,7 @@ org.apache.tomcat tomcat-dbcp - 9.0.56 + 9.0.102 test @@ -111,7 +111,6 @@ org.apache.maven.plugins maven-gpg-plugin -1.2 sign-artifacts diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml index 7c8c8f8244..1fe5ad0d0c 100644 --- a/modules/owb/pom.xml +++ b/modules/owb/pom.xml @@ -21,7 +21,7 @@ org.apache apache -33 +34 org.apache.tomcat @@ -36,7 +36,7 @@ 1.2 1.2 1.3 -9.0.93 +9.0.102 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Bump version numbers
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/11.0.x by this push: new a47bc8cb11 Bump version numbers a47bc8cb11 is described below commit a47bc8cb115e196bdb7715439b6aff3d1ebf1f9d Author: remm AuthorDate: Mon Mar 24 14:54:47 2025 +0100 Bump version numbers --- modules/cxf/pom.xml | 8 modules/jdbc-pool/pom.xml | 9 - modules/owb/pom.xml | 6 +++--- modules/stuffed/pom.xml | 10 +++--- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml index 7cb9c1b2da..b505c0b2ee 100644 --- a/modules/cxf/pom.xml +++ b/modules/cxf/pom.xml @@ -21,7 +21,7 @@ org.apache apache -33 +34 org.apache.tomcat @@ -29,14 +29,14 @@ Apache CXF for Apache Tomcat CDI Apache CXF packaged for Apache Tomcat CDI -4.1.0 +4.1.1 jar 4.0.1 2.1.3 -3.0.0 -2.0.0 +3.0.1 +2.0.1 diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml index dfe5639cbf..a5e511938b 100644 --- a/modules/jdbc-pool/pom.xml +++ b/modules/jdbc-pool/pom.xml @@ -24,12 +24,12 @@ org.apache apache -15 +34 org.apache.tomcat tomcat-jdbc - 8.0.15-SNAPSHOT + 1.1.0-SNAPSHOT jar @@ -65,7 +65,7 @@ org.apache.tomcat tomcat-juli - 11.0.0-SNAPSHOT + 11.0.5 junit @@ -76,7 +76,7 @@ org.apache.tomcat tomcat-dbcp - 11.0.0-SNAPSHOT + 11.0.5 test @@ -111,7 +111,6 @@ org.apache.maven.plugins maven-gpg-plugin -1.2 sign-artifacts diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml index cd75e06135..f9f4ecdc8f 100644 --- a/modules/owb/pom.xml +++ b/modules/owb/pom.xml @@ -21,7 +21,7 @@ org.apache apache -33 +34 org.apache.tomcat @@ -29,7 +29,7 @@ Apache Tomcat CDI 4 support Apache Tomcat CDI 4 support using Apache OpenWebBeans -4.0.2 +4.0.3 jar @@ -37,7 +37,7 @@ 2.1.0 4.0.1 2.1.1 -11.0.0-M22 +11.0.5 diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml index c92db514af..b86bae9fc4 100644 --- a/modules/stuffed/pom.xml +++ b/modules/stuffed/pom.xml @@ -21,6 +21,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 + +org.apache +apache +34 + + org.apache.tomcat tomcat-stuffed 1.0 @@ -29,7 +35,7 @@ UTF-8 org.apache.catalina.startup.Tomcat -11.0.0-M22 +11.0.5 @@ -76,7 +82,6 @@ org.apache.maven.plugins maven-compiler-plugin -3.11.0 21 @@ -84,7 +89,6 @@ org.apache.maven.plugins maven-shade-plugin -3.5.1 package - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Update actions/cache to latest version (4.2.0)
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-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new da3b94a Update actions/cache to latest version (4.2.0)
da3b94a is described below
commit da3b94a164076aa217ee544b97aa71741a93eaf7
Author: Mark Thomas
AuthorDate: Mon Mar 24 07:53:25 2025 +
Update actions/cache to latest version (4.2.0)
---
.github/workflows/coverage.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 8c4e6e7..8a1f1dd 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
-- uses: actions/cache@v3.0.8
+- uses: actions/cache@v4.2.0
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Bump actions/checkout from 3 to 4 [tomcat-jakartaee-migration]
dependabot[bot] opened a new pull request, #69: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/69 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. Release notes Sourced from https://github.com/actions/checkout/releases";>actions/checkout's releases. v4.0.0 What's Changed Update default runtime to node20 by https://github.com/takost";>@takost in https://redirect.github.com/actions/checkout/pull/1436";>actions/checkout#1436 Support fetching without the --progress option by https://github.com/simonbaird";>@simonbaird in https://redirect.github.com/actions/checkout/pull/1067";>actions/checkout#1067 Release 4.0.0 by https://github.com/takost";>@takost in https://redirect.github.com/actions/checkout/pull/1447";>actions/checkout#1447 New Contributors https://github.com/takost";>@takost made their first contribution in https://redirect.github.com/actions/checkout/pull/1436";>actions/checkout#1436 https://github.com/simonbaird";>@simonbaird made their first contribution in https://redirect.github.com/actions/checkout/pull/1067";>actions/checkout#1067 Full Changelog: https://github.com/actions/checkout/compare/v3...v4.0.0";>https://github.com/actions/checkout/compare/v3...v4.0.0 v3.6.0 What's Changed Mark test scripts with Bash'isms to be run via Bash by https://github.com/dscho";>@dscho in https://redirect.github.com/actions/checkout/pull/1377";>actions/checkout#1377 Add option to fetch tags even if fetch-depth > 0 by https://github.com/RobertWieczoreck";>@RobertWieczoreck in https://redirect.github.com/actions/checkout/pull/579";>actions/checkout#579 Release 3.6.0 by https://github.com/luketomlinson";>@luketomlinson in https://redirect.github.com/actions/checkout/pull/1437";>actions/checkout#1437 New Contributors https://github.com/RobertWieczoreck";>@RobertWieczoreck made their first contribution in https://redirect.github.com/actions/checkout/pull/579";>actions/checkout#579 https://github.com/luketomlinson";>@luketomlinson made their first contribution in https://redirect.github.com/actions/checkout/pull/1437";>actions/checkout#1437 Full Changelog: https://github.com/actions/checkout/compare/v3.5.3...v3.6.0";>https://github.com/actions/checkout/compare/v3.5.3...v3.6.0 v3.5.3 What's Changed Fix: Checkout Issue in self hosted runner due to faulty submodule check-ins by https://github.com/megamanics";>@megamanics in https://redirect.github.com/actions/checkout/pull/1196";>actions/checkout#1196 Fix typos found by codespell by https://github.com/DimitriPapadopoulos";>@DimitriPapadopoulos in https://redirect.github.com/actions/checkout/pull/1287";>actions/checkout#1287 Add support for sparse checkouts by https://github.com/dscho";>@dscho and https://github.com/dfdez";>@dfdez in https://redirect.github.com/actions/checkout/pull/1369";>actions/checkout#1369 Release v3.5.3 by https://github.com/TingluoHuang";>@TingluoHuang in https://redirect.github.com/actions/checkout/pull/1376";>actions/checkout#1376 New Contributors https://github.com/megamanics";>@megamanics made their first contribution in https://redirect.github.com/actions/checkout/pull/1196";>actions/checkout#1196 https://github.com/DimitriPapadopoulos";>@DimitriPapadopoulos made their first contribution in https://redirect.github.com/actions/checkout/pull/1287";>actions/checkout#1287 https://github.com/dfdez";>@dfdez made their first contribution in https://redirect.github.com/actions/checkout/pull/1369";>actions/checkout#1369 Full Changelog: https://github.com/actions/checkout/compare/v3...v3.5.3";>https://github.com/actions/checkout/compare/v3...v3.5.3 v3.5.2 What's Changed Fix: Use correct API url / endpoint in GHES by https://github.com/fhammerl";>@fhammerl in https://redirect.github.com/actions/checkout/pull/1289";>actions/checkout#1289 based on https://redirect.github.com/actions/checkout/issues/1286";>#1286 by https://github.com/1newsr";>@1newsr Full Changelog: https://github.com/actions/checkout/compare/v3.5.1...v3.5.2";>https://github.com/actions/checkout/compare/v3.5.1...v3.5.2 v3.5.1 What's Changed Improve checkout performance on Windows runners by upgrading @actions/github dependency by https://github.com/BrettDong";>@BrettDong in https://redirect.github.com/actions/checkout/pull/1246";>actions/checkout#1246 New Contributors https://github.com/BrettDong";>@BrettDong made their first contribution in https://redirect.github.com/actions/checkout/pull/1246";>actions/checkout#1246 ... (truncated) Changelog Sourced from https://github.com/actions/checkout/blob/main/CHANGELOG.md";>actions/checkout's changelog. Changelog v4.2.2 url-helper.ts now leverages well-known environment variables by https://github.com/jww3";>@jww3 in https://
(tomcat-jakartaee-migration) branch main updated: Add Github actions to dependabot.yml
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new a65f19c Add Github actions to dependabot.yml a65f19c is described below commit a65f19cf612dc74c200c034cbd1617043df7bd7f Author: Mark Thomas AuthorDate: Mon Mar 24 07:56:59 2025 + Add Github actions to dependabot.yml --- .github/dependabot.yml | 5 + 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fa9b443..e20dba2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,8 @@ updates: directory: "/" # Location of package manifests schedule: interval: "weekly" + - package-ecosystem: "github-actions" +directory: "/" +schedule: + # Check for updates to GitHub Actions every week + interval: "weekly" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Bump actions/cache from 4.2.0 to 4.2.3 [tomcat-jakartaee-migration]
dependabot[bot] opened a new pull request, #70: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/70 Bumps [actions/cache](https://github.com/actions/cache) from 4.2.0 to 4.2.3. Release notes Sourced from https://github.com/actions/cache/releases";>actions/cache's releases. v4.2.3 What's Changed Update to use @actions/cache 4.0.3 package & prepare for new release by https://github.com/salmanmkc";>@salmanmkc in https://redirect.github.com/actions/cache/pull/1577";>actions/cache#1577 (SAS tokens for cache entries are now masked in debug logs) New Contributors https://github.com/salmanmkc";>@salmanmkc made their first contribution in https://redirect.github.com/actions/cache/pull/1577";>actions/cache#1577 Full Changelog: https://github.com/actions/cache/compare/v4.2.2...v4.2.3";>https://github.com/actions/cache/compare/v4.2.2...v4.2.3 v4.2.2 What's Changed [!IMPORTANT] As a reminder, there were important backend changes to release v4.2.0, see https://github.com/actions/cache/releases/tag/v4.2.0";>those release notes and https://github.com/actions/cache/discussions/1510";>the announcement for more details. Bump @actions/cache to v4.0.2 by https://github.com/robherley";>@robherley in https://redirect.github.com/actions/cache/pull/1560";>actions/cache#1560 Full Changelog: https://github.com/actions/cache/compare/v4.2.1...v4.2.2";>https://github.com/actions/cache/compare/v4.2.1...v4.2.2 v4.2.1 What's Changed [!IMPORTANT] As a reminder, there were important backend changes to release v4.2.0, see https://github.com/actions/cache/releases/tag/v4.2.0";>those release notes and https://github.com/actions/cache/discussions/1510";>the announcement for more details. docs: GitHub is spelled incorrectly in caching-strategies.md by https://github.com/janco-absa";>@janco-absa in https://redirect.github.com/actions/cache/pull/1526";>actions/cache#1526 docs: Make the "always save prime numbers" example more clear by https://github.com/Tobbe";>@Tobbe in https://redirect.github.com/actions/cache/pull/1525";>actions/cache#1525 Update force deletion docs due a recent deprecation by https://github.com/sebbalex";>@sebbalex in https://redirect.github.com/actions/cache/pull/1500";>actions/cache#1500 Bump @actions/cache to v4.0.1 by https://github.com/robherley";>@robherley in https://redirect.github.com/actions/cache/pull/1554";>actions/cache#1554 New Contributors https://github.com/janco-absa";>@janco-absa made their first contribution in https://redirect.github.com/actions/cache/pull/1526";>actions/cache#1526 https://github.com/Tobbe";>@Tobbe made their first contribution in https://redirect.github.com/actions/cache/pull/1525";>actions/cache#1525 https://github.com/sebbalex";>@sebbalex made their first contribution in https://redirect.github.com/actions/cache/pull/1500";>actions/cache#1500 Full Changelog: https://github.com/actions/cache/compare/v4.2.0...v4.2.1";>https://github.com/actions/cache/compare/v4.2.0...v4.2.1 Changelog Sourced from https://github.com/actions/cache/blob/main/RELEASES.md";>actions/cache's changelog. 4.2.3 Bump @actions/cache to v4.0.3 (obfuscates SAS token in debug logs for cache entries) 4.2.2 Bump @actions/cache to v4.0.2 4.2.1 Bump @actions/cache to v4.0.1 Commits https://github.com/actions/cache/commit/5a3ec84eff668545956fd18022155c47e93e2684";>5a3ec84 Merge pull request https://redirect.github.com/actions/cache/issues/1577";>#1577 from salmanmkc/salmanmkc/4-test https://github.com/actions/cache/commit/7de21022a7b6824c106a9847befcbd8154b45b6a";>7de2102 Update releases.md https://github.com/actions/cache/commit/76d40dd347779762a1c829bbeeda5da4d81ca8c1";>76d40dd Update to use the latest version of the cache package to obfuscate the SAS https://github.com/actions/cache/commit/76dd5eb692f606c28d4b7a4ea7cfdffc926ba06a";>76dd5eb update cache with main https://github.com/actions/cache/commit/8c80c27c5e4498d5675b05fb1eff96a56c593b06";>8c80c27 new package https://github.com/actions/cache/commit/45cfd0e7fffd1869ea4d5bfb54a464d825c1f742";>45cfd0e updates https://github.com/actions/cache/commit/edd449b9cf39c2a20dc7c3d505ff6dc193c48a02";>edd449b updated cache with latest changes https://github.com/actions/cache/commit/0576707e373f92196b81695442ed3f80c347f9c7";>0576707 latest test before pr https://github.com/actions/cache/commit/3105dc9754dd9cd935ffcf45c091ed2cadbf42b9";>3105dc9 update https://github.com/actions/cache/commit/9450d42d15022999ad2fa60a8b91f01fc92a0563";>9450d42 mask Additional commits viewable in https://github.com/actions/cache/compare/v4.2.0...v4.2.3";>compare view [ branch dependabot/github_actions/actions/checkout-4 deleted (was 3f96a1c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/checkout-4 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git was 3f96a1c Bump actions/checkout from 3 to 4 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated (c474b3e -> 808135a)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git from c474b3e Bump actions/cache from 4.2.0 to 4.2.3 add 808135a Bump actions/checkout from 3 to 4 No new revisions were added by this update. Summary of changes: .github/workflows/ci.yml | 2 +- .github/workflows/coverage.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/github_actions/actions/cache-4.2.3 deleted (was 2fe03eb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/cache-4.2.3 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git was 2fe03eb Bump actions/cache from 4.2.0 to 4.2.3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/github_actions/actions/setup-java-4 deleted (was 6943faf)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/setup-java-4 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git was 6943faf Bump actions/setup-java from 3 to 4 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/github_actions/actions/checkout-4 updated (601e9ff -> 3f96a1c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/checkout-4 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git discard 601e9ff Bump actions/checkout from 3 to 4 add 392314d Bump org.apache:apache from 33 to 34 add c474b3e Bump actions/cache from 4.2.0 to 4.2.3 add 3f96a1c Bump actions/checkout from 3 to 4 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (601e9ff) \ N -- N -- N refs/heads/dependabot/github_actions/actions/checkout-4 (3f96a1c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/workflows/ci.yml | 2 +- .github/workflows/coverage.yml | 2 +- pom.xml| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Bump actions/setup-java from 3 to 4
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-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new 12fcf99 Bump actions/setup-java from 3 to 4
12fcf99 is described below
commit 12fcf99547079c6e14073b056dcaeaf908103a93
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Mar 24 07:59:16 2025 +
Bump actions/setup-java from 3 to 4
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to
4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3...v4)
---
updated-dependencies:
- dependency-name: actions/setup-java
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
---
.github/workflows/ci.yml | 2 +-
.github/workflows/coverage.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e635787..fca8ec4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 646e130..efa34c4 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -41,7 +41,7 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Bump actions/setup-java from 3 to 4 [tomcat-jakartaee-migration]
markt-asf merged PR #71: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/71 -- 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: Sharing code across packages
On 21/03/2025 14:11, Christopher Schultz wrote: All, I'm looking at adding file-based allow/deny for the RemoteCIDR(Filter| Valve) and I can see that there is a bunch of duplicate code between the two classes. Is there any reason not to re-use methods such as RemoteCIDR(Filter| Valve).fillFromInput between the two classes? They are in different packages, so maybe that's the reason? Possibly. Moving the common code to o.a.catalina.util might be an option. Or o.a.tomcat.util if the options for re-use extend beyond the o.a.catalina package. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/github_actions/actions/cache-4.2.3 created (now 2fe03eb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/cache-4.2.3 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at 2fe03eb Bump actions/cache from 4.2.0 to 4.2.3 No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/github_actions/actions/setup-java-4 created (now 6943faf)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/setup-java-4 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at 6943faf Bump actions/setup-java from 3 to 4 No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Bump org.apache:apache from 33 to 34
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 392314d Bump org.apache:apache from 33 to 34 392314d is described below commit 392314d35cb75bb46dd259a61ec11c46a09ac8eb Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Mar 24 04:37:53 2025 + Bump org.apache:apache from 33 to 34 Bumps [org.apache:apache](https://github.com/apache/maven-apache-parent) from 33 to 34. - [Release notes](https://github.com/apache/maven-apache-parent/releases) - [Commits](https://github.com/apache/maven-apache-parent/commits) --- updated-dependencies: - dependency-name: org.apache:apache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb7c92d..4a19a4e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache apache -33 +34 org.apache.tomcat - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Bump actions/setup-java from 3 to 4 [tomcat-jakartaee-migration]
dependabot[bot] opened a new pull request, #71: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/71 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. Release notes Sourced from https://github.com/actions/setup-java/releases";>actions/setup-java's releases. v4.0.0 What's Changed In the scope of this release, the version of the Node.js runtime was updated to 20. The majority of dependencies were updated to the latest versions. From now on, the code for the setup-java will run on Node.js 20 instead of Node.js 16. Breaking changes Update Node.js runtime to version 20 by https://github.com/aparnajyothi-y";>@aparnajyothi-y in https://redirect.github.com/actions/setup-java/pull/558";>actions/setup-java#558 Non-breaking changes Adding support for microsoft openjdk 21.0.0 by https://github.com/ralfstuckert";>@ralfstuckert in https://redirect.github.com/actions/setup-java/pull/546";>actions/setup-java#546 Update @actions/cache dependency and documentation by https://github.com/IvanZosimov";>@IvanZosimov in https://redirect.github.com/actions/setup-java/pull/549";>actions/setup-java#549 Implementation of the cache-dependency-path option to control caching dependency by https://github.com/itchyny";>@itchyny in https://redirect.github.com/actions/setup-java/pull/499";>actions/setup-java#499 New Contributors https://github.com/ralfstuckert";>@ralfstuckert made their first contribution in https://redirect.github.com/actions/setup-java/pull/546";>actions/setup-java#546 https://github.com/itchyny";>@itchyny made their first contribution in https://redirect.github.com/actions/setup-java/pull/499";>actions/setup-java#499 Full Changelog: https://github.com/actions/setup-java/compare/v3...v4.0.0";>https://github.com/actions/setup-java/compare/v3...v4.0.0 v3.13.0 What's changed In the scope of this release, support for Dragonwell JDK was added by https://github.com/Accelerator1996";>@Accelerator1996 in https://redirect.github.com/actions/setup-java/pull/532";>actions/setup-java#532 steps: - name: Checkout uses: actions/checkout@v3 - name: Setup-java uses: actions/setup-java@v3 with: distribution: 'dragonwell' java-version: '17' Several inaccuracies were also fixed: Fix XML namespaces wrongly using https by https://github.com/gnodet";>@gnodet in https://redirect.github.com/actions/setup-java/pull/503";>actions/setup-java#503 Fix typo and remove unintentional(?) word by https://github.com/CyberFlameGO";>@CyberFlameGO in https://redirect.github.com/actions/setup-java/pull/518";>actions/setup-java#518 Fix usage link within the README.md file by https://github.com/dassiorleando";>@dassiorleando in https://redirect.github.com/actions/setup-java/pull/525";>actions/setup-java#525 New Contributors https://github.com/CyberFlameGO";>@CyberFlameGO made their first contribution in https://redirect.github.com/actions/setup-java/pull/518";>actions/setup-java#518 https://github.com/dassiorleando";>@dassiorleando made their first contribution in https://redirect.github.com/actions/setup-java/pull/525";>actions/setup-java#525 https://github.com/gnodet";>@gnodet made their first contribution in https://redirect.github.com/actions/setup-java/pull/503";>actions/setup-java#503 https://github.com/Accelerator1996";>@Accelerator1996 made their first contribution in https://redirect.github.com/actions/setup-java/pull/532";>actions/setup-java#532 Full Changelog: https://github.com/actions/setup-java/compare/v3...v3.13.0";>https://github.com/actions/setup-java/compare/v3...v3.13.0 v3.12.0 ... (truncated) Commits https://github.com/actions/setup-java/commit/3a4f6e1af504cf6a31855fa899c6aa5355ba6c12";>3a4f6e1 Bump @types/jest from 29.5.12 to 29.5.14 (https://redirect.github.com/actions/setup-java/issues/729";>#729) https://github.com/actions/setup-java/commit/25f376e3482f0dca3da72062bdab5082495705ff";>25f376e Bump actions/publish-immutable-action from 0.0.3 to 0.0.4 (https://redirect.github.com/actions/setup-java/issues/727";>#727) https://github.com/actions/setup-java/commit/d4e4b6bbc1a6e93198eade3e6adfedd3c01f79c4";>d4e4b6b Bump @actions/http-client from 2.2.1 to 2.2.3 (https://redirect.github.com/actions/setup-java/issues/728";>#728) https://github.com/actions/setup-java/commit/28b532bcb39ad928b00bc3cbce25c94d11654854";>28b532b Create dependabot.yml (https://redirect.github.com/actions/setup-java/issues/722";>#722) https://github.com/actions/setup-java/commit/51ab6d2e3070fda1eac8cfaab8ffd90e6019d7e1";>51ab6d2 Update cache from 3.2.4 to 4.0.0 (https://redirect.github.com/actions/setup-java/issues/724";>#724) https://github.com/actions/setup-java/commit/99d3141d9ba96520552bfd7a9545bc1d74da9251";>99d3141 Update README.md (https://redirect.github.com
(tomcat-jakartaee-migration) branch dependabot/github_actions/codecov/codecov-action-5 created (now 50ca1f7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/codecov/codecov-action-5 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at 50ca1f7 Bump codecov/codecov-action from 3 to 5 No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Bump codecov/codecov-action from 3 to 5 [tomcat-jakartaee-migration]
dependabot[bot] opened a new pull request, #72: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/72 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 5. Release notes Sourced from https://github.com/codecov/codecov-action/releases";>codecov/codecov-action's releases. v5.0.0 v5 Release v5 of the Codecov GitHub Action will use the https://github.com/codecov/wrapper";>Codecov Wrapper to encapsulate the https://github.com/codecov/codecov-cli";>CLI. This will help ensure that the Action gets updates quicker. Migration Guide The v5 release also coincides with the opt-out feature for tokens for public repositories. In the Global Upload Token section of the settings page of an organization in codecov.io, you can set the ability for Codecov to receive a coverage reports from any source. This will allow contributors or other members of a repository to upload without needing access to the Codecov token. For more details see https://docs.codecov.com/docs/codecov-tokens#uploading-without-a-token";>how to upload without a token. [!WARNING] The following arguments have been changed file (this has been deprecated in favor of files) plugin (this has been deprecated in favor of plugins) The following arguments have been added: binary gcov_args gcov_executable gcov_ignore gcov_include report_type skip_validation swift_project You can see their usage in the action.yml https://github.com/codecov/codecov-action/blob/main/action.yml";>file. What's Changed chore(deps): bump to eslint9+ and remove eslint-config-google by https://github.com/thomasrockhu-codecov";>@thomasrockhu-codecov in https://redirect.github.com/codecov/codecov-action/pull/1591";>codecov/codecov-action#1591 build(deps-dev): bump @octokit/webhooks-types from 7.5.1 to 7.6.1 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1595";>codecov/codecov-action#1595 build(deps-dev): bump typescript from 5.6.2 to 5.6.3 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1604";>codecov/codecov-action#1604 build(deps-dev): bump @typescript-eslint/parser from 8.8.0 to 8.8.1 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1601";>codecov/codecov-action#1601 build(deps): bump @actions/core from 1.11.0 to 1.11.1 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1597";>codecov/codecov-action#1597 build(deps): bump github/codeql-action from 3.26.9 to 3.26.11 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1596";>codecov/codecov-action#1596 build(deps-dev): bump @typescript-eslint/eslint-plugin from 8.8.0 to 8.8.1 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1600";>codecov/codecov-action#1600 build(deps-dev): bump eslint from 9.11.1 to 9.12.0 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1598";>codecov/codecov-action#1598 build(deps): bump github/codeql-action from 3.26.11 to 3.26.12 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1609";>codecov/codecov-action#1609 build(deps): bump actions/checkout from 4.2.0 to 4.2.1 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1608";>codecov/codecov-action#1608 build(deps): bump actions/upload-artifact from 4.4.0 to 4.4.3 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1607";>codecov/codecov-action#1607 build(deps-dev): bump @typescript-eslint/parser from 8.8.1 to 8.9.0 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1612";>codecov/codecov-action#1612 build(deps-dev): bump @typescript-eslint/eslint-plugin from 8.8.1 to 8.9.0 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1611";>codecov/codecov-action#1611 build(deps-dev): bump @typescript-eslint/eslint-plugin from 8.9.0 to 8.10.0 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1615";>codecov/codecov-action#1615 build(deps-dev): bump eslint from 9.12.0 to 9.13.0 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1618";>codecov/codecov-action#1618 build(deps): bump github/codeql-action from 3.26.12 to 3.26.13 by https://github.com/dependabot";>@dependabot in https://redirect.github.com/codecov/codecov-action/pull/1617";>codecov/codecov-action#1617 build(deps-d
Re: [PR] Bump actions/cache from 4.2.0 to 4.2.3 [tomcat-jakartaee-migration]
markt-asf merged PR #70: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/70 -- 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-jakartaee-migration) branch dependabot/maven/org.apache-apache-34 deleted (was 597a7b4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache-apache-34 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git was 597a7b4 Bump org.apache:apache from 33 to 34 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Bump actions/cache from 4.2.0 to 4.2.3
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-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new c474b3e Bump actions/cache from 4.2.0 to 4.2.3
c474b3e is described below
commit c474b3e6ca4819d7ffbf2bd1a0657f101cdfac61
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Mar 24 07:58:24 2025 +
Bump actions/cache from 4.2.0 to 4.2.3
Bumps [actions/cache](https://github.com/actions/cache) from 4.2.0 to 4.2.3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v4.2.0...v4.2.3)
---
updated-dependencies:
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
.github/workflows/ci.yml | 2 +-
.github/workflows/coverage.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3835b3b..f63659f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
-- uses: actions/cache@v4.2.0
+- uses: actions/cache@v4.2.3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 8a1f1dd..89d339c 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
-- uses: actions/cache@v4.2.0
+- uses: actions/cache@v4.2.3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Bump org.apache:apache from 33 to 34 [tomcat-jakartaee-migration]
markt-asf merged PR #68: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/68 -- 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-jakartaee-migration) branch dependabot/github_actions/actions/checkout-4 created (now 601e9ff)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/checkout-4 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at 601e9ff Bump actions/checkout from 3 to 4 No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Bump codecov/codecov-action from 3 to 5 [tomcat-jakartaee-migration]
markt-asf merged PR #72: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/72 -- 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-jakartaee-migration) branch main updated: Bump codecov/codecov-action from 3 to 5
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 05d8302 Bump codecov/codecov-action from 3 to 5 05d8302 is described below commit 05d83020a14c155d5c3263790d4e4a828a9df273 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Mar 24 08:00:28 2025 + Bump codecov/codecov-action from 3 to 5 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 5. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3...v5) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index efa34c4..848c5dc 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -48,6 +48,6 @@ jobs: - name: Build run: mvn -V test jacoco:report --file pom.xml --no-transfer-progress - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v5 with: files: ./target/site/jacoco/jacoco.xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/github_actions/codecov/codecov-action-5 deleted (was 50ca1f7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/codecov/codecov-action-5 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git was 50ca1f7 Bump codecov/codecov-action from 3 to 5 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Update actions/cache to latest version
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-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new 19d0640 Update actions/cache to latest version
19d0640 is described below
commit 19d06401d4b730e7205b35ec937dd33d0264e921
Author: Mark Thomas
AuthorDate: Mon Mar 24 07:51:06 2025 +
Update actions/cache to latest version
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2b37e39..3835b3b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
-- uses: actions/cache@v3.0.8
+- uses: actions/cache@v4.2.0
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix IDE warnings
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 c91d60fdce Fix IDE warnings
c91d60fdce is described below
commit c91d60fdce60f63d0f71752104c8499d863e9909
Author: Mark Thomas
AuthorDate: Mon Mar 24 08:48:23 2025 +
Fix IDE warnings
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java| 2 +-
.../apache/tomcat/websocket/WsRemoteEndpointImplBase.java| 12 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index a845b6c049..0b7cb7c5da 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1248,7 +1248,7 @@ public abstract class AbstractEndpoint {
Executor executor = this.executor;
if (executor != null && internalExecutor) {
this.executor = null;
-if (executor instanceof
@SuppressWarnings("resource")ThreadPoolExecutor tpe) {
+if (executor instanceof ThreadPoolExecutor tpe) {
//this is our internal one, so we need to shut it down
tpe.shutdownNow();
long timeout = getExecutorTerminationTimeoutMillis();
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
index 792fed1dcb..bf32bcc84c 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
@@ -581,7 +581,7 @@ public abstract class WsRemoteEndpointImplBase implements
RemoteEndpoint {
}
-@SuppressWarnings({ "unchecked", "rawtypes" })
+@SuppressWarnings({ "unchecked", "rawtypes", "null" })
public void sendObject(Object obj) throws IOException, EncodeException {
if (obj == null) {
throw new
IllegalArgumentException(sm.getString("wsRemoteEndpoint.nullData"));
@@ -607,7 +607,7 @@ public abstract class WsRemoteEndpointImplBase implements
RemoteEndpoint {
String msg = text1.encode(obj);
sendString(msg);
}
-case Encoder.TextStream textStream -> {
+case @SuppressWarnings("unused") Encoder.TextStream textStream -> {
try (Writer w = getSendWriter()) {
((Encoder.TextStream) encoder).encode(obj, w);
}
@@ -616,7 +616,7 @@ public abstract class WsRemoteEndpointImplBase implements
RemoteEndpoint {
ByteBuffer msg = binary.encode(obj);
sendBytes(msg);
}
-case Encoder.BinaryStream binaryStream -> {
+case @SuppressWarnings("unused") Encoder.BinaryStream binaryStream
-> {
try (OutputStream os = getSendStream()) {
((Encoder.BinaryStream) encoder).encode(obj, os);
}
@@ -634,7 +634,7 @@ public abstract class WsRemoteEndpointImplBase implements
RemoteEndpoint {
}
-@SuppressWarnings({ "unchecked", "rawtypes" })
+@SuppressWarnings({ "unchecked", "rawtypes", "null" })
public void sendObjectByCompletion(Object obj, SendHandler completion) {
if (obj == null) {
@@ -666,7 +666,7 @@ public abstract class WsRemoteEndpointImplBase implements
RemoteEndpoint {
String msg = text1.encode(obj);
sendStringByCompletion(msg, completion);
}
-case Encoder.TextStream textStream -> {
+case @SuppressWarnings("unused") Encoder.TextStream textStream
-> {
try (Writer w = getSendWriter()) {
((Encoder.TextStream) encoder).encode(obj, w);
}
@@ -676,7 +676,7 @@ public abstract class WsRemoteEndpointImplBase implements
RemoteEndpoint {
ByteBuffer msg = binary.encode(obj);
sendBytesByCompletion(msg, completion);
}
-case Encoder.BinaryStream binaryStream -> {
+case @SuppressWarnings("unused") Encoder.BinaryStream
binaryStream -> {
try (OutputStream os = getSendStream()) {
((Encoder.BinaryStream) encoder).encode(obj, os);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Remove out of date comments.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/11.0.x by this push: new f6240cc50e Remove out of date comments. f6240cc50e is described below commit f6240cc50e44169d4fb971183a4504593a10d265 Author: Mark Thomas AuthorDate: Mon Mar 24 08:37:48 2025 + Remove out of date comments. --- java/org/apache/tomcat/util/buf/package.html | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/java/org/apache/tomcat/util/buf/package.html b/java/org/apache/tomcat/util/buf/package.html index 44dac39bbd..4852690ed2 100644 --- a/java/org/apache/tomcat/util/buf/package.html +++ b/java/org/apache/tomcat/util/buf/package.html @@ -26,12 +26,6 @@ B2C converters are caching an ISReader/OSWriter and keep everything allocated to in any VM without any garbage. -This package must accommodate future extensions and additional converters ( most important: the nio.charset, -which should be detected and used if available ). Also, we do have one handwritten UTF8Decoder, and -other tuned encoders could be added. - - -My benchmarks ( I'm costin :-) show only small differences between C2B, B2C and handwritten coders/decoders, -so UTF8Decoder may be disabled. +This package must accommodate future extensions and additional converters. - 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: Remove out of date comments.
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 c12942759e Remove out of date comments. c12942759e is described below commit c12942759eff6ac81053e36ca50f91c730c54356 Author: Mark Thomas AuthorDate: Mon Mar 24 08:37:48 2025 + Remove out of date comments. --- java/org/apache/tomcat/util/buf/package.html | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/java/org/apache/tomcat/util/buf/package.html b/java/org/apache/tomcat/util/buf/package.html index 44dac39bbd..4852690ed2 100644 --- a/java/org/apache/tomcat/util/buf/package.html +++ b/java/org/apache/tomcat/util/buf/package.html @@ -26,12 +26,6 @@ B2C converters are caching an ISReader/OSWriter and keep everything allocated to in any VM without any garbage. -This package must accommodate future extensions and additional converters ( most important: the nio.charset, -which should be detected and used if available ). Also, we do have one handwritten UTF8Decoder, and -other tuned encoders could be added. - - -My benchmarks ( I'm costin :-) show only small differences between C2B, B2C and handwritten coders/decoders, -so UTF8Decoder may be disabled. +This package must accommodate future extensions and additional converters. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Remove out of date comments.
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 9a742a5fd1 Remove out of date comments. 9a742a5fd1 is described below commit 9a742a5fd1e2781de06cda9287d2f264cacc81b9 Author: Mark Thomas AuthorDate: Mon Mar 24 08:37:48 2025 + Remove out of date comments. --- java/org/apache/tomcat/util/buf/package.html | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/java/org/apache/tomcat/util/buf/package.html b/java/org/apache/tomcat/util/buf/package.html index 44dac39bbd..4852690ed2 100644 --- a/java/org/apache/tomcat/util/buf/package.html +++ b/java/org/apache/tomcat/util/buf/package.html @@ -26,12 +26,6 @@ B2C converters are caching an ISReader/OSWriter and keep everything allocated to in any VM without any garbage. -This package must accommodate future extensions and additional converters ( most important: the nio.charset, -which should be detected and used if available ). Also, we do have one handwritten UTF8Decoder, and -other tuned encoders could be added. - - -My benchmarks ( I'm costin :-) show only small differences between C2B, B2C and handwritten coders/decoders, -so UTF8Decoder may be disabled. +This package must accommodate future extensions and additional converters. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Fix IDE warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new b96ba58fa8 Fix IDE warnings
b96ba58fa8 is described below
commit b96ba58fa8d48a74a26a40496060b3bc93539f66
Author: Mark Thomas
AuthorDate: Mon Mar 24 08:48:53 2025 +
Fix IDE warnings
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index ad7a175f99..b2658f3f23 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1254,7 +1254,7 @@ public abstract class AbstractEndpoint {
Executor executor = this.executor;
if (executor != null && internalExecutor) {
this.executor = null;
-if (executor instanceof
@SuppressWarnings("resource")ThreadPoolExecutor tpe) {
+if (executor instanceof ThreadPoolExecutor tpe) {
//this is our internal one, so we need to shut it down
tpe.shutdownNow();
long timeout = getExecutorTerminationTimeoutMillis();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Bump version numbers
This is an automated email from the ASF dual-hosted git repository. remm 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 64831e3a20 Bump version numbers 64831e3a20 is described below commit 64831e3a20160e68bba3a250ebf53b8397878766 Author: remm AuthorDate: Mon Mar 24 10:25:14 2025 +0100 Bump version numbers --- modules/cxf/pom.xml | 8 modules/jdbc-pool/pom.xml | 5 ++--- modules/owb/pom.xml | 6 +++--- modules/stuffed/pom.xml | 8 ++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml index 7cb9c1b2da..85c5991390 100644 --- a/modules/cxf/pom.xml +++ b/modules/cxf/pom.xml @@ -29,14 +29,14 @@ Apache CXF for Apache Tomcat CDI Apache CXF packaged for Apache Tomcat CDI -4.1.0 +4.1.1 jar 4.0.1 2.1.3 -3.0.0 -2.0.0 +3.0.1 +2.0.1 @@ -97,7 +97,7 @@ org.apache.maven.plugins maven-compiler-plugin -17 +21 diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml index 6bffeea2e0..5d62309f48 100644 --- a/modules/jdbc-pool/pom.xml +++ b/modules/jdbc-pool/pom.xml @@ -24,12 +24,12 @@ org.apache apache -15 +34 org.apache.tomcat tomcat-jdbc - 8.0.15-SNAPSHOT + 1.1.0-SNAPSHOT jar @@ -111,7 +111,6 @@ org.apache.maven.plugins maven-gpg-plugin -1.2 sign-artifacts diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml index 63e08ce1ee..36a86280e0 100644 --- a/modules/owb/pom.xml +++ b/modules/owb/pom.xml @@ -21,7 +21,7 @@ org.apache apache -33 +34 org.apache.tomcat @@ -29,7 +29,7 @@ Apache Tomcat CDI 4 support Apache Tomcat CDI 4 support using Apache OpenWebBeans -4.0.2 +4.0.3 jar @@ -98,7 +98,7 @@ org.apache.maven.plugins maven-compiler-plugin -17 +21 diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml index 7726e50ba5..f9bab61a25 100644 --- a/modules/stuffed/pom.xml +++ b/modules/stuffed/pom.xml @@ -21,6 +21,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 + +org.apache +apache +34 + + org.apache.tomcat tomcat-stuffed 1.0 @@ -76,7 +82,6 @@ org.apache.maven.plugins maven-compiler-plugin -3.11.0 21 @@ -84,7 +89,6 @@ org.apache.maven.plugins maven-shade-plugin -3.5.1 package - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69623] regression between 9.0.27 and 9.0.29: UnknownServiceException: no content-type
https://bz.apache.org/bugzilla/show_bug.cgi?id=69623 --- Comment #7 from Mark Thomas --- Exactly what path are you passing to this.getClass().getClassLoader().getResource(filePath) ? getResource() is documented to find class resources by name so to obtain the resource at WEB-INF/classes/fileName.mdd you should be passing "fileName.mdd". To obtain the resource at WEB-INF/classes/org/apache/tomcat/fileName.mdd you should be passing "org/apache/tomcat/fileName.mdd" It is possible that Tomcat was more lenient about this in older versions and that it has become less lenient as the WebResources implementation has evolved. -- 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
