This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
The following commit(s) were added to refs/heads/master by this push:
new 07382a9 Bump checkstyle to 8.43.
07382a9 is described below
commit 07382a9521b5b43b324803e3cee3cc8d8f625177
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Sun Jun 6 13:16:49 2021 -0400
Bump checkstyle to 8.43.
---
checkstyle.xml | 2 +-
pom.xml | 12 ++++++++++--
src/changes/changes.xml | 3 +++
.../commons/dbcp2/datasources/InstanceKeyDataSource.java | 3 +++
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/checkstyle.xml b/checkstyle.xml
index fbf6c7c..8bafc75 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -78,7 +78,7 @@
<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
- <property name="scope" value="protected"/>
+ <property name="accessModifiers" value="protected"/>
<!-- very loose, for now -->
<property name="allowMissingReturnTag" value="true"/>
<property name="allowMissingParamTags" value="true"/>
diff --git a/pom.xml b/pom.xml
index 58cf296..58139da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,7 +321,8 @@
<commons.jira.id>DBCP</commons.jira.id>
<commons.jira.pid>12310469</commons.jira.pid>
<!-- Override CP version until that is updated -->
- <commons.checkstyle.version>3.1.2</commons.checkstyle.version>
+
<commons.checkstyle-plugin.version>3.1.2</commons.checkstyle-plugin.version>
+ <commons.checkstyle.version>8.43</commons.checkstyle.version>
<commons.javadoc.version>3.3.0</commons.javadoc.version>
<!-- Constant for Commons Pool version (used in multiple places) -->
<commons.pool.version>2.10.0</commons.pool.version>
@@ -362,7 +363,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${commons.checkstyle.version}</version>
+ <version>${commons.checkstyle-plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${commons.checkstyle.version}</version>
+ </dependency>
+ </dependencies>
<configuration>
<configLocation>${basedir}/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8f284f1..5721121 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -196,6 +196,9 @@ The <action> type attribute can be add,update,fix,remove.
<action type="update" dev="ggregory" due-to="Gary Gregory">
Bump commons-pool2 from 2.9.0 to 2.10.0.
</action>
+ <action type="update" dev="ggregory" due-to="Gary Gregory">
+ Bump checkstyle to 8.43.
+ </action>
</release>
<release version="2.8.0" date="2020-09-21" description="This is a minor
release, including bug fixes and enhancements.">
<!-- add -->
diff --git
a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
index d56b2b0..e6d3893 100644
---
a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
+++
b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
@@ -1010,6 +1010,9 @@ public abstract class InstanceKeyDataSource implements
DataSource, Referenceable
}
}
+ /**
+ * This method is protected but can only be implemented in this package
because PooledConnectionAndInfo is a package private type.
+ */
protected abstract PooledConnectionAndInfo
getPooledConnectionAndInfo(String userName, String userPassword)
throws SQLException;
