This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8460826c278bf7522d43abe93c75f166667cece3 Author: opencode <[email protected]> AuthorDate: Thu Oct 29 23:59:45 2026 +0100 Fix two checkstyle violations in the jdbc-pool module An ImportOrder violation crept into DataSourceFactory when the HashSet import was added after java.util.Hashtable instead of before it, and a test added for the DataSource JMX registration work carried the Apache licence header with "to you" where the header check expects "to You". Both fail the Ant "validate" target that "deploy" depends on, so the module no longer built cleanly. Purely stylistic; no behaviour change. --- .../src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java | 2 +- .../apache/tomcat/jdbc/pool/jmx/TestDataSourceRegistrationVsClose.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java index dc03b55906..80f21f7f69 100644 --- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java +++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java @@ -21,8 +21,8 @@ import java.sql.Connection; import java.util.Arrays; import java.util.Collections; import java.util.Enumeration; -import java.util.Hashtable; import java.util.HashSet; +import java.util.Hashtable; import java.util.Properties; import java.util.Set; diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestDataSourceRegistrationVsClose.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestDataSourceRegistrationVsClose.java index e3ac1cdf3b..90758004e0 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestDataSourceRegistrationVsClose.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestDataSourceRegistrationVsClose.java @@ -2,7 +2,7 @@ * 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 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 * --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
