You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/10/23 16:16:22 UTC
[commons-dbcp] branch master updated (fced9384 -> 40986ebe)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
from fced9384 Add DataSourceMXBean.getUserName() and deprecate getUsername()
new 36d74a41 Bump jakarta.transaction:jakarta.transaction-api from 1.3.1 to 1.3.3
new 40986ebe Static is never null or empty.
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:
pom.xml | 2 +-
src/changes/changes.xml | 1 +
.../commons/dbcp2/BasicDataSourceFactory.java | 24 ++++++++++------------
3 files changed, 13 insertions(+), 14 deletions(-)
[commons-dbcp] 02/02: Static is never null or empty.
Posted by gg...@apache.org.
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
commit 40986ebe3cce4929f380f0e536ead1321cf0eb39
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Oct 23 12:16:17 2023 -0400
Static is never null or empty.
---
.../commons/dbcp2/BasicDataSourceFactory.java | 24 ++++++++++------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
index e832ca8c..11dfbc17 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
@@ -420,20 +420,18 @@ public class BasicDataSourceFactory implements ObjectFactory {
* container for info messages
*/
private void validatePropertyNames(final Reference ref, final Name name, final List<String> warnMessages,
- final List<String> infoMessages) {
+ final List<String> infoMessages) {
final String nameString = name != null ? "Name = " + name.toString() + " " : "";
- if (NUPROP_WARNTEXT != null && !NUPROP_WARNTEXT.isEmpty()) {
- NUPROP_WARNTEXT.forEach((propertyName, value) -> {
- final RefAddr ra = ref.get(propertyName);
- if (ra != null && !ALL_PROPERTY_NAMES.contains(ra.getType())) {
- final StringBuilder stringBuilder = new StringBuilder(nameString);
- final String propertyValue = Objects.toString(ra.getContent(), null);
- stringBuilder.append(value).append(" You have set value of \"").append(propertyValue).append("\" for \"").append(propertyName)
+ NUPROP_WARNTEXT.forEach((propertyName, value) -> {
+ final RefAddr ra = ref.get(propertyName);
+ if (ra != null && !ALL_PROPERTY_NAMES.contains(ra.getType())) {
+ final StringBuilder stringBuilder = new StringBuilder(nameString);
+ final String propertyValue = Objects.toString(ra.getContent(), null);
+ stringBuilder.append(value).append(" You have set value of \"").append(propertyValue).append("\" for \"").append(propertyName)
.append("\" property, which is being ignored.");
- warnMessages.add(stringBuilder.toString());
- }
- });
- }
+ warnMessages.add(stringBuilder.toString());
+ }
+ });
final Enumeration<RefAddr> allRefAddrs = ref.getAll();
while (allRefAddrs.hasMoreElements()) {
@@ -445,7 +443,7 @@ public class BasicDataSourceFactory implements ObjectFactory {
final String propertyValue = Objects.toString(ra.getContent(), null);
final StringBuilder stringBuilder = new StringBuilder(nameString);
stringBuilder.append("Ignoring unknown property: ").append("value of \"").append(propertyValue).append("\" for \"").append(propertyName)
- .append("\" property");
+ .append("\" property");
infoMessages.add(stringBuilder.toString());
}
}
[commons-dbcp] 01/02: Bump jakarta.transaction:jakarta.transaction-api from 1.3.1 to 1.3.3
Posted by gg...@apache.org.
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
commit 36d74a41c66746c6205c0f5976002676b320221f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Oct 23 12:16:01 2023 -0400
Bump jakarta.transaction:jakarta.transaction-api from 1.3.1 to 1.3.3
---
pom.xml | 2 +-
src/changes/changes.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 12c5ca81..3cdd80bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,7 +219,7 @@
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
- <version>1.3.1</version>
+ <version>1.3.3</version>
</dependency>
<!-- tomcat naming jars for jndi reference tests -->
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 04fdc089..4f432739 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -71,6 +71,7 @@ The <action> type attribute can be add,update,fix,remove.
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump commons-parent from 60 to 64.</action>
<action type="update" dev="ggregory" due-to="Dependabot">Bump org.slf4j:slf4j-simple from 2.0.7 to 2.0.9 #301.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump org.apache.commons:commons-pool2 from 2.11.1 to 2.12.0.</action>
+ <action type="update" dev="ggregory" due-to="Gary Gregory">Bump jakarta.transaction:jakarta.transaction-api from 1.3.1 to 1.3.3.</action>
</release>
<release version="2.10.0" date="2023-08-28" description="This is a minor release, including bug fixes and enhancements.">
<!-- FIX -->