date:20210524

Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

2021-05-24 Thread Mark Thomas


On 24/05/2021 18:43, Rémy Maucherat wrote:

On Mon, May 24, 2021 at 6:34 PM  wrote:


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 620e06c  Remove code deprecated in 10.1.x apart from the APR
Endpoint
620e06c is described below

commit 620e06c468a02ca98dc4beacf556dd12d2440877
Author: Mark Thomas 
AuthorDate: Mon May 24 17:34:09 2021 +0100

 Remove code deprecated in 10.1.x apart from the APR Endpoint


Ah, it's *that* APR time again :)


Indeed. My plan was to give it a few days now folks have been reminded 
that this is going to happen and then do the APR removal in a separate 
commit.



Also another question is if this branch moves to Java 11. Has it been
decided officially for Jakarta 10 ?


No formal decision as far as I am aware. I think the conversation is 
heading towards Java 11 minimum.


Mark

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

buildbot success in on tomcat-trunk

2021-05-24 Thread buildbot

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch main] 8301307ce76540e92c6068d8277038d133da862c
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

2021-05-24 Thread Rémy Maucherat

On Mon, May 24, 2021 at 6:34 PM  wrote:

> 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 620e06c  Remove code deprecated in 10.1.x apart from the APR
> Endpoint
> 620e06c is described below
>
> commit 620e06c468a02ca98dc4beacf556dd12d2440877
> Author: Mark Thomas 
> AuthorDate: Mon May 24 17:34:09 2021 +0100
>
> Remove code deprecated in 10.1.x apart from the APR Endpoint
>
> Ah, it's *that* APR time again :)

Also another question is if this branch moves to Java 11. Has it been
decided officially for Jakarta 10 ?

Rémy

buildbot success in on tomcat-10.0.x

2021-05-24 Thread buildbot

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-10.0-commit' 
triggered this build
Build Source Stamp: [branch 10.0.x] 69e705310ad30454f645b2bdd49b45ba53e078fb
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

[tomcat] branch main updated: Remove one more bit of deprecated code (and fix the build)

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 8301307  Remove one more bit of deprecated code (and fix the build)
8301307 is described below

commit 8301307ce76540e92c6068d8277038d133da862c
Author: Mark Thomas 
AuthorDate: Mon May 24 18:15:11 2021 +0100

Remove one more bit of deprecated code (and fix the build)
---
 java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java | 8 
 1 file changed, 8 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java 
b/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java
index 2aebe00..4d57291 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java
@@ -33,14 +33,6 @@ import org.apache.tomcat.InstanceManager;
  */
 public class PojoEndpointClient extends PojoEndpointBase {
 
-@Deprecated
-public PojoEndpointClient(Object pojo,
-List> decoders) throws 
DeploymentException {
-super(Collections.emptyMap());
-setPojo(pojo);
-setMethodMapping(new PojoMethodMapping(pojo.getClass(), decoders, 
null));
-}
-
 public PojoEndpointClient(Object pojo, List> 
decoders, InstanceManager instanceManager) throws DeploymentException {
 super(Collections.emptyMap());
 setPojo(pojo);

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

buildbot failure in on tomcat-trunk

2021-05-24 Thread buildbot

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch main] 620e06c468a02ca98dc4beacf556dd12d2440877
Blamelist: Mark Thomas 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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

[tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 620e06c  Remove code deprecated in 10.1.x apart from the APR Endpoint
620e06c is described below

commit 620e06c468a02ca98dc4beacf556dd12d2440877
Author: Mark Thomas 
AuthorDate: Mon May 24 17:34:09 2021 +0100

Remove code deprecated in 10.1.x apart from the APR Endpoint
---
 .../apache/catalina/ha/deploy/FarmWarDeployer.java | 30 ---
 .../apache/catalina/manager/ManagerServlet.java| 36 -
 java/org/apache/catalina/realm/JNDIRealm.java  | 24 --
 java/org/apache/catalina/startup/HostConfig.java   | 51 
 java/org/apache/tomcat/util/net/Acceptor.java  | 14 
 .../apache/tomcat/util/net/SSLImplementation.java  | 17 +---
 .../tomcat/util/net/jsse/JSSEImplementation.java   |  6 --
 .../apache/tomcat/util/net/jsse/JSSESupport.java   | 11 ---
 .../util/net/openssl/OpenSSLImplementation.java|  6 --
 java/org/apache/tomcat/websocket/Util.java | 19 -
 java/org/apache/tomcat/websocket/WsSession.java| 94 --
 .../tomcat/websocket/pojo/PojoMethodMapping.java   | 19 -
 webapps/docs/changelog.xml |  3 +
 13 files changed, 4 insertions(+), 326 deletions(-)

diff --git a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java 
b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
index 4912b7f..c16c3e0 100644
--- a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
+++ b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
@@ -584,36 +584,6 @@ public class FarmWarDeployer extends ClusterListener
 }
 
 /**
- * Verified if a context is being services.
- * @param name The context name
- * @return true if the context is being serviced
- * @throws Exception Error invoking the deployer
- * @deprecated Unused. Will be removed in Tomcat 10.1.x onwards.
- */
-@Deprecated
-protected boolean isServiced(String name) throws Exception {
-String[] params = { name };
-String[] signature = { "java.lang.String" };
-Boolean result = (Boolean) mBeanServer.invoke(oname, "isServiced",
-params, signature);
-return result.booleanValue();
-}
-
-/**
- * Mark a context as being services.
- * @param name The context name
- * @throws Exception Error invoking the deployer
- * @deprecated Unused. Will be removed in Tomcat 10.1.x onwards.
- * Use {@link #tryAddServiced}
- */
-@Deprecated
-protected void addServiced(String name) throws Exception {
-String[] params = { name };
-String[] signature = { "java.lang.String" };
-mBeanServer.invoke(oname, "addServiced", params, signature);
-}
-
-/**
  * Attempt to mark a context as being serviced
  * @param name The context name
  * @return {@code true} if the application was marked as being serviced and
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java 
b/java/org/apache/catalina/manager/ManagerServlet.java
index 37cff7b..1b97692 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -1572,42 +1572,6 @@ public class ManagerServlet extends HttpServlet 
implements ContainerServlet {
 
 
 /**
- * Invoke the isServiced method on the deployer.
- *
- * @param name The webapp name
- * @return true if a webapp with that name is being serviced
- * @throws Exception Propagate JMX invocation error
- * @deprecated Unused. Will be removed in Tomcat 10.1.x onwards.
- */
-@Deprecated
-protected boolean isServiced(String name)
-throws Exception {
-String[] params = { name };
-String[] signature = { "java.lang.String" };
-Boolean result =
-(Boolean) mBeanServer.invoke(oname, "isServiced", params, 
signature);
-return result.booleanValue();
-}
-
-
-/**
- * Invoke the addServiced method on the deployer.
- *
- * @param name The webapp name
- * @throws Exception Propagate JMX invocation error
- * @deprecated Unused. Will be removed in Tomcat 10.1.x onwards.
- * Use {@link #tryAddServiced}
- */
-@Deprecated
-protected void addServiced(String name)
-throws Exception {
-String[] params = { name };
-String[] signature = { "java.lang.String" };
-mBeanServer.invoke(oname, "addServiced", params, signature);
-}
-
-
-/**
  * Attempt to mark a context as being serviced
  * @param name The context name
  * @return {@code true} if the application was marked as being serviced and
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java 
b/java/org/apache/catalina/realm/JNDIRealm.java
index b6318b4..7650c4e 100644
---

[tomcat] branch 9.0.x updated: Code clean-up. Add braces for clarity.

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new fca6448  Code clean-up. Add braces for clarity.
fca6448 is described below

commit fca6448d7e08a436505e09ea9096fe6a1fd78c8b
Author: Mark Thomas 
AuthorDate: Mon May 24 17:24:11 2021 +0100

Code clean-up. Add braces for clarity.
---
 java/javax/servlet/UnavailableException.java   |  10 +-
 java/javax/servlet/jsp/tagext/TagInfo.java |   9 +-
 .../catalina/ant/jmx/JMXAccessorSetTask.java   |   6 +-
 .../apache/catalina/ant/jmx/JMXAccessorTask.java   |  47 ---
 .../authenticator/NonLoginAuthenticator.java   |   3 +-
 .../catalina/authenticator/SavedRequest.java   |   5 +-
 .../authenticator/SpnegoAuthenticator.java |  40 --
 java/org/apache/catalina/connector/Response.java   |   5 +-
 .../catalina/core/ApplicationDispatcher.java   | 141 -
 .../apache/catalina/filters/RemoteCIDRFilter.java  |   3 +-
 10 files changed, 162 insertions(+), 107 deletions(-)

diff --git a/java/javax/servlet/UnavailableException.java 
b/java/javax/servlet/UnavailableException.java
index 6f13f55..9c1bc6f 100644
--- a/java/javax/servlet/UnavailableException.java
+++ b/java/javax/servlet/UnavailableException.java
@@ -80,10 +80,11 @@ public class UnavailableException extends ServletException {
 public UnavailableException(int seconds, Servlet servlet, String msg) {
 super(msg);
 this.servlet = servlet;
-if (seconds <= 0)
+if (seconds <= 0) {
 this.seconds = -1;
-else
+} else {
 this.seconds = seconds;
+}
 permanent = false;
 }
 
@@ -123,10 +124,11 @@ public class UnavailableException extends 
ServletException {
 public UnavailableException(String msg, int seconds) {
 super(msg);
 
-if (seconds <= 0)
+if (seconds <= 0) {
 this.seconds = -1;
-else
+} else {
 this.seconds = seconds;
+}
 servlet = null;
 permanent = false;
 }
diff --git a/java/javax/servlet/jsp/tagext/TagInfo.java 
b/java/javax/servlet/jsp/tagext/TagInfo.java
index 6183cf7..8cadf3d 100644
--- a/java/javax/servlet/jsp/tagext/TagInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagInfo.java
@@ -97,8 +97,9 @@ public class TagInfo {
 this.tagVariableInfo = null;
 this.dynamicAttributes = false;
 
-if (tagExtraInfo != null)
+if (tagExtraInfo != null) {
 tagExtraInfo.setTagInfo(this);
+}
 }
 
 /**
@@ -151,8 +152,9 @@ public class TagInfo {
 // Use defaults for unspecified values
 this.dynamicAttributes = false;
 
-if (tagExtraInfo != null)
+if (tagExtraInfo != null) {
 tagExtraInfo.setTagInfo(this);
+}
 }
 
 /**
@@ -207,8 +209,9 @@ public class TagInfo {
 this.tagVariableInfo = tvi;
 this.dynamicAttributes = dynamicAttributes;
 
-if (tagExtraInfo != null)
+if (tagExtraInfo != null) {
 tagExtraInfo.setTagInfo(this);
+}
 }
 
 /**
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
index 74f2201..478b01c 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
@@ -160,8 +160,9 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
 String mType = getMBeanAttributeType(jmxServerConnection, name,
 attribute);
 realValue = convertStringToType(value, mType);
-} else
+} else {
 realValue = value;
+}
 }
 jmxServerConnection.setAttribute(new ObjectName(name), new Attribute(
 attribute, realValue));
@@ -187,8 +188,9 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
 MBeanInfo minfo = jmxServerConnection.getMBeanInfo(oname);
 MBeanAttributeInfo attrs[] = minfo.getAttributes();
 for (int i = 0; mattrType == null && i < attrs.length; i++) {
-if (attribute.equals(attrs[i].getName()))
+if (attribute.equals(attrs[i].getName())) {
 mattrType = attrs[i].getType();
+}
 }
 return mattrType;
 }
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
index d79e471..3ef604d 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -358,11 +358,11 @@ public class JMXAccessorTask extends 
BaseRedirectorHelperTask {
 String host, String port, String username, String password)

[tomcat] branch 8.5.x updated: Code clean-up. Add braces for clarity.

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new c358936  Code clean-up. Add braces for clarity.
c358936 is described below

commit c358936e30212e96578b75f5c311f6f6434296b8
Author: Mark Thomas 
AuthorDate: Mon May 24 17:24:11 2021 +0100

Code clean-up. Add braces for clarity.
---
 java/javax/servlet/UnavailableException.java   |  10 +-
 java/javax/servlet/jsp/tagext/TagInfo.java |   9 +-
 .../catalina/ant/jmx/JMXAccessorSetTask.java   |   6 +-
 .../apache/catalina/ant/jmx/JMXAccessorTask.java   |  47 ---
 .../authenticator/NonLoginAuthenticator.java   |   3 +-
 .../catalina/authenticator/SavedRequest.java   |   5 +-
 .../authenticator/SpnegoAuthenticator.java |  40 --
 java/org/apache/catalina/connector/Response.java   |   5 +-
 .../catalina/core/ApplicationDispatcher.java   | 141 -
 .../apache/catalina/filters/RemoteCIDRFilter.java  |   3 +-
 10 files changed, 162 insertions(+), 107 deletions(-)

diff --git a/java/javax/servlet/UnavailableException.java 
b/java/javax/servlet/UnavailableException.java
index c03c6d2..afa0399 100644
--- a/java/javax/servlet/UnavailableException.java
+++ b/java/javax/servlet/UnavailableException.java
@@ -82,10 +82,11 @@ public class UnavailableException extends ServletException {
 public UnavailableException(int seconds, Servlet servlet, String msg) {
 super(msg);
 this.servlet = servlet;
-if (seconds <= 0)
+if (seconds <= 0) {
 this.seconds = -1;
-else
+} else {
 this.seconds = seconds;
+}
 permanent = false;
 }
 
@@ -125,10 +126,11 @@ public class UnavailableException extends 
ServletException {
 public UnavailableException(String msg, int seconds) {
 super(msg);
 
-if (seconds <= 0)
+if (seconds <= 0) {
 this.seconds = -1;
-else
+} else {
 this.seconds = seconds;
+}
 servlet = null;
 permanent = false;
 }
diff --git a/java/javax/servlet/jsp/tagext/TagInfo.java 
b/java/javax/servlet/jsp/tagext/TagInfo.java
index 6183cf7..8cadf3d 100644
--- a/java/javax/servlet/jsp/tagext/TagInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagInfo.java
@@ -97,8 +97,9 @@ public class TagInfo {
 this.tagVariableInfo = null;
 this.dynamicAttributes = false;
 
-if (tagExtraInfo != null)
+if (tagExtraInfo != null) {
 tagExtraInfo.setTagInfo(this);
+}
 }
 
 /**
@@ -151,8 +152,9 @@ public class TagInfo {
 // Use defaults for unspecified values
 this.dynamicAttributes = false;
 
-if (tagExtraInfo != null)
+if (tagExtraInfo != null) {
 tagExtraInfo.setTagInfo(this);
+}
 }
 
 /**
@@ -207,8 +209,9 @@ public class TagInfo {
 this.tagVariableInfo = tvi;
 this.dynamicAttributes = dynamicAttributes;
 
-if (tagExtraInfo != null)
+if (tagExtraInfo != null) {
 tagExtraInfo.setTagInfo(this);
+}
 }
 
 /**
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
index 74f2201..478b01c 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
@@ -160,8 +160,9 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
 String mType = getMBeanAttributeType(jmxServerConnection, name,
 attribute);
 realValue = convertStringToType(value, mType);
-} else
+} else {
 realValue = value;
+}
 }
 jmxServerConnection.setAttribute(new ObjectName(name), new Attribute(
 attribute, realValue));
@@ -187,8 +188,9 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
 MBeanInfo minfo = jmxServerConnection.getMBeanInfo(oname);
 MBeanAttributeInfo attrs[] = minfo.getAttributes();
 for (int i = 0; mattrType == null && i < attrs.length; i++) {
-if (attribute.equals(attrs[i].getName()))
+if (attribute.equals(attrs[i].getName())) {
 mattrType = attrs[i].getType();
+}
 }
 return mattrType;
 }
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
index d79e471..3ef604d 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -358,11 +358,11 @@ public class JMXAccessorTask extends 
BaseRedirectorHelperTask {
 String host, String port, String username, String password)

[tomcat] branch 10.0.x updated: Code clean-up. Add braces for clarity.

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 69e7053  Code clean-up. Add braces for clarity.
69e7053 is described below

commit 69e705310ad30454f645b2bdd49b45ba53e078fb
Author: Mark Thomas 
AuthorDate: Mon May 24 17:24:11 2021 +0100

Code clean-up. Add braces for clarity.
---
 java/jakarta/servlet/UnavailableException.java |  10 +-
 java/jakarta/servlet/jsp/tagext/TagInfo.java   |   9 +-
 .../catalina/ant/jmx/JMXAccessorSetTask.java   |   6 +-
 .../apache/catalina/ant/jmx/JMXAccessorTask.java   |  47 ---
 .../authenticator/NonLoginAuthenticator.java   |   3 +-
 .../catalina/authenticator/SavedRequest.java   |   5 +-
 .../authenticator/SpnegoAuthenticator.java |  40 --
 java/org/apache/catalina/connector/Response.java   |   5 +-
 .../catalina/core/ApplicationDispatcher.java   | 141 -
 .../apache/catalina/filters/RemoteCIDRFilter.java  |   3 +-
 10 files changed, 162 insertions(+), 107 deletions(-)

diff --git a/java/jakarta/servlet/UnavailableException.java 
b/java/jakarta/servlet/UnavailableException.java
index c5af76d..25aa58b 100644
--- a/java/jakarta/servlet/UnavailableException.java
+++ b/java/jakarta/servlet/UnavailableException.java
@@ -80,10 +80,11 @@ public class UnavailableException extends ServletException {
 public UnavailableException(int seconds, Servlet servlet, String msg) {
 super(msg);
 this.servlet = servlet;
-if (seconds <= 0)
+if (seconds <= 0) {
 this.seconds = -1;
-else
+} else {
 this.seconds = seconds;
+}
 permanent = false;
 }
 
@@ -123,10 +124,11 @@ public class UnavailableException extends 
ServletException {
 public UnavailableException(String msg, int seconds) {
 super(msg);
 
-if (seconds <= 0)
+if (seconds <= 0) {
 this.seconds = -1;
-else
+} else {
 this.seconds = seconds;
+}
 servlet = null;
 permanent = false;
 }
diff --git a/java/jakarta/servlet/jsp/tagext/TagInfo.java 
b/java/jakarta/servlet/jsp/tagext/TagInfo.java
index dcc234d..7ac0fc5 100644
--- a/java/jakarta/servlet/jsp/tagext/TagInfo.java
+++ b/java/jakarta/servlet/jsp/tagext/TagInfo.java
@@ -97,8 +97,9 @@ public class TagInfo {
 this.tagVariableInfo = null;
 this.dynamicAttributes = false;
 
-if (tagExtraInfo != null)
+if (tagExtraInfo != null) {
 tagExtraInfo.setTagInfo(this);
+}
 }
 
 /**
@@ -151,8 +152,9 @@ public class TagInfo {
 // Use defaults for unspecified values
 this.dynamicAttributes = false;
 
-if (tagExtraInfo != null)
+if (tagExtraInfo != null) {
 tagExtraInfo.setTagInfo(this);
+}
 }
 
 /**
@@ -207,8 +209,9 @@ public class TagInfo {
 this.tagVariableInfo = tvi;
 this.dynamicAttributes = dynamicAttributes;
 
-if (tagExtraInfo != null)
+if (tagExtraInfo != null) {
 tagExtraInfo.setTagInfo(this);
+}
 }
 
 /**
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
index 74f2201..478b01c 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
@@ -160,8 +160,9 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
 String mType = getMBeanAttributeType(jmxServerConnection, name,
 attribute);
 realValue = convertStringToType(value, mType);
-} else
+} else {
 realValue = value;
+}
 }
 jmxServerConnection.setAttribute(new ObjectName(name), new Attribute(
 attribute, realValue));
@@ -187,8 +188,9 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
 MBeanInfo minfo = jmxServerConnection.getMBeanInfo(oname);
 MBeanAttributeInfo attrs[] = minfo.getAttributes();
 for (int i = 0; mattrType == null && i < attrs.length; i++) {
-if (attribute.equals(attrs[i].getName()))
+if (attribute.equals(attrs[i].getName())) {
 mattrType = attrs[i].getType();
+}
 }
 return mattrType;
 }
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
index d79e471..3ef604d 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -358,11 +358,11 @@ public class JMXAccessorTask extends 
BaseRedirectorHelperTask {
 String host, String port, String username, String pass

[tomcat] branch main updated: Code clean-up. Add braces for clarity.

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 9667d29  Code clean-up. Add braces for clarity.
9667d29 is described below

commit 9667d291b3bcad0ce22d76911f5ca5e538030f68
Author: Mark Thomas 
AuthorDate: Mon May 24 17:24:11 2021 +0100

Code clean-up. Add braces for clarity.
---
 java/jakarta/servlet/UnavailableException.java |  10 +-
 java/jakarta/servlet/jsp/tagext/TagInfo.java   |   9 +-
 .../catalina/ant/jmx/JMXAccessorSetTask.java   |   6 +-
 .../apache/catalina/ant/jmx/JMXAccessorTask.java   |  47 ---
 .../authenticator/NonLoginAuthenticator.java   |   3 +-
 .../catalina/authenticator/SavedRequest.java   |   5 +-
 .../authenticator/SpnegoAuthenticator.java |  40 --
 java/org/apache/catalina/connector/Response.java   |   5 +-
 .../catalina/core/ApplicationDispatcher.java   | 141 -
 .../apache/catalina/filters/RemoteCIDRFilter.java  |   3 +-
 10 files changed, 162 insertions(+), 107 deletions(-)

diff --git a/java/jakarta/servlet/UnavailableException.java 
b/java/jakarta/servlet/UnavailableException.java
index c5af76d..25aa58b 100644
--- a/java/jakarta/servlet/UnavailableException.java
+++ b/java/jakarta/servlet/UnavailableException.java
@@ -80,10 +80,11 @@ public class UnavailableException extends ServletException {
 public UnavailableException(int seconds, Servlet servlet, String msg) {
 super(msg);
 this.servlet = servlet;
-if (seconds <= 0)
+if (seconds <= 0) {
 this.seconds = -1;
-else
+} else {
 this.seconds = seconds;
+}
 permanent = false;
 }
 
@@ -123,10 +124,11 @@ public class UnavailableException extends 
ServletException {
 public UnavailableException(String msg, int seconds) {
 super(msg);
 
-if (seconds <= 0)
+if (seconds <= 0) {
 this.seconds = -1;
-else
+} else {
 this.seconds = seconds;
+}
 servlet = null;
 permanent = false;
 }
diff --git a/java/jakarta/servlet/jsp/tagext/TagInfo.java 
b/java/jakarta/servlet/jsp/tagext/TagInfo.java
index dcc234d..7ac0fc5 100644
--- a/java/jakarta/servlet/jsp/tagext/TagInfo.java
+++ b/java/jakarta/servlet/jsp/tagext/TagInfo.java
@@ -97,8 +97,9 @@ public class TagInfo {
 this.tagVariableInfo = null;
 this.dynamicAttributes = false;
 
-if (tagExtraInfo != null)
+if (tagExtraInfo != null) {
 tagExtraInfo.setTagInfo(this);
+}
 }
 
 /**
@@ -151,8 +152,9 @@ public class TagInfo {
 // Use defaults for unspecified values
 this.dynamicAttributes = false;
 
-if (tagExtraInfo != null)
+if (tagExtraInfo != null) {
 tagExtraInfo.setTagInfo(this);
+}
 }
 
 /**
@@ -207,8 +209,9 @@ public class TagInfo {
 this.tagVariableInfo = tvi;
 this.dynamicAttributes = dynamicAttributes;
 
-if (tagExtraInfo != null)
+if (tagExtraInfo != null) {
 tagExtraInfo.setTagInfo(this);
+}
 }
 
 /**
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
index 74f2201..478b01c 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
@@ -160,8 +160,9 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
 String mType = getMBeanAttributeType(jmxServerConnection, name,
 attribute);
 realValue = convertStringToType(value, mType);
-} else
+} else {
 realValue = value;
+}
 }
 jmxServerConnection.setAttribute(new ObjectName(name), new Attribute(
 attribute, realValue));
@@ -187,8 +188,9 @@ public class JMXAccessorSetTask extends JMXAccessorTask {
 MBeanInfo minfo = jmxServerConnection.getMBeanInfo(oname);
 MBeanAttributeInfo attrs[] = minfo.getAttributes();
 for (int i = 0; mattrType == null && i < attrs.length; i++) {
-if (attribute.equals(attrs[i].getName()))
+if (attribute.equals(attrs[i].getName())) {
 mattrType = attrs[i].getType();
+}
 }
 return mattrType;
 }
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
index d79e471..3ef604d 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -358,11 +358,11 @@ public class JMXAccessorTask extends 
BaseRedirectorHelperTask {
 String host, String port, String username, String password

[tomcat] branch 8.5.x updated: Code cleanup: Add races for clarity.

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 5dd2a02  Code cleanup: Add races for clarity.
5dd2a02 is described below

commit 5dd2a02365ae080a315941a17d7352b0f5cec113
Author: Mark Thomas 
AuthorDate: Mon May 24 16:41:35 2021 +0100

Code cleanup: Add races for clarity.

Small fix to test CI
---
 java/javax/servlet/http/HttpUtils.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/javax/servlet/http/HttpUtils.java 
b/java/javax/servlet/http/HttpUtils.java
index 22b089f..405ab83 100644
--- a/java/javax/servlet/http/HttpUtils.java
+++ b/java/javax/servlet/http/HttpUtils.java
@@ -159,8 +159,9 @@ public class HttpUtils {
 // should a length of 0 be an IllegalArgumentException
 
 // cheap hack to return an empty hash
-if (len <=0)
+if (len <= 0) {
 return new Hashtable<>();
+}
 
 if (in == null) {
 throw new IllegalArgumentException();
@@ -221,8 +222,9 @@ public class HttpUtils {
 } catch (StringIndexOutOfBoundsException e) {
 String rest  = s.substring(i);
 sb.append(rest);
-if (rest.length()==2)
+if (rest.length() == 2) {
 i++;
+}
 }
 
 break;

-
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: Code cleanup: Add races for clarity.

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 36063b7  Code cleanup: Add races for clarity.
36063b7 is described below

commit 36063b7a572d5803cd9534d966c2470961ba7b70
Author: Mark Thomas 
AuthorDate: Mon May 24 16:41:35 2021 +0100

Code cleanup: Add races for clarity.

Small fix to test CI
---
 java/javax/servlet/http/HttpUtils.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/javax/servlet/http/HttpUtils.java 
b/java/javax/servlet/http/HttpUtils.java
index 4356af1..f7a0fac 100644
--- a/java/javax/servlet/http/HttpUtils.java
+++ b/java/javax/servlet/http/HttpUtils.java
@@ -159,8 +159,9 @@ public class HttpUtils {
 // should a length of 0 be an IllegalArgumentException
 
 // cheap hack to return an empty hash
-if (len <=0)
+if (len <= 0) {
 return new Hashtable<>();
+}
 
 if (in == null) {
 throw new IllegalArgumentException();
@@ -221,8 +222,9 @@ public class HttpUtils {
 } catch (StringIndexOutOfBoundsException e) {
 String rest  = s.substring(i);
 sb.append(rest);
-if (rest.length()==2)
+if (rest.length() == 2) {
 i++;
+}
 }
 
 break;

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

[tomcat] branch 10.0.x updated: Code cleanup: Add races for clarity.

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new fe9d721  Code cleanup: Add races for clarity.
fe9d721 is described below

commit fe9d72141e8f181b8b0b5954e6dbb222792830d4
Author: Mark Thomas 
AuthorDate: Mon May 24 16:41:35 2021 +0100

Code cleanup: Add races for clarity.

Small fix to test CI
---
 java/jakarta/servlet/http/HttpUtils.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/jakarta/servlet/http/HttpUtils.java 
b/java/jakarta/servlet/http/HttpUtils.java
index 17acf86..279eb38 100644
--- a/java/jakarta/servlet/http/HttpUtils.java
+++ b/java/jakarta/servlet/http/HttpUtils.java
@@ -159,8 +159,9 @@ public class HttpUtils {
 // should a length of 0 be an IllegalArgumentException
 
 // cheap hack to return an empty hash
-if (len <=0)
+if (len <= 0) {
 return new Hashtable<>();
+}
 
 if (in == null) {
 throw new IllegalArgumentException();
@@ -221,8 +222,9 @@ public class HttpUtils {
 } catch (StringIndexOutOfBoundsException e) {
 String rest  = s.substring(i);
 sb.append(rest);
-if (rest.length()==2)
+if (rest.length() == 2) {
 i++;
+}
 }
 
 break;

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

[tomcat] branch main updated: Code cleanup: Add races for clarity.

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 83ecc67  Code cleanup: Add races for clarity.
83ecc67 is described below

commit 83ecc674f7a2c5b805fa2200afdca5f57af3a1fb
Author: Mark Thomas 
AuthorDate: Mon May 24 16:41:35 2021 +0100

Code cleanup: Add races for clarity.

Small fix to test CI
---
 java/jakarta/servlet/http/HttpUtils.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/jakarta/servlet/http/HttpUtils.java 
b/java/jakarta/servlet/http/HttpUtils.java
index 17acf86..279eb38 100644
--- a/java/jakarta/servlet/http/HttpUtils.java
+++ b/java/jakarta/servlet/http/HttpUtils.java
@@ -159,8 +159,9 @@ public class HttpUtils {
 // should a length of 0 be an IllegalArgumentException
 
 // cheap hack to return an empty hash
-if (len <=0)
+if (len <= 0) {
 return new Hashtable<>();
+}
 
 if (in == null) {
 throw new IllegalArgumentException();
@@ -221,8 +222,9 @@ public class HttpUtils {
 } catch (StringIndexOutOfBoundsException e) {
 String rest  = s.substring(i);
 sb.append(rest);
-if (rest.length()==2)
+if (rest.length() == 2) {
 i++;
+}
 }
 
 break;

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

[tomcat] branch main updated: Implement new generic attribute methods for Cookies

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 83fdd8b  Implement new generic attribute methods for Cookies
83fdd8b is described below

commit 83fdd8b9662e9a58ba83dc99ce64c3f317e2643b
Author: Mark Thomas 
AuthorDate: Mon May 24 16:31:55 2021 +0100

Implement new generic attribute methods for Cookies
---
 java/jakarta/servlet/http/Cookie.java | 140 +-
 java/jakarta/servlet/http/LocalStrings.properties |   3 +
 test/jakarta/servlet/http/TestCookie.java |  46 +++
 webapps/docs/changelog.xml|   5 +
 4 files changed, 164 insertions(+), 30 deletions(-)

diff --git a/java/jakarta/servlet/http/Cookie.java 
b/java/jakarta/servlet/http/Cookie.java
index 084e1e1..8422c65 100644
--- a/java/jakarta/servlet/http/Cookie.java
+++ b/java/jakarta/servlet/http/Cookie.java
@@ -21,9 +21,11 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.text.MessageFormat;
 import java.util.BitSet;
+import java.util.Collections;
 import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
+import java.util.TreeMap;
 
 /**
  * Creates a cookie, a small amount of information sent by a servlet to a Web
@@ -56,6 +58,9 @@ import java.util.ResourceBundle;
  */
 public class Cookie implements Cloneable, Serializable {
 
+private static final String LSTRING_FILE = 
"jakarta.servlet.http.LocalStrings";
+private static final ResourceBundle LSTRINGS = 
ResourceBundle.getBundle(LSTRING_FILE);
+
 private static final CookieNameValidator validation;
 
 static {
@@ -103,22 +108,22 @@ public class Cookie implements Cloneable, Serializable {
 }
 }
 
-private static final long serialVersionUID = 1L;
+private static final long serialVersionUID = 2L;
 
 private final String name;
 private String value;
 
 private int version = 0; // ;Version=1 ... means RFC 2109 style
 
-//
 // Attributes encoded in the header's cookie fields.
-//
-private String comment; // ;Comment=VALUE ... describes cookie's use
-private String domain; // ;Domain=VALUE ... domain that sees cookie
-private int maxAge = -1; // ;Max-Age=VALUE ... cookies auto-expire
-private String path; // ;Path=VALUE ... URLs that see the cookie
-private boolean secure; // ;Secure ... e.g. use SSL
-private boolean httpOnly; // Not in cookie specs, but supported by browsers
+private volatile Map attributes;
+
+private static final String COMMENT = "Comment";
+private static final String DOMAIN = "Domain";
+private static final String MAX_AGE = "Max-Age";
+private static final String PATH = "Path";
+private static final String SECURE = "Secure";
+private static final String HTTP_ONLY = "HttpOnly";
 
 /**
  * Constructs a cookie with a specified name and value.
@@ -153,6 +158,7 @@ public class Cookie implements Cloneable, Serializable {
 this.value = value;
 }
 
+
 /**
  * Specifies a comment that describes a cookie's purpose. The comment is
  * useful if the browser presents the cookie to the user. Comments are not
@@ -164,9 +170,10 @@ public class Cookie implements Cloneable, Serializable {
  * @see #getComment
  */
 public void setComment(String purpose) {
-comment = purpose;
+setAttributeInternal(COMMENT, purpose);
 }
 
+
 /**
  * Returns the comment describing the purpose of this cookie, or
  * null if the cookie has no comment.
@@ -176,9 +183,10 @@ public class Cookie implements Cloneable, Serializable {
  * @see #setComment
  */
 public String getComment() {
-return comment;
+return getAttribute(COMMENT);
 }
 
+
 /**
  * Specifies the domain within which this cookie should be presented.
  * 
@@ -194,9 +202,15 @@ public class Cookie implements Cloneable, Serializable {
  * @see #getDomain
  */
 public void setDomain(String pattern) {
-domain = pattern.toLowerCase(Locale.ENGLISH); // IE allegedly needs 
this
+if (pattern == null) {
+setAttributeInternal(DOMAIN, null);
+} else {
+// IE requires the domain to be lower case (unconfirmed)
+setAttributeInternal(DOMAIN, pattern.toLowerCase(Locale.ENGLISH));
+}
 }
 
+
 /**
  * Returns the domain name set for this cookie. The form of the domain name
  * is set by RFC 2109.
@@ -205,9 +219,10 @@ public class Cookie implements Cloneable, Serializable {
  * @see #setDomain
  */
 public String getDomain() {
-return domain;
+return getAttribute(DOMAIN);
 }
 
+
 /**
  * Sets the maximum age of the cookie in seconds.
  * 
@@ -226,9 +241,10 @@ public class Cookie implements Cl

[Bug 65317] PerMessageDeflate getMoreData doesn't return correct TransformationResult if the payload is inflated to exact 8192 bytes

2021-05-24 Thread bugzilla

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

--- Comment #5 from Saksham Verma  ---
Thanks a lot for taking quick action on this.

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

[tomcat] 02/02: Sync Tomcat 10.1.x with latest Servlet 5.1 API. Implementation is TODO

2021-05-24 Thread markt

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

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

commit ee923b135e85cd8fcf9314d7a3a78a7ad8afede3
Author: Mark Thomas 
AuthorDate: Mon May 24 12:40:42 2021 +0100

Sync Tomcat 10.1.x with latest Servlet 5.1 API. Implementation is TODO
---
 java/jakarta/servlet/http/Cookie.java | 43 +++
 1 file changed, 43 insertions(+)

diff --git a/java/jakarta/servlet/http/Cookie.java 
b/java/jakarta/servlet/http/Cookie.java
index 48a621b..084e1e1 100644
--- a/java/jakarta/servlet/http/Cookie.java
+++ b/java/jakarta/servlet/http/Cookie.java
@@ -22,6 +22,7 @@ import java.security.PrivilegedAction;
 import java.text.MessageFormat;
 import java.util.BitSet;
 import java.util.Locale;
+import java.util.Map;
 import java.util.ResourceBundle;
 
 /**
@@ -409,6 +410,48 @@ public class Cookie implements Cloneable, Serializable {
 public boolean isHttpOnly() {
 return httpOnly;
 }
+
+/**
+ * Sets the value for the given cookie attribute. When a value is set via
+ * this method, the value returned by the attribute specific getter (if 
any)
+ * must be consistent with the value set via this method.
+ *
+ * @param name  Name of attribute to set
+ * @param value Value of attribute
+ *
+ * @throws IllegalArgumentException If the attribute name is null, contains
+ * any characters not permitted foe use in Cookie names or matches 
a
+ * name reserved by the cookie specification.
+ *
+ * @throws NumberFormatException If the attribute is known to be numerical
+ * but the provided value cannot be parsed to a number.
+ *
+ * @since Servlet 5.1
+ */
+public void setAttribute(String name, String value) {
+// TODO - Servlet 5.1
+}
+
+/**
+ * Obtain the value for a given attribute. Values returned from this method
+ * must be consistent with the values set and returned by the attribute
+ * specific getters and setters in this class.
+ *
+ * @param name  Name of attribute to return
+ *
+ * @return Value of specified attribute
+ *
+ * @since Servlet 5.1
+ */
+public String getAttribute(String name) {
+// TODO - Servlet 5.1
+return null;
+}
+
+public Map getAttributes() {
+// TODO - Servlet 5.1
+return null;
+}
 }
 
 

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

[tomcat] 01/02: Add Servlet update to changelog

2021-05-24 Thread markt

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

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

commit 029d3162f686f0e8da492dec2f364af9c76dd0c1
Author: Mark Thomas 
AuthorDate: Mon May 24 12:27:14 2021 +0100

Add Servlet update to changelog
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0a7fa14..2b2a716 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -115,6 +115,10 @@
   
   
 
+  
+Incremented supported Servlet version to 5.1 to align with the current
+development branch of the Servlet specification. (markt)
+  
   
 65301: RemoteIpValve will now avoid getting
 the local host name when it is not needed. (remm)

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

[tomcat] branch main updated (dab8bc1 -> ee923b1)

2021-05-24 Thread markt

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


from dab8bc1  Update version info
 new 029d316  Add Servlet update to changelog
 new ee923b1  Sync Tomcat 10.1.x with latest Servlet 5.1 API. 
Implementation is TODO

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/servlet/http/Cookie.java | 43 +++
 webapps/docs/changelog.xml|  4 
 2 files changed, 47 insertions(+)

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

Re: [tomcat] branch main updated: Correction. Currently, next iteration of the Servlet spec is 5.1

2021-05-24 Thread Mark Thomas


On 24/05/2021 12:36, Rémy Maucherat wrote:

On Mon, May 24, 2021 at 1:26 PM  wrote:


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 502b6fe  Correction. Currently, next iteration of the Servlet
spec is 5.1
502b6fe is described below

commit 502b6fe021fbc85164401cf7edd81542a62b9260
Author: Mark Thomas 
AuthorDate: Mon May 24 12:25:14 2021 +0100

 Correction. Currently, next iteration of the Servlet spec is 5.1



Seems 6.0 to me here: https://projects.eclipse.org/projects/ee4j.servlet
Right ?

But I don't see any actual content or changes.


I filled that in and it was a guess. The current API repo is using 5.1 
and a recent API change had @since 5.1 so I am going with that for now.


Mark




Rémy



---
  BUILDING.txt  |  2 +-
  RELEASE-NOTES |  2 +-
  build.xml |  2 +-
  java/jakarta/el/ImportHandler.java|  4 ++--
  java/jakarta/servlet/ServletContext.java  | 12 ++--
  java/org/apache/catalina/connector/CoyoteAdapter.java |  2 +-
  webapps/docs/class-loader-howto.xml   |  2 +-
  webapps/docs/index.xml|  2 +-
  webapps/docs/project.xml  |  2 +-
  9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 9bcd4b8..9c6d883 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -20,7 +20,7 @@
  

  This project contains the source code for Tomcat @VERSION_MAJOR_MINOR@,
a container that
-implements the Jakarta Servlet 6.0, JSP 3.0, EL 4.0, WebSocket 2.0 and
+implements the Jakarta Servlet 5.1, JSP 3.0, EL 4.0, WebSocket 2.0 and
  Authentication 2.0 specifications from the Jakarta EE project at Eclipse
  .

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1a02fb7..b90c48b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -78,7 +78,7 @@ for use by web applications (by placing them in "lib"):
  * jasper.jar (Jasper 2 Compiler and Runtime)
  * jasper-el.jar (Jasper 2 EL implementation)
  * jsp-api.jar (JSP 3.0 API)
-* servlet-api.jar (Servlet 6.0 API)
+* servlet-api.jar (Servlet 5.1 API)
  * tomcat-api.jar (Interfaces shared by Catalina and Jasper)
  * tomcat-coyote.jar (Tomcat connectors and utility classes)
  * tomcat-dbcp.jar (package renamed database connection pool based on
Commons DBCP 2)
diff --git a/build.xml b/build.xml
index 48f726b..f244afa 100644
--- a/build.xml
+++ b/build.xml
@@ -52,7 +52,7 @@



-  
+  



diff --git a/java/jakarta/el/ImportHandler.java
b/java/jakarta/el/ImportHandler.java
index 018f53d..74858d2 100644
--- a/java/jakarta/el/ImportHandler.java
+++ b/java/jakarta/el/ImportHandler.java
@@ -38,7 +38,7 @@ public class ImportHandler {
  private static final Map> standardPackages = new
HashMap<>();

  static {
-// Servlet 6.0
+// Servlet 5.1
  Set servletClassNames = new HashSet<>();
  // Interfaces
  servletClassNames.add("AsyncContext");
@@ -91,7 +91,7 @@ public class ImportHandler {
  servletClassNames.add("UnavailableException");
  standardPackages.put("jakarta.servlet", servletClassNames);

-// Servlet 6.0
+// Servlet 5.1
  Set servletHttpClassNames = new HashSet<>();
  // Interfaces
  servletHttpClassNames.add("HttpServletMapping");
diff --git a/java/jakarta/servlet/ServletContext.java
b/java/jakarta/servlet/ServletContext.java
index 3c8894c..b66891a 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -92,19 +92,19 @@ public interface ServletContext {

  /**
   * Returns the major version of the Java Servlet API that this servlet
- * container supports. All implementations that comply with Version
6.0 must
- * have this method return the integer 6.
+ * container supports. All implementations that comply with Version
5.1 must
+ * have this method return the integer 5.
   *
- * @return 6
+ * @return 5
   */
  public int getMajorVersion();

  /**
   * Returns the minor version of the Servlet API that this servlet
container
- * supports. All implementations that comply with Version 6.0 must
have this
- * method return the integer 0.
+ * supports. All implementations that comply with Version 5.1 must
have this
+ * method return the integer 1.
   *
- * @return 0
+ * @return 1
   */
  public int getMinorVersion();

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 3367425..818b881 100644
--- a/java/

Re: [tomcat] branch main updated: Correction. Currently, next iteration of the Servlet spec is 5.1

2021-05-24 Thread Rémy Maucherat

On Mon, May 24, 2021 at 1:26 PM  wrote:

> 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 502b6fe  Correction. Currently, next iteration of the Servlet
> spec is 5.1
> 502b6fe is described below
>
> commit 502b6fe021fbc85164401cf7edd81542a62b9260
> Author: Mark Thomas 
> AuthorDate: Mon May 24 12:25:14 2021 +0100
>
> Correction. Currently, next iteration of the Servlet spec is 5.1
>

Seems 6.0 to me here: https://projects.eclipse.org/projects/ee4j.servlet
Right ?

But I don't see any actual content or changes.

Rémy


> ---
>  BUILDING.txt  |  2 +-
>  RELEASE-NOTES |  2 +-
>  build.xml |  2 +-
>  java/jakarta/el/ImportHandler.java|  4 ++--
>  java/jakarta/servlet/ServletContext.java  | 12 ++--
>  java/org/apache/catalina/connector/CoyoteAdapter.java |  2 +-
>  webapps/docs/class-loader-howto.xml   |  2 +-
>  webapps/docs/index.xml|  2 +-
>  webapps/docs/project.xml  |  2 +-
>  9 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/BUILDING.txt b/BUILDING.txt
> index 9bcd4b8..9c6d883 100644
> --- a/BUILDING.txt
> +++ b/BUILDING.txt
> @@ -20,7 +20,7 @@
>  
>
>  This project contains the source code for Tomcat @VERSION_MAJOR_MINOR@,
> a container that
> -implements the Jakarta Servlet 6.0, JSP 3.0, EL 4.0, WebSocket 2.0 and
> +implements the Jakarta Servlet 5.1, JSP 3.0, EL 4.0, WebSocket 2.0 and
>  Authentication 2.0 specifications from the Jakarta EE project at Eclipse
>  .
>
> diff --git a/RELEASE-NOTES b/RELEASE-NOTES
> index 1a02fb7..b90c48b 100644
> --- a/RELEASE-NOTES
> +++ b/RELEASE-NOTES
> @@ -78,7 +78,7 @@ for use by web applications (by placing them in "lib"):
>  * jasper.jar (Jasper 2 Compiler and Runtime)
>  * jasper-el.jar (Jasper 2 EL implementation)
>  * jsp-api.jar (JSP 3.0 API)
> -* servlet-api.jar (Servlet 6.0 API)
> +* servlet-api.jar (Servlet 5.1 API)
>  * tomcat-api.jar (Interfaces shared by Catalina and Jasper)
>  * tomcat-coyote.jar (Tomcat connectors and utility classes)
>  * tomcat-dbcp.jar (package renamed database connection pool based on
> Commons DBCP 2)
> diff --git a/build.xml b/build.xml
> index 48f726b..f244afa 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -52,7 +52,7 @@
>
>
>
> -  
> +  
>
>
>
> diff --git a/java/jakarta/el/ImportHandler.java
> b/java/jakarta/el/ImportHandler.java
> index 018f53d..74858d2 100644
> --- a/java/jakarta/el/ImportHandler.java
> +++ b/java/jakarta/el/ImportHandler.java
> @@ -38,7 +38,7 @@ public class ImportHandler {
>  private static final Map> standardPackages = new
> HashMap<>();
>
>  static {
> -// Servlet 6.0
> +// Servlet 5.1
>  Set servletClassNames = new HashSet<>();
>  // Interfaces
>  servletClassNames.add("AsyncContext");
> @@ -91,7 +91,7 @@ public class ImportHandler {
>  servletClassNames.add("UnavailableException");
>  standardPackages.put("jakarta.servlet", servletClassNames);
>
> -// Servlet 6.0
> +// Servlet 5.1
>  Set servletHttpClassNames = new HashSet<>();
>  // Interfaces
>  servletHttpClassNames.add("HttpServletMapping");
> diff --git a/java/jakarta/servlet/ServletContext.java
> b/java/jakarta/servlet/ServletContext.java
> index 3c8894c..b66891a 100644
> --- a/java/jakarta/servlet/ServletContext.java
> +++ b/java/jakarta/servlet/ServletContext.java
> @@ -92,19 +92,19 @@ public interface ServletContext {
>
>  /**
>   * Returns the major version of the Java Servlet API that this servlet
> - * container supports. All implementations that comply with Version
> 6.0 must
> - * have this method return the integer 6.
> + * container supports. All implementations that comply with Version
> 5.1 must
> + * have this method return the integer 5.
>   *
> - * @return 6
> + * @return 5
>   */
>  public int getMajorVersion();
>
>  /**
>   * Returns the minor version of the Servlet API that this servlet
> container
> - * supports. All implementations that comply with Version 6.0 must
> have this
> - * method return the integer 0.
> + * supports. All implementations that comply with Version 5.1 must
> have this
> + * method return the integer 1.
>   *
> - * @return 0
> + * @return 1
>   */
>  public int getMinorVersion();
>
> diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
> b/java/org/apache/catalina/connector/CoyoteAdapter.java
> index 3367425..818b881 100644
> --- a/jav

[tomcat] branch main updated: Update version info

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new dab8bc1  Update version info
dab8bc1 is described below

commit dab8bc11b96c6ba9021e73edce402fa6c97c34e3
Author: Mark Thomas 
AuthorDate: Mon May 24 12:25:59 2021 +0100

Update version info
---
 java/org/apache/catalina/core/Constants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/core/Constants.java 
b/java/org/apache/catalina/core/Constants.java
index 6d6f80e..89affe4 100644
--- a/java/org/apache/catalina/core/Constants.java
+++ b/java/org/apache/catalina/core/Constants.java
@@ -20,7 +20,7 @@ public class Constants {
 
 public static final String Package = "org.apache.catalina.core";
 public static final int MAJOR_VERSION = 5;
-public static final int MINOR_VERSION = 0;
+public static final int MINOR_VERSION = 1;
 
 public static final String JSP_SERVLET_CLASS = 
"org.apache.jasper.servlet.JspServlet";
 }

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

[tomcat] branch main updated: Correction. Currently, next iteration of the Servlet spec is 5.1

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 502b6fe  Correction. Currently, next iteration of the Servlet spec is 
5.1
502b6fe is described below

commit 502b6fe021fbc85164401cf7edd81542a62b9260
Author: Mark Thomas 
AuthorDate: Mon May 24 12:25:14 2021 +0100

Correction. Currently, next iteration of the Servlet spec is 5.1
---
 BUILDING.txt  |  2 +-
 RELEASE-NOTES |  2 +-
 build.xml |  2 +-
 java/jakarta/el/ImportHandler.java|  4 ++--
 java/jakarta/servlet/ServletContext.java  | 12 ++--
 java/org/apache/catalina/connector/CoyoteAdapter.java |  2 +-
 webapps/docs/class-loader-howto.xml   |  2 +-
 webapps/docs/index.xml|  2 +-
 webapps/docs/project.xml  |  2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 9bcd4b8..9c6d883 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -20,7 +20,7 @@
 
 
 This project contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
-implements the Jakarta Servlet 6.0, JSP 3.0, EL 4.0, WebSocket 2.0 and
+implements the Jakarta Servlet 5.1, JSP 3.0, EL 4.0, WebSocket 2.0 and
 Authentication 2.0 specifications from the Jakarta EE project at Eclipse
 .
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1a02fb7..b90c48b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -78,7 +78,7 @@ for use by web applications (by placing them in "lib"):
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)
 * jsp-api.jar (JSP 3.0 API)
-* servlet-api.jar (Servlet 6.0 API)
+* servlet-api.jar (Servlet 5.1 API)
 * tomcat-api.jar (Interfaces shared by Catalina and Jasper)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)
 * tomcat-dbcp.jar (package renamed database connection pool based on Commons 
DBCP 2)
diff --git a/build.xml b/build.xml
index 48f726b..f244afa 100644
--- a/build.xml
+++ b/build.xml
@@ -52,7 +52,7 @@
   
 
   
-  
+  
   
   
   
diff --git a/java/jakarta/el/ImportHandler.java 
b/java/jakarta/el/ImportHandler.java
index 018f53d..74858d2 100644
--- a/java/jakarta/el/ImportHandler.java
+++ b/java/jakarta/el/ImportHandler.java
@@ -38,7 +38,7 @@ public class ImportHandler {
 private static final Map> standardPackages = new 
HashMap<>();
 
 static {
-// Servlet 6.0
+// Servlet 5.1
 Set servletClassNames = new HashSet<>();
 // Interfaces
 servletClassNames.add("AsyncContext");
@@ -91,7 +91,7 @@ public class ImportHandler {
 servletClassNames.add("UnavailableException");
 standardPackages.put("jakarta.servlet", servletClassNames);
 
-// Servlet 6.0
+// Servlet 5.1
 Set servletHttpClassNames = new HashSet<>();
 // Interfaces
 servletHttpClassNames.add("HttpServletMapping");
diff --git a/java/jakarta/servlet/ServletContext.java 
b/java/jakarta/servlet/ServletContext.java
index 3c8894c..b66891a 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -92,19 +92,19 @@ public interface ServletContext {
 
 /**
  * Returns the major version of the Java Servlet API that this servlet
- * container supports. All implementations that comply with Version 6.0 
must
- * have this method return the integer 6.
+ * container supports. All implementations that comply with Version 5.1 
must
+ * have this method return the integer 5.
  *
- * @return 6
+ * @return 5
  */
 public int getMajorVersion();
 
 /**
  * Returns the minor version of the Servlet API that this servlet container
- * supports. All implementations that comply with Version 6.0 must have 
this
- * method return the integer 0.
+ * supports. All implementations that comply with Version 5.1 must have 
this
+ * method return the integer 1.
  *
- * @return 0
+ * @return 1
  */
 public int getMinorVersion();
 
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 3367425..818b881 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -67,7 +67,7 @@ public class CoyoteAdapter implements Adapter {
 
 // -- Constants
 
-private static final String POWERED_BY = "Servlet/6.0 JSP/3.0 " +
+private static final String POWERED_BY = "Servlet/5.1 JSP/3.0 " +

[tomcat] branch main updated: Increment Servlet version to 6.0

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 7317f17  Increment Servlet version to 6.0
7317f17 is described below

commit 7317f17dd5139da65c3cb9e2cbe8820168deda38
Author: Mark Thomas 
AuthorDate: Mon May 24 12:17:47 2021 +0100

Increment Servlet version to 6.0

There is no new schema (yet) so they stay at 5.0. There are API changes
so updating to 6.0 so they can be implemented in 10.1.x.
---
 BUILDING.txt  | 2 +-
 RELEASE-NOTES | 2 +-
 build.xml | 2 +-
 java/jakarta/el/ImportHandler.java| 4 ++--
 java/jakarta/servlet/ServletContext.java  | 8 
 java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +-
 webapps/docs/class-loader-howto.xml   | 2 +-
 webapps/docs/index.xml| 2 +-
 webapps/docs/project.xml  | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index ba16b72..9bcd4b8 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -20,7 +20,7 @@
 
 
 This project contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
-implements the Jakarta Servlet 5.0, JSP 3.0, EL 4.0, WebSocket 2.0 and
+implements the Jakarta Servlet 6.0, JSP 3.0, EL 4.0, WebSocket 2.0 and
 Authentication 2.0 specifications from the Jakarta EE project at Eclipse
 .
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fbcb6e8..1a02fb7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -78,7 +78,7 @@ for use by web applications (by placing them in "lib"):
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)
 * jsp-api.jar (JSP 3.0 API)
-* servlet-api.jar (Servlet 5.0 API)
+* servlet-api.jar (Servlet 6.0 API)
 * tomcat-api.jar (Interfaces shared by Catalina and Jasper)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)
 * tomcat-dbcp.jar (package renamed database connection pool based on Commons 
DBCP 2)
diff --git a/build.xml b/build.xml
index e7fcaad..48f726b 100644
--- a/build.xml
+++ b/build.xml
@@ -52,7 +52,7 @@
   
 
   
-  
+  
   
   
   
diff --git a/java/jakarta/el/ImportHandler.java 
b/java/jakarta/el/ImportHandler.java
index c4d62d2..018f53d 100644
--- a/java/jakarta/el/ImportHandler.java
+++ b/java/jakarta/el/ImportHandler.java
@@ -38,7 +38,7 @@ public class ImportHandler {
 private static final Map> standardPackages = new 
HashMap<>();
 
 static {
-// Servlet 5.0
+// Servlet 6.0
 Set servletClassNames = new HashSet<>();
 // Interfaces
 servletClassNames.add("AsyncContext");
@@ -91,7 +91,7 @@ public class ImportHandler {
 servletClassNames.add("UnavailableException");
 standardPackages.put("jakarta.servlet", servletClassNames);
 
-// Servlet 5.0
+// Servlet 6.0
 Set servletHttpClassNames = new HashSet<>();
 // Interfaces
 servletHttpClassNames.add("HttpServletMapping");
diff --git a/java/jakarta/servlet/ServletContext.java 
b/java/jakarta/servlet/ServletContext.java
index 3a7e2b1..3c8894c 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -92,16 +92,16 @@ public interface ServletContext {
 
 /**
  * Returns the major version of the Java Servlet API that this servlet
- * container supports. All implementations that comply with Version 5.0 
must
- * have this method return the integer 5.
+ * container supports. All implementations that comply with Version 6.0 
must
+ * have this method return the integer 6.
  *
- * @return 5
+ * @return 6
  */
 public int getMajorVersion();
 
 /**
  * Returns the minor version of the Servlet API that this servlet container
- * supports. All implementations that comply with Version 5.0 must have 
this
+ * supports. All implementations that comply with Version 6.0 must have 
this
  * method return the integer 0.
  *
  * @return 0
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index ea3dbe4..3367425 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -67,7 +67,7 @@ public class CoyoteAdapter implements Adapter {
 
 // -- Constants
 
-private static final String POWERED_BY = "Servlet/5.0 JSP/3.0 " +
+private static final String POWERED_BY = "Servlet/6.0 JSP/3.0 " +
 "(" + ServerInfo.getServerInfo() +

[tomcat] branch 8.5.x updated: Code clean-up: Add braces for clarity

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 010fa29  Code clean-up: Add braces for clarity
010fa29 is described below

commit 010fa29d1840d13fd926c5e102ce6742af45d71f
Author: Mark Thomas 
AuthorDate: Mon May 24 11:53:59 2021 +0100

Code clean-up: Add braces for clarity

Trivial commit to trigger a CI build to test CI changes
---
 java/javax/servlet/http/HttpServlet.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/javax/servlet/http/HttpServlet.java 
b/java/javax/servlet/http/HttpServlet.java
index 57617e7..7cc00bc 100644
--- a/java/javax/servlet/http/HttpServlet.java
+++ b/java/javax/servlet/http/HttpServlet.java
@@ -688,10 +688,12 @@ public abstract class HttpServlet extends GenericServlet {
  */
 private void maybeSetLastModified(HttpServletResponse resp,
   long lastModified) {
-if (resp.containsHeader(HEADER_LASTMOD))
+if (resp.containsHeader(HEADER_LASTMOD)) {
 return;
-if (lastModified >= 0)
+}
+if (lastModified >= 0) {
 resp.setDateHeader(HEADER_LASTMOD, lastModified);
+}
 }
 
 

-
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: Code clean-up: Add braces for clarity

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 9cae8ae  Code clean-up: Add braces for clarity
9cae8ae is described below

commit 9cae8aef63a78d93fc93aacd904e71f82bb1b52f
Author: Mark Thomas 
AuthorDate: Mon May 24 11:53:59 2021 +0100

Code clean-up: Add braces for clarity

Trivial commit to trigger a CI build to test CI changes
---
 java/javax/servlet/http/HttpServlet.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/javax/servlet/http/HttpServlet.java 
b/java/javax/servlet/http/HttpServlet.java
index 57617e7..7cc00bc 100644
--- a/java/javax/servlet/http/HttpServlet.java
+++ b/java/javax/servlet/http/HttpServlet.java
@@ -688,10 +688,12 @@ public abstract class HttpServlet extends GenericServlet {
  */
 private void maybeSetLastModified(HttpServletResponse resp,
   long lastModified) {
-if (resp.containsHeader(HEADER_LASTMOD))
+if (resp.containsHeader(HEADER_LASTMOD)) {
 return;
-if (lastModified >= 0)
+}
+if (lastModified >= 0) {
 resp.setDateHeader(HEADER_LASTMOD, lastModified);
+}
 }
 
 

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

[tomcat] branch 10.0.x updated: Code clean-up: Add braces for clarity

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new f4adae2  Code clean-up: Add braces for clarity
f4adae2 is described below

commit f4adae24c82a69ff57b8079bb35f0c117304513d
Author: Mark Thomas 
AuthorDate: Mon May 24 11:53:59 2021 +0100

Code clean-up: Add braces for clarity

Trivial commit to trigger a CI build to test CI changes
---
 java/jakarta/servlet/http/HttpServlet.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/jakarta/servlet/http/HttpServlet.java 
b/java/jakarta/servlet/http/HttpServlet.java
index ba98853..15ad35c 100644
--- a/java/jakarta/servlet/http/HttpServlet.java
+++ b/java/jakarta/servlet/http/HttpServlet.java
@@ -725,10 +725,12 @@ public abstract class HttpServlet extends GenericServlet {
  */
 private void maybeSetLastModified(HttpServletResponse resp,
   long lastModified) {
-if (resp.containsHeader(HEADER_LASTMOD))
+if (resp.containsHeader(HEADER_LASTMOD)) {
 return;
-if (lastModified >= 0)
+}
+if (lastModified >= 0) {
 resp.setDateHeader(HEADER_LASTMOD, lastModified);
+}
 }
 
 

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

[tomcat] branch main updated: Code clean-up: Add braces for clarity

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 902912d  Code clean-up: Add braces for clarity
902912d is described below

commit 902912d497fd03bd6a6015e9bfa80c55046cb783
Author: Mark Thomas 
AuthorDate: Mon May 24 11:53:59 2021 +0100

Code clean-up: Add braces for clarity

Trivial commit to trigger a CI build to test CI changes
---
 java/jakarta/servlet/http/HttpServlet.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/jakarta/servlet/http/HttpServlet.java 
b/java/jakarta/servlet/http/HttpServlet.java
index ba98853..15ad35c 100644
--- a/java/jakarta/servlet/http/HttpServlet.java
+++ b/java/jakarta/servlet/http/HttpServlet.java
@@ -725,10 +725,12 @@ public abstract class HttpServlet extends GenericServlet {
  */
 private void maybeSetLastModified(HttpServletResponse resp,
   long lastModified) {
-if (resp.containsHeader(HEADER_LASTMOD))
+if (resp.containsHeader(HEADER_LASTMOD)) {
 return;
-if (lastModified >= 0)
+}
+if (lastModified >= 0) {
 resp.setDateHeader(HEADER_LASTMOD, lastModified);
+}
 }
 
 

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

[tomcat] branch 8.5.x updated: Code clean-up: Add braces for clarity

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new d579310  Code clean-up: Add braces for clarity
d579310 is described below

commit d579310e2d08d957454ffdda5b727a23f70d54bb
Author: Mark Thomas 
AuthorDate: Mon May 24 11:08:15 2021 +0100

Code clean-up: Add braces for clarity

Trivial commit to trigger a CI build to test CI changes
---
 java/javax/el/CompositeELResolver.java | 3 ++-
 java/javax/el/StandardELContext.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/javax/el/CompositeELResolver.java 
b/java/javax/el/CompositeELResolver.java
index f28f528..1fc198a 100644
--- a/java/javax/el/CompositeELResolver.java
+++ b/java/javax/el/CompositeELResolver.java
@@ -198,8 +198,9 @@ public class CompositeELResolver extends ELResolver {
 
 @Override
 public boolean hasNext() {
-if (this.next != null)
+if (this.next != null) {
 return true;
+}
 if (this.itr != null) {
 while (this.next == null && itr.hasNext()) {
 this.next = itr.next();
diff --git a/java/javax/el/StandardELContext.java 
b/java/javax/el/StandardELContext.java
index d313483..dff329a 100644
--- a/java/javax/el/StandardELContext.java
+++ b/java/javax/el/StandardELContext.java
@@ -133,8 +133,9 @@ public class StandardELContext extends ELContext {
 @Override
 public ValueExpression setVariable(String variable,
 ValueExpression expression) {
-if (vars == null)
+if (vars == null) {
 vars = new HashMap<>();
+}
 if (expression == null) {
 return vars.remove(variable);
 } else {

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

[tomcat] branch 9.0.x updated: Code clean-up: Add braces for clarity

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new f6ada28  Code clean-up: Add braces for clarity
f6ada28 is described below

commit f6ada28ec4ea9394c53a484c378fc34608502a38
Author: Mark Thomas 
AuthorDate: Mon May 24 11:08:15 2021 +0100

Code clean-up: Add braces for clarity

Trivial commit to trigger a CI build to test CI changes
---
 java/javax/el/CompositeELResolver.java | 3 ++-
 java/javax/el/StandardELContext.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/javax/el/CompositeELResolver.java 
b/java/javax/el/CompositeELResolver.java
index f28f528..1fc198a 100644
--- a/java/javax/el/CompositeELResolver.java
+++ b/java/javax/el/CompositeELResolver.java
@@ -198,8 +198,9 @@ public class CompositeELResolver extends ELResolver {
 
 @Override
 public boolean hasNext() {
-if (this.next != null)
+if (this.next != null) {
 return true;
+}
 if (this.itr != null) {
 while (this.next == null && itr.hasNext()) {
 this.next = itr.next();
diff --git a/java/javax/el/StandardELContext.java 
b/java/javax/el/StandardELContext.java
index d313483..dff329a 100644
--- a/java/javax/el/StandardELContext.java
+++ b/java/javax/el/StandardELContext.java
@@ -133,8 +133,9 @@ public class StandardELContext extends ELContext {
 @Override
 public ValueExpression setVariable(String variable,
 ValueExpression expression) {
-if (vars == null)
+if (vars == null) {
 vars = new HashMap<>();
+}
 if (expression == null) {
 return vars.remove(variable);
 } else {

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

[tomcat] branch 10.0.x updated: Code clean-up: Add braces for clarity

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new fff2cc3  Code clean-up: Add braces for clarity
fff2cc3 is described below

commit fff2cc3661a4729f19b9a184f2b1bbbe445e8667
Author: Mark Thomas 
AuthorDate: Mon May 24 11:08:15 2021 +0100

Code clean-up: Add braces for clarity

Trivial commit to trigger a CI build to test CI changes
---
 java/jakarta/el/CompositeELResolver.java | 3 ++-
 java/jakarta/el/StandardELContext.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/jakarta/el/CompositeELResolver.java 
b/java/jakarta/el/CompositeELResolver.java
index e0123f3..d144f2c 100644
--- a/java/jakarta/el/CompositeELResolver.java
+++ b/java/jakarta/el/CompositeELResolver.java
@@ -198,8 +198,9 @@ public class CompositeELResolver extends ELResolver {
 
 @Override
 public boolean hasNext() {
-if (this.next != null)
+if (this.next != null) {
 return true;
+}
 if (this.itr != null) {
 while (this.next == null && itr.hasNext()) {
 this.next = itr.next();
diff --git a/java/jakarta/el/StandardELContext.java 
b/java/jakarta/el/StandardELContext.java
index 59bffbf..669a072 100644
--- a/java/jakarta/el/StandardELContext.java
+++ b/java/jakarta/el/StandardELContext.java
@@ -131,8 +131,9 @@ public class StandardELContext extends ELContext {
 @Override
 public ValueExpression setVariable(String variable,
 ValueExpression expression) {
-if (vars == null)
+if (vars == null) {
 vars = new HashMap<>();
+}
 if (expression == null) {
 return vars.remove(variable);
 } else {

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

[tomcat] branch main updated: Code clean-up: Add braces for clarity

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new c2ad609  Code clean-up: Add braces for clarity
c2ad609 is described below

commit c2ad60927672c0c2080bdfbf8274b152fa630312
Author: Mark Thomas 
AuthorDate: Mon May 24 11:08:15 2021 +0100

Code clean-up: Add braces for clarity

Trivial commit to trigger a CI build to test CI changes
---
 java/jakarta/el/CompositeELResolver.java | 3 ++-
 java/jakarta/el/StandardELContext.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/jakarta/el/CompositeELResolver.java 
b/java/jakarta/el/CompositeELResolver.java
index e0123f3..d144f2c 100644
--- a/java/jakarta/el/CompositeELResolver.java
+++ b/java/jakarta/el/CompositeELResolver.java
@@ -198,8 +198,9 @@ public class CompositeELResolver extends ELResolver {
 
 @Override
 public boolean hasNext() {
-if (this.next != null)
+if (this.next != null) {
 return true;
+}
 if (this.itr != null) {
 while (this.next == null && itr.hasNext()) {
 this.next = itr.next();
diff --git a/java/jakarta/el/StandardELContext.java 
b/java/jakarta/el/StandardELContext.java
index 59bffbf..669a072 100644
--- a/java/jakarta/el/StandardELContext.java
+++ b/java/jakarta/el/StandardELContext.java
@@ -131,8 +131,9 @@ public class StandardELContext extends ELContext {
 @Override
 public ValueExpression setVariable(String variable,
 ValueExpression expression) {
-if (vars == null)
+if (vars == null) {
 vars = new HashMap<>();
+}
 if (expression == null) {
 return vars.remove(variable);
 } else {

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

[tomcat] branch 8.5.x updated: Remove testing support for old OpenSSL versions

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new e8a741e  Remove testing support for old OpenSSL versions
e8a741e is described below

commit e8a741efa8ff83c16c9128fc66c3a1fd24ad1ad0
Author: Mark Thomas 
AuthorDate: Mon May 24 10:25:53 2021 +0100

Remove testing support for old OpenSSL versions

Also update note son Gump testing
---
 .../util/net/openssl/ciphers/TesterOpenSSL.java| 274 ++---
 1 file changed, 74 insertions(+), 200 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java 
b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
index a5ce647..07edc4b 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -50,22 +50,14 @@ public class TesterOpenSSL {
 versionString = "";
 }
 if (versionString.startsWith("OpenSSL 3.0.0")) {
-// Note: Gump currently tests 9.0.x with OpenSSL master
-//   (a.k.a 3.0.0-dev)
+// Note: Gump currently tests 10.x with OpenSSL 3.0.x
 VERSION = 3;
 } else if (versionString.startsWith("OpenSSL 1.1.1")) {
 // LTS
 // Supported until at least 2023-09-11
+// Note: Gump currently tests 9.x and earlier with OpenSSL 1.1.1[x]
 VERSION = 10101;
-} else if (versionString.startsWith("OpenSSL 1.1.0")) {
-// Support ends 2019-09-11
-VERSION = 10100;
-} else if (versionString.startsWith("OpenSSL 1.0.2")) {
-// LTS
-// Support ends 2019-12-31
-// Note: Gump current tests 8.5.x with OpenSSL 1.0.2
-VERSION = 10002;
-// Note: Release branches 1.0.1 and earlier are no longer supported by
+// Note: Release branches 1.1.0 and earlier are no longer supported by
 //   the OpenSSL team so these tests don't support them either.
 } else {
 VERSION = -1;
@@ -107,6 +99,76 @@ public class TesterOpenSSL {
 unimplemented.add(Cipher.SSL2_RC4_128_EXPORT40_WITH_MD5);
 unimplemented.add(Cipher.SSL2_IDEA_128_CBC_WITH_MD5);
 unimplemented.add(Cipher.SSL2_DES_192_EDE3_CBC_WITH_MD5);
+// These were removed in 1.1.0 so won't be available from that
+// version onwards.
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_SEED_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_SEED_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_NULL_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_NULL_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256);
+unimplemented.a

[tomcat] branch 9.0.x updated: Remove testing support for old OpenSSL versions

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 7e36c47  Remove testing support for old OpenSSL versions
7e36c47 is described below

commit 7e36c4756289e7b4ef60d930da7b6876e2a46317
Author: Mark Thomas 
AuthorDate: Mon May 24 10:25:53 2021 +0100

Remove testing support for old OpenSSL versions

Also update note son Gump testing
---
 .../util/net/openssl/ciphers/TesterOpenSSL.java| 274 ++---
 1 file changed, 74 insertions(+), 200 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java 
b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
index a5ce647..07edc4b 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -50,22 +50,14 @@ public class TesterOpenSSL {
 versionString = "";
 }
 if (versionString.startsWith("OpenSSL 3.0.0")) {
-// Note: Gump currently tests 9.0.x with OpenSSL master
-//   (a.k.a 3.0.0-dev)
+// Note: Gump currently tests 10.x with OpenSSL 3.0.x
 VERSION = 3;
 } else if (versionString.startsWith("OpenSSL 1.1.1")) {
 // LTS
 // Supported until at least 2023-09-11
+// Note: Gump currently tests 9.x and earlier with OpenSSL 1.1.1[x]
 VERSION = 10101;
-} else if (versionString.startsWith("OpenSSL 1.1.0")) {
-// Support ends 2019-09-11
-VERSION = 10100;
-} else if (versionString.startsWith("OpenSSL 1.0.2")) {
-// LTS
-// Support ends 2019-12-31
-// Note: Gump current tests 8.5.x with OpenSSL 1.0.2
-VERSION = 10002;
-// Note: Release branches 1.0.1 and earlier are no longer supported by
+// Note: Release branches 1.1.0 and earlier are no longer supported by
 //   the OpenSSL team so these tests don't support them either.
 } else {
 VERSION = -1;
@@ -107,6 +99,76 @@ public class TesterOpenSSL {
 unimplemented.add(Cipher.SSL2_RC4_128_EXPORT40_WITH_MD5);
 unimplemented.add(Cipher.SSL2_IDEA_128_CBC_WITH_MD5);
 unimplemented.add(Cipher.SSL2_DES_192_EDE3_CBC_WITH_MD5);
+// These were removed in 1.1.0 so won't be available from that
+// version onwards.
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_SEED_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_SEED_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_NULL_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_NULL_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256);
+unimplemented.a

[tomcat] branch 10.0.x updated: Remove testing support for old OpenSSL versions

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new dbe31cd  Remove testing support for old OpenSSL versions
dbe31cd is described below

commit dbe31c12d2524d60c179e2c0cbd877a9c976
Author: Mark Thomas 
AuthorDate: Mon May 24 10:25:53 2021 +0100

Remove testing support for old OpenSSL versions

Also update note son Gump testing
---
 .../util/net/openssl/ciphers/TesterOpenSSL.java| 274 ++---
 1 file changed, 74 insertions(+), 200 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java 
b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
index a5ce647..07edc4b 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -50,22 +50,14 @@ public class TesterOpenSSL {
 versionString = "";
 }
 if (versionString.startsWith("OpenSSL 3.0.0")) {
-// Note: Gump currently tests 9.0.x with OpenSSL master
-//   (a.k.a 3.0.0-dev)
+// Note: Gump currently tests 10.x with OpenSSL 3.0.x
 VERSION = 3;
 } else if (versionString.startsWith("OpenSSL 1.1.1")) {
 // LTS
 // Supported until at least 2023-09-11
+// Note: Gump currently tests 9.x and earlier with OpenSSL 1.1.1[x]
 VERSION = 10101;
-} else if (versionString.startsWith("OpenSSL 1.1.0")) {
-// Support ends 2019-09-11
-VERSION = 10100;
-} else if (versionString.startsWith("OpenSSL 1.0.2")) {
-// LTS
-// Support ends 2019-12-31
-// Note: Gump current tests 8.5.x with OpenSSL 1.0.2
-VERSION = 10002;
-// Note: Release branches 1.0.1 and earlier are no longer supported by
+// Note: Release branches 1.1.0 and earlier are no longer supported by
 //   the OpenSSL team so these tests don't support them either.
 } else {
 VERSION = -1;
@@ -107,6 +99,76 @@ public class TesterOpenSSL {
 unimplemented.add(Cipher.SSL2_RC4_128_EXPORT40_WITH_MD5);
 unimplemented.add(Cipher.SSL2_IDEA_128_CBC_WITH_MD5);
 unimplemented.add(Cipher.SSL2_DES_192_EDE3_CBC_WITH_MD5);
+// These were removed in 1.1.0 so won't be available from that
+// version onwards.
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_SEED_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_SEED_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_NULL_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_NULL_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256);
+unimplemented

[tomcat] branch main updated: Remove testing support for old OpenSSL versions

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 7c55e7b  Remove testing support for old OpenSSL versions
7c55e7b is described below

commit 7c55e7bf96c28caa571dd1e97820807984cece12
Author: Mark Thomas 
AuthorDate: Mon May 24 10:25:53 2021 +0100

Remove testing support for old OpenSSL versions

Also update note son Gump testing
---
 .../util/net/openssl/ciphers/TesterOpenSSL.java| 274 ++---
 1 file changed, 74 insertions(+), 200 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java 
b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
index a5ce647..07edc4b 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -50,22 +50,14 @@ public class TesterOpenSSL {
 versionString = "";
 }
 if (versionString.startsWith("OpenSSL 3.0.0")) {
-// Note: Gump currently tests 9.0.x with OpenSSL master
-//   (a.k.a 3.0.0-dev)
+// Note: Gump currently tests 10.x with OpenSSL 3.0.x
 VERSION = 3;
 } else if (versionString.startsWith("OpenSSL 1.1.1")) {
 // LTS
 // Supported until at least 2023-09-11
+// Note: Gump currently tests 9.x and earlier with OpenSSL 1.1.1[x]
 VERSION = 10101;
-} else if (versionString.startsWith("OpenSSL 1.1.0")) {
-// Support ends 2019-09-11
-VERSION = 10100;
-} else if (versionString.startsWith("OpenSSL 1.0.2")) {
-// LTS
-// Support ends 2019-12-31
-// Note: Gump current tests 8.5.x with OpenSSL 1.0.2
-VERSION = 10002;
-// Note: Release branches 1.0.1 and earlier are no longer supported by
+// Note: Release branches 1.1.0 and earlier are no longer supported by
 //   the OpenSSL team so these tests don't support them either.
 } else {
 VERSION = -1;
@@ -107,6 +99,76 @@ public class TesterOpenSSL {
 unimplemented.add(Cipher.SSL2_RC4_128_EXPORT40_WITH_MD5);
 unimplemented.add(Cipher.SSL2_IDEA_128_CBC_WITH_MD5);
 unimplemented.add(Cipher.SSL2_DES_192_EDE3_CBC_WITH_MD5);
+// These were removed in 1.1.0 so won't be available from that
+// version onwards.
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_DSS_WITH_SEED_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA256);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_DH_RSA_WITH_SEED_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_NULL_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_NULL_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_RC4_128_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256);
+unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384);
+unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256);
+unimplemented.add

svn commit: r1890154 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml

2021-05-24 Thread markt

Author: markt
Date: Mon May 24 09:20:02 2021
New Revision: 1890154

URL: http://svn.apache.org/viewvc?rev=1890154&view=rev
Log:
Update Gump info for new branch

Modified:
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/xdocs/ci.xml

Modified: tomcat/site/trunk/docs/ci.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1890154&r1=1890153&r2=1890154&view=diff
==
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Mon May 24 09:20:02 2021
@@ -128,21 +128,40 @@ prepared and published by ASF Buildbot,
 
 
 
-  http://vmgump.apache.org/tomcat-trunk/";>tomcat-trunkTomcat 
10.0.x
+  http://vmgump.apache.org/tomcat-main/";>tomcat-mainTomcat 
10.1.x
   
 
   Source path: https://github.com/apache/tomcat";>https://github.com/apache/tomcat
   Projects:
 
-  http://vmgump.apache.org/tomcat-trunk/tomcat-trunk/";>tomcat-trunk
-  http://vmgump.apache.org/tomcat-trunk/tomcat-trunk-test-apr/";>tomcat-trunk-test-apr
 (with Tomcat Native 1.2.x and OpenSSL master)
-  http://vmgump.apache.org/tomcat-trunk/tomcat-trunk-test-nio/";>tomcat-trunk-test-nio
-  http://vmgump.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/";>tomcat-trunk-test-nio2
-  http://vmgump.apache.org/tomcat-trunk/tomcat-trunk-validate/";>tomcat-trunk-validate
-  http://vmgump.apache.org/tomcat-trunk/tomcat-trunk-validate-eoln/";>tomcat-trunk-validate-eoln
+  http://vmgump.apache.org/tomcat-main/tomcat-main/";>tomcat-main
+  http://vmgump.apache.org/tomcat-main/tomcat-main-test-apr/";>tomcat-main-test-apr
 (with Tomcat Native 1.2.x and OpenSSL master)
+  http://vmgump.apache.org/tomcat-main/tomcat-main-test-nio/";>tomcat-main-test-nio
+  http://vmgump.apache.org/tomcat-main/tomcat-main-test-nio2/";>tomcat-main-test-nio2
+  http://vmgump.apache.org/tomcat-main/tomcat-main-validate/";>tomcat-main-validate
+  http://vmgump.apache.org/tomcat-main/tomcat-main-validate-eoln/";>tomcat-main-validate-eoln
 
   
-  http://vmgump.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_file/TEST-org.apache.catalina.util.TestServerInfo.NIO.txt.html";
 rel="nofollow">TestServerInfo result
+  http://vmgump.apache.org/tomcat-main/tomcat-main-test-nio/gump_file/TEST-org.apache.catalina.util.TestServerInfo.NIO.txt.html";
 rel="nofollow">TestServerInfo result
+
+  
+
+
+  http://vmgump.apache.org/tomcat-10.0.x/";>tomcat-10.0.xTomcat 
10.0.x
+  
+
+  Source path: https://github.com/apache/tomcat";>https://github.com/apache/tomcat
+  Projects:
+
+  http://vmgump.apache.org/tomcat-10.0.x/tomcat-10.0.x/";>tomcat-10.0.x
+  http://vmgump.apache.org/tomcat-10.0.x/tomcat-10.0.x-test-apr/";>tomcat-10.0.x-test-apr
 (with Tomcat Native 1.2.x and OpenSSL master)
+  http://vmgump.apache.org/tomcat-10.0.x/tomcat-10.0.x-test-nio/";>tomcat-10.0.x-test-nio
+  http://vmgump.apache.org/tomcat-10.0.x/tomcat-10.0.x-test-nio2/";>tomcat-10.0.x-test-nio2
+  http://vmgump.apache.org/tomcat-10.0.x/tomcat-10.0.x-validate/";>tomcat-10.0.x-validate
+  http://vmgump.apache.org/tomcat-10.0.x/tomcat-10.0.x-validate-eoln/";>tomcat-10.0.x-validate-eoln
+
+  
+  http://vmgump.apache.org/tomcat-10.0.x/tomcat-10.0.x-test-nio/gump_file/TEST-org.apache.catalina.util.TestServerInfo.NIO.txt.html";
 rel="nofollow">TestServerInfo result
 
   
 
@@ -153,7 +172,7 @@ prepared and published by ASF Buildbot,
   Source path: https://github.com/apache/tomcat/tree/9.0.x";>https://github.com/apache/tomcat/tree/9.0.x
   Projects:
 
-  http://vmgump.apache.org/tomcat-tc9.0.x/tomcat-tc9.0.x/";>tomcat-trunk
+  http://vmgump.apache.org/tomcat-tc9.0.x/tomcat-tc9.0.x/";>tomcat-9.0.x
   http://vmgump.apache.org/tomcat-tc9.0.x/tomcat-tc9.0.x-test-apr/";>tomcat-tc9.0.x-test-apr
 (with Tomcat Native 1.2.x and OpenSSL 1.1.1[x])
   http://vmgump.apache.org/tomcat-tc9.0.x/tomcat-tc9.0.x-test-nio/";>tomcat-tc9.0.x-test-nio
   http://vmgump.apache.org/tomcat-tc9.0.x/tomcat-tc9.0.x-test-nio2/";>tomcat-tc9.0.x-test-nio2

Modified: tomcat/site/trunk/xdocs/ci.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1890154&r1=1890153&r2=1890154&view=diff
==
--- tomcat/site/trunk/xdocs/ci.xml (original)
+++ tomcat/site/trunk/xdocs/ci.xml Mon May 24 09:20:02 2021
@@ -140,21 +140,40 @@ prepared and published by ASF Buildbot,
 
 
 
-  http://vmgump.apache.org/tomcat-trunk/";>tomcat-trunkTomcat 
10.0.x
+  http://vmgump.apache.org/tomcat-main/";>tomcat-mainTomcat 
10.1.x
   
 
   Source path: https://github.com/apache/tomcat";>https://github.com/apache/tomcat
   Projects:
 
-  http://vmgump.apache.org/tomcat-trunk/tomcat-trunk/";

[tomcat] branch main updated: First pass at updating versions from 10.0.x to 10.1.x

2021-05-24 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new d538c04  First pass at updating versions from 10.0.x to 10.1.x
d538c04 is described below

commit d538c049b2420d6b194c333b7f4b3556b8803fb3
Author: Mark Thomas 
AuthorDate: Mon May 24 10:00:48 2021 +0100

First pass at updating versions from 10.0.x to 10.1.x
---
 README.md |2 +-
 TOMCAT-NEXT.txt   |2 +-
 build.properties.default  |6 +-
 build.xml |2 +-
 java/org/apache/catalina/ant/jmx/package.html |4 +-
 java/org/apache/catalina/ant/package.html |4 +-
 java/org/apache/catalina/util/ServerInfo.java |4 +-
 res/ide-support/eclipse/eclipse.project   |2 +-
 res/ide-support/eclipse/start-tomcat.launch   |6 +-
 res/ide-support/eclipse/stop-tomcat.launch|6 +-
 res/maven/mvn-pub.xml |4 +-
 res/maven/mvn.properties.default  |2 +-
 webapps/docs/changelog.xml| 2312 +
 webapps/docs/config/http.xml  |2 +-
 webapps/docs/tomcat-docs.xsl  |6 +-
 15 files changed, 35 insertions(+), 2329 deletions(-)

diff --git a/README.md b/README.md
index ec1353d..ab9b9c2 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ The documentation available as of the date of this release is
 included in the docs webapp which ships with tomcat. You can access that webapp
 by starting tomcat and visiting  in your browser.
 The most up-to-date documentation for each version can be found at:
-- [Tomcat 10](https://tomcat.apache.org/tomcat-10.0-doc/)
+- [Tomcat 10](https://tomcat.apache.org/tomcat-10.1-doc/)
 - [Tomcat 9](https://tomcat.apache.org/tomcat-9.0-doc/)
 - [Tomcat 8](https://tomcat.apache.org/tomcat-8.5-doc/)
 - [Tomcat 7](https://tomcat.apache.org/tomcat-7.0-doc/)
diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt
index ea596b1..f5329f6 100644
--- a/TOMCAT-NEXT.txt
+++ b/TOMCAT-NEXT.txt
@@ -15,7 +15,7 @@
   limitations under the License.
 

 
-Notes of things to consider for the next major Tomcat release (10.0.x)
+Notes of things to consider for the next major Tomcat release (10.1.x)
 
 Items carried over from the 9.0.x list:
 
diff --git a/build.properties.default b/build.properties.default
index f1bd57b..3437d88 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -24,10 +24,10 @@
 
 # - Version Control Flags -
 version.major=10
-version.minor=0
-version.build=7
+version.minor=1
+version.build=0
 version.patch=0
-version.suffix=-dev
+version.suffix=-M1-dev
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/build.xml b/build.xml
index d53c4c3..e7fcaad 100644
--- a/build.xml
+++ b/build.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 
   
diff --git a/java/org/apache/catalina/ant/jmx/package.html 
b/java/org/apache/catalina/ant/jmx/package.html
index 2bfaa85..e05ece3 100644
--- a/java/org/apache/catalina/ant/jmx/package.html
+++ b/java/org/apache/catalina/ant/jmx/package.html
@@ -20,8 +20,8 @@
 Ant (version 1.6 or later) that can be used to interact with the
 Remote JMX JSR 160 RMI Adaptor to get/set attributes, invoke MBean operations
 and query for Mbeans inside a running instance of Tomcat.  For more 
information, see
-https://tomcat.apache.org/tomcat-10.0-doc/monitoring.html";>
-https://tomcat.apache.org/tomcat-10.0-doc/monitoring.html.
+https://tomcat.apache.org/tomcat-10.1-doc/monitoring.html";>
+https://tomcat.apache.org/tomcat-10.1-doc/monitoring.html.
 
 Each task element can open a new jmx connection or reference an
 existing one. The following attribute are exists in every tasks:
diff --git a/java/org/apache/catalina/ant/package.html 
b/java/org/apache/catalina/ant/package.html
index ba06ae0..830afc8 100644
--- a/java/org/apache/catalina/ant/package.html
+++ b/java/org/apache/catalina/ant/package.html
@@ -20,8 +20,8 @@
 Ant (version 1.6.x or later) that can be used to interact with the
 Manager application to deploy, undeploy, list, reload, start and stop web 
applications
 from a running instance of Tomcat.  For more information, see
-https://tomcat.apache.org/tomcat-10.0-doc/manager-howto.html";>
-https://tomcat.apache.org/tomcat-10.0-doc/manager-howto.html.
+https://tomcat.apache.org/tomcat-10.1-doc/manager-howto.html";>
+https://tomcat.apache.org/tomcat-10.1-doc/manager-howto.html.
 
 The attributes of each task element correspond
 exactly to the request parameters that are included with an HTTP request
di

[tomcat] 02/02: Version updates

2021-05-24 Thread markt

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

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

commit aeea168f308419f0d712b7ac9887f1e018500714
Author: Mark Thomas 
AuthorDate: Mon May 24 09:48:27 2021 +0100

Version updates
---
 res/ide-support/eclipse/eclipse.project | 2 +-
 res/ide-support/eclipse/start-tomcat.launch | 6 +++---
 res/ide-support/eclipse/stop-tomcat.launch  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/res/ide-support/eclipse/eclipse.project 
b/res/ide-support/eclipse/eclipse.project
index 75504fb..cba13cd 100644
--- a/res/ide-support/eclipse/eclipse.project
+++ b/res/ide-support/eclipse/eclipse.project
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-tomcat-9.0.x
+tomcat-10.0.x
 
 
 
diff --git a/res/ide-support/eclipse/start-tomcat.launch 
b/res/ide-support/eclipse/start-tomcat.launch
index 49cf8bf..5ae3d09 100644
--- a/res/ide-support/eclipse/start-tomcat.launch
+++ b/res/ide-support/eclipse/start-tomcat.launch
@@ -17,13 +17,13 @@
 -->
 
 
-
+
 
 
 
 
 
 
-
-
+
+
 
diff --git a/res/ide-support/eclipse/stop-tomcat.launch 
b/res/ide-support/eclipse/stop-tomcat.launch
index 5d4ee25..7b9405c 100644
--- a/res/ide-support/eclipse/stop-tomcat.launch
+++ b/res/ide-support/eclipse/stop-tomcat.launch
@@ -17,13 +17,13 @@
 -->
 
 
-
+
 
 
 
 
 
 
-
-
+
+
 

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

[tomcat] 01/02: This file should only be in the main branch

2021-05-24 Thread markt

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

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

commit ca2bc0cba88971327c69920dc93a7d1c8772ceb7
Author: Mark Thomas 
AuthorDate: Mon May 24 09:40:25 2021 +0100

This file should only be in the main branch
---
 TOMCAT-NEXT.txt | 40 
 1 file changed, 40 deletions(-)

diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt
deleted file mode 100644
index ea596b1..000
--- a/TOMCAT-NEXT.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-
-Notes of things to consider for the next major Tomcat release (10.0.x)
-
-Items carried over from the 9.0.x list:
-
- 1. Remove the use of system properties to control configuration wherever
-possible.
-
- 2. Reduce instances of setters and getters for the same property existing on 
an
-object and its parent. This may require new objects to be exposed via JMX.
-
-Deferred until 10.1.x:
-
- 1. Remove the ExtensionValidator and associated classes (assuming that the
-minimum Java version is Java 9 or later).
-
- 2. Remove org.apache.tomcat.jni and replace with the minimum necessary to
-interface with OpenSSL and clones.
-We might want to park this one until we see what is available direct from
-the JRE with project Panama.
-
- 3. Remove APR connector.
-
- 4. Review code forked from Commons projects and consider removing unused code.

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

[tomcat] branch 10.0.x updated (744f17d -> aeea168)

2021-05-24 Thread markt

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

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


from 744f17d  Language improvements
 new ca2bc0c  This file should only be in the main branch
 new aeea168  Version updates

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:
 TOMCAT-NEXT.txt | 40 -
 res/ide-support/eclipse/eclipse.project |  2 +-
 res/ide-support/eclipse/start-tomcat.launch |  6 ++---
 res/ide-support/eclipse/stop-tomcat.launch  |  6 ++---
 4 files changed, 7 insertions(+), 47 deletions(-)
 delete mode 100644 TOMCAT-NEXT.txt

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

[tomcat] branch 10.0.x created (now 744f17d)

2021-05-24 Thread markt

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

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


  at 744f17d  Language improvements

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

43 matches

Mail list logo