Fix ContextClassLoader load priority problem in DriverDataSource

CHANGES

@@ -1,5 +1,15 @@
 HikariCP Changes
 
+Changes in 6.3.1
+
+ * fixed #2315 source jar contains also binary .class files and missing some .java files
+
+ * fixed #2307 remove improper hardcoded timout, use validationTimeout
+
+ * fixed #2305 keep properties key and values as is rather than forcing stringification. Also fixes #2286 and #2304
+
+ * upgraded various maven plugin dependencies to latest versions
+
 Changes in 6.3.0
 
  * increase keepaliveTime variance from 10% to 20%

README.md

@@ -15,7 +15,7 @@ Fast, simple, reliable.  HikariCP is a "zero-overhead" production ready JDBC con
 ----------------------------------------------------
 
 > [!IMPORTANT]
-> In order to avoid a rare condition where the pool goes to zero and does not recover it is necessary to configure *TCP keepalive*. Some JDBC drivers support this via properties, for example ``tcpKeepAlive=true`` on PostgreSQL, but in any case it can also be configured at the OS-level. See [Setting OS TCP Keepalive](https://github.com/brettwooldridge/HikariCP/wiki/Setting-OS-TCP-Keepalive) and/or [TCP keepalive for a better PostgreSQL experience](https://www.cybertec-postgresql.com/en/tcp-keepalive-for-a-better-postgresql-experience/#setting-tcp-keepalive-parameters-on-the-operating-system).
+> In order to avoid a rare condition where the pool goes to zero and does not recover it is necessary to configure *TCP keepalive*. Some JDBC drivers support this via properties, for example ``tcpKeepAlive=true`` on PostgreSQL, but in any case it can also be configured at the OS-level. See [Setting OS TCP Keepalive](https://github.com/brettwooldridge/HikariCP/wiki/Setting-Driver-or-OS-TCP-Keepalive) and/or [TCP keepalive for a better PostgreSQL experience](https://www.cybertec-postgresql.com/en/tcp-keepalive-for-a-better-postgresql-experience/#setting-tcp-keepalive-parameters-on-the-operating-system).
 
 ----------------------------------------------------
 
@@ -38,12 +38,12 @@ Fast, simple, reliable.  HikariCP is a "zero-overhead" production ready JDBC con
 
 ### Artifacts
 
-_**Java 11+** maven artifact:_
+_**Java 11 or greater** maven artifact:_
 ```xml
 <dependency>
    <groupId>com.zaxxer</groupId>
    <artifactId>HikariCP</artifactId>
-   <version>6.2.1</version>
+   <version>6.3.0</version>
 </dependency>
 ```
 _Java 8 maven artifact (*deprecated*):_

pom.xml

@@ -24,18 +24,13 @@
       <!--java11.build.outputDirectory>${project.build.directory}/classes-java11</java11.build.outputDirectory -->
       <artifact.classifier />
 
-      <!-- When releasing a new version, this property controls whether the staged artifacts will be automatically
-           released in Nexus. If this is set to false (-DautoReleaseStagedArtifacts=false), artifacts will need to
-           be manually released via the Nexus UI at https://oss.sonatype.org -->
-      <autoReleaseStagedArtifacts>true</autoReleaseStagedArtifacts>
-
       <docker.maven.plugin.fabric8.version>0.45.0</docker.maven.plugin.fabric8.version>
       <felix.bundle.plugin.version>5.1.1</felix.bundle.plugin.version>
       <felix.version>7.0.5</felix.version>
       <hibernate.version>5.4.24.Final</hibernate.version>
       <javassist.version>3.29.2-GA</javassist.version>
       <jndi.version>0.11.4.1</jndi.version>
-      <maven.release.version>3.0.1</maven.release.version>
+      <maven.release.version>2.5.3</maven.release.version>
       <metrics.version>3.2.5</metrics.version>
       <metrics5.version>5.0.0-rc17</metrics5.version>
       <micrometer.version>1.5.10</micrometer.version>
@@ -54,7 +49,7 @@
 
    <groupId>com.zaxxer</groupId>
    <artifactId>HikariCP</artifactId>
-   <version>6.3.1-SNAPSHOT</version>
+   <version>6.3.2-SNAPSHOT</version>
    <packaging>bundle</packaging>
 
    <name>HikariCP</name>
@@ -73,13 +68,6 @@
       <tag>HEAD</tag>
    </scm>
 
-   <distributionManagement>
-      <snapshotRepository>
-         <id>ossrh</id>
-         <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      </snapshotRepository>
-   </distributionManagement>
-
    <issueManagement>
       <url>https://github.com/brettwooldridge/HikariCP/issues</url>
    </issueManagement>
@@ -287,12 +275,6 @@
    </dependencies>
 
    <build>
-      <resources>
-         <resource>
-            <directory>target/classes</directory>
-         </resource>
-      </resources>
-
       <pluginManagement>
          <plugins>
             <plugin>
@@ -312,90 +294,24 @@
                </configuration>
             </plugin>
 
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-deploy-plugin</artifactId>
-               <version>2.8.2</version>
-            </plugin>
-
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-gpg-plugin</artifactId>
-               <version>3.0.1</version>
-            </plugin>
-
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-release-plugin</artifactId>
-               <version>2.5.3</version>
-            </plugin>
-
-            <plugin>
-               <groupId>org.sonatype.plugins</groupId>
-               <artifactId>nexus-staging-maven-plugin</artifactId>
-               <version>1.6.12</version>
-            </plugin>
-
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
-               <version>3.0.0-M8</version>
+               <version>3.5.3</version>
                <configuration>
                   <!-- Sets the VM argument line used when unit tests are run. -->
                   <argLine>${surefireArgLine} ${sureFireOptions11}</argLine>
                   <reuseForks>${sureFireForks11}</reuseForks>
                </configuration>
             </plugin>
-
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-source-plugin</artifactId>
-               <version>3.0.1</version>
-               <configuration>
-                  <!-- outputDirectory>/absolute/path/to/the/output/directory</outputDirectory>
-                     <finalName>filename-of-generated-jar-file</finalName -->
-                  <attach>true</attach>
-               </configuration>
-               <executions>
-                  <execution>
-                     <id>attach-sources</id>
-                     <goals>
-                        <goal>jar-no-fork</goal>
-                     </goals>
-                  </execution>
-               </executions>
-            </plugin>
-
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-javadoc-plugin</artifactId>
-               <version>3.6.0</version>
-               <configuration>
-                  <show>public</show>
-                  <excludePackageNames>
-                     com.zaxxer.hikari.hibernate:com.zaxxer.hikari.metrics.*:com.zaxxer.hikari.pool:com.zaxxer.hikari.util
-                  </excludePackageNames>
-                  <attach>true</attach>
-                  <maxmemory>1024m</maxmemory>
-               </configuration>
-               <executions>
-                  <execution>
-                     <id>bundle-sources</id>
-                     <phase>package</phase>
-                     <goals>
-                        <goal>jar</goal>
-                     </goals>
-                  </execution>
-               </executions>
-            </plugin>
          </plugins>
       </pluginManagement>
 
       <plugins>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-enforcer-plugin</artifactId>
-            <version>3.4.1</version>
+            <version>3.5.0</version>
             <executions>
                <execution>
                   <id>enforce-maven</id>
@@ -415,7 +331,7 @@
 
          <plugin>
             <artifactId>maven-dependency-plugin</artifactId>
-            <version>2.8</version>
+            <version>3.8.1</version>
             <executions>
                <execution>
                   <phase>generate-sources</phase>
@@ -508,7 +424,7 @@
          <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.8</version>
+            <version>0.8.13</version>
             <executions>
                <!-- Prepares the property pointing to the JaCoCo runtime agent which is passed as VM argument when Maven the Surefire plugin is executed. -->
                <execution>
@@ -549,7 +465,7 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>3.0.0-M3</version>
+            <version>3.5.3</version>
             <executions>
                <execution>
                   <goals>
@@ -654,10 +570,25 @@
          </activation>
          <build>
             <plugins>
+               <!-- Maven Release Plugin -->
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-release-plugin</artifactId>
+                  <version>${maven.release.version}</version>
+                  <configuration>
+                     <goals>clean verify</goals> <!-- Prevent automatic deploy -->
+                  </configuration>
+               </plugin>
+
                <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-source-plugin</artifactId>
-                  <version>3.3.0</version>
+                  <version>3.0.1</version>
+                  <configuration>
+                     <!-- outputDirectory>/absolute/path/to/the/output/directory</outputDirectory>
+                        <finalName>filename-of-generated-jar-file</finalName -->
+                     <attach>true</attach>
+                  </configuration>
                   <executions>
                      <execution>
                         <id>attach-sources</id>
@@ -672,21 +603,29 @@
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-javadoc-plugin</artifactId>
                   <version>3.6.0</version>
+                  <configuration>
+                     <show>public</show>
+                     <failOnError>false</failOnError>
+                     <sourcepath>${project.build.sourceDirectory}</sourcepath>
+                     <excludePackageNames>com.zaxxer.hikari.hibernate:com.zaxxer.hikari.metrics.*:com.zaxxer.hikari.pool:com.zaxxer.hikari.util</excludePackageNames>
+                     <attach>true</attach>
+                     <maxmemory>1024m</maxmemory>
+                  </configuration>
                   <executions>
                      <execution>
-                        <id>attach-javadocs</id>
+                        <id>bundle-sources</id>
+                        <phase>package</phase>
                         <goals>
                            <goal>jar</goal>
                         </goals>
                      </execution>
                   </executions>
                </plugin>
 
-               <!-- For release: mvn release:perform -Darguments=-Dgpg.passphrase=PASSPHRASE
-                      With gpg2 you don't need to pass the passphrase; the GPG agent will prompt for it. -->
                <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-gpg-plugin</artifactId>
+                  <version>3.0.1</version>
                   <executions>
                      <execution>
                         <id>sign-artifacts</id>
@@ -698,18 +637,24 @@
                   </executions>
                </plugin>
 
-               <!-- nexus-staging-maven-plugin replaces the standard maven-deploy-plugin for releases and
-                    is useful for ensuring artifacts are all-or-nothing, as well as allowing artifacts to
-                    be reviewed before they're made public -->
                <plugin>
-                  <groupId>org.sonatype.plugins</groupId>
-                  <artifactId>nexus-staging-maven-plugin</artifactId>
+                  <groupId>org.sonatype.central</groupId>
+                  <artifactId>central-publishing-maven-plugin</artifactId>
+                  <version>0.7.0</version>
                   <extensions>true</extensions>
                   <configuration>
-                     <autoReleaseAfterClose>${autoReleaseStagedArtifacts}</autoReleaseAfterClose>
-                     <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                     <serverId>ossrh</serverId>
+                     <publishingServerId>central</publishingServerId>
+                     <autoPublish>false</autoPublish>
                   </configuration>
+                  <executions>
+                     <execution>
+                        <id>publish</id>
+                        <phase>deploy</phase> <!-- This line is key -->
+                        <goals>
+                           <goal>publish</goal>
+                        </goals>
+                     </execution>
+                  </executions>
                </plugin>
             </plugins>
          </build>

publish.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+mvn clean && mvn package -DskipTests -Dmaven.test.skip=true && mvn release:prepare -Prelease && mvn deploy -DperformRelease=true -DskipTests -Dmaven.test.skip=true

src/main/java/com/zaxxer/hikari/pool/PoolBase.java

@@ -475,7 +475,7 @@ private void checkValidationSupport(final Connection connection) throws SQLExcep
    {
       try {
          if (isUseJdbc4Validation) {
-            connection.isValid(1);
+            connection.isValid(Math.max(1, (int) MILLISECONDS.toSeconds(validationTimeout)));
          }
          else {
             executeSql(connection, config.getConnectionTestQuery(), false);