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 2022/10/06 00:45:28 UTC
[commons-configuration] branch master updated (4b1fa972 -> 5b3748dc)
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-configuration.git
from 4b1fa972 Bump actions/cache from 3.0.8 to 3.0.9
new 76162a82 StringUtils.isEmpty(key)
new 17e80027 Bump pmd from 6.49.0 to 6.50.0.
new 5b3748dc Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration.git
The 3 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 | 2 +-
.../java/org/apache/commons/configuration2/AbstractConfiguration.java | 3 ++-
.../java/org/apache/commons/configuration2/SubsetConfiguration.java | 3 ++-
4 files changed, 6 insertions(+), 4 deletions(-)
[commons-configuration] 03/03: Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration.git
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-configuration.git
commit 5b3748dc35ce1fa59bc61f723d6283467cd78ef0
Merge: 17e80027 4b1fa972
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Oct 5 20:45:12 2022 -0400
Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration.git
.github/workflows/codeql-analysis.yml | 2 +-
src/changes/changes.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
[commons-configuration] 01/03: StringUtils.isEmpty(key)
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-configuration.git
commit 76162a82a2badc5bcb1c8571019f0f9b29a791b1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Oct 5 20:39:50 2022 -0400
StringUtils.isEmpty(key)
---
.../java/org/apache/commons/configuration2/AbstractConfiguration.java | 3 ++-
.../java/org/apache/commons/configuration2/SubsetConfiguration.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
index 0d0be638..66b52ea8 100644
--- a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
@@ -51,6 +51,7 @@ import org.apache.commons.configuration2.sync.Synchronizer;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
/**
* <p>
@@ -922,7 +923,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
final String pkey = token.substring(0, equalSign).trim();
final String pvalue = token.substring(equalSign + 1).trim();
props.put(pkey, pvalue);
- } else if (tokens.length == 1 && "".equals(token)) {
+ } else if (tokens.length == 1 && StringUtils.isEmpty(key)) {
// Semantically equivalent to an empty Properties
// object.
break;
diff --git a/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java b/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
index 3924ea58..ea86addf 100644
--- a/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
@@ -20,6 +20,7 @@ package org.apache.commons.configuration2;
import java.util.Iterator;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.lang3.StringUtils;
/**
* <p>
@@ -79,7 +80,7 @@ public class SubsetConfiguration extends AbstractConfiguration {
* @return the key as to be used by the parent
*/
protected String getParentKey(final String key) {
- if ("".equals(key) || key == null) {
+ if (StringUtils.isEmpty(key)) {
return prefix;
}
return delimiter == null ? prefix + key : prefix + delimiter + key;
[commons-configuration] 02/03: Bump pmd from 6.49.0 to 6.50.0.
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-configuration.git
commit 17e800279013bdbacfca9b44da175dbd2956cf9b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Oct 5 20:44:04 2022 -0400
Bump pmd from 6.49.0 to 6.50.0.
---
pom.xml | 2 +-
src/changes/changes.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index d2a4736b..0dc970ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -565,7 +565,7 @@
<commons.spotbugs.version>4.7.2.0</commons.spotbugs.version>
<commons.spotbugs.impl.version>4.7.2</commons.spotbugs.impl.version>
<commons.pmd.version>3.19.0</commons.pmd.version>
- <commons.pmd-impl.version>6.49.0</commons.pmd-impl.version>
+ <commons.pmd-impl.version>6.50.0</commons.pmd-impl.version>
<!-- apache-rat-plugin 0.13 and jdepend-maven-plugin 2.0 both fail with LinkageError when generating reports
with maven site plugin 3.11+. However, javadoc 3.4.0+ fails with site plugin versions lower than 3.11. So, we'll
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 70d8670f..e13c2aae 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -71,7 +71,7 @@
Bump maven-pmd-plugin 3.17.0 to 3.19.0.
</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">
- Bump pmd from 6.47.0 to 6.49.0.
+ Bump pmd from 6.47.0 to 6.50.0.
</action>
<action type="update" dev="kinow" due-to="Dependabot">
Bump snakeyaml from 1.30 to 1.33 #203, #212, #219.