You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2022/04/26 10:23:07 UTC
[sling-org-apache-sling-query] branch master updated: SLING-9600 Updated commons-lang to commons-lang3
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-query.git
The following commit(s) were added to refs/heads/master by this push:
new 9ec132a SLING-9600 Updated commons-lang to commons-lang3
9ec132a is described below
commit 9ec132a80e7d5c99aade8c98537f5ab1f5b5b4b8
Author: Cris Rockwell <cm...@umich.edu>
AuthorDate: Thu Jul 23 11:49:58 2020 -0400
SLING-9600 Updated commons-lang to commons-lang3
---
pom.xml | 6 +++---
src/main/java/org/apache/sling/query/api/internal/Option.java | 5 +++--
.../org/apache/sling/query/impl/predicate/SelectorOperator.java | 4 +++-
.../org/apache/sling/query/impl/resource/ResourcePredicate.java | 2 +-
.../apache/sling/query/impl/resource/jcr/query/JcrQueryBuilder.java | 3 ++-
.../java/org/apache/sling/query/impl/selector/parser/Attribute.java | 5 +++--
.../java/org/apache/sling/query/impl/selector/parser/Modifier.java | 5 +++--
.../org/apache/sling/query/impl/selector/parser/SelectorParser.java | 4 +++-
.../apache/sling/query/impl/selector/parser/SelectorSegment.java | 5 +++--
.../java/org/apache/sling/query/impl/selector/parser/State.java | 3 ++-
src/test/java/org/apache/sling/query/mock/ResourceMock.java | 2 +-
11 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index e4c1483..d9ecd3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,10 +60,10 @@
<!-- commons -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.9</version>
<scope>provided</scope>
- <version>2.5</version>
</dependency>
<!-- sling -->
diff --git a/src/main/java/org/apache/sling/query/api/internal/Option.java b/src/main/java/org/apache/sling/query/api/internal/Option.java
index f9e4e7f..9faf933 100644
--- a/src/main/java/org/apache/sling/query/api/internal/Option.java
+++ b/src/main/java/org/apache/sling/query/api/internal/Option.java
@@ -19,8 +19,9 @@
package org.apache.sling.query.api.internal;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
public class Option<T> {
private final T element;
diff --git a/src/main/java/org/apache/sling/query/impl/predicate/SelectorOperator.java b/src/main/java/org/apache/sling/query/impl/predicate/SelectorOperator.java
index e17d835..718a7a3 100644
--- a/src/main/java/org/apache/sling/query/impl/predicate/SelectorOperator.java
+++ b/src/main/java/org/apache/sling/query/impl/predicate/SelectorOperator.java
@@ -19,9 +19,11 @@
package org.apache.sling.query.impl.predicate;
+import org.apache.commons.lang3.StringUtils;
+
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
+
public enum SelectorOperator {
CONTAINS("*=") {
diff --git a/src/main/java/org/apache/sling/query/impl/resource/ResourcePredicate.java b/src/main/java/org/apache/sling/query/impl/resource/ResourcePredicate.java
index 913eca2..2df927d 100644
--- a/src/main/java/org/apache/sling/query/impl/resource/ResourcePredicate.java
+++ b/src/main/java/org/apache/sling/query/impl/resource/ResourcePredicate.java
@@ -26,7 +26,7 @@ import java.util.function.Predicate;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.query.impl.resource.jcr.JcrTypeResolver;
import org.apache.sling.query.impl.selector.parser.Attribute;
diff --git a/src/main/java/org/apache/sling/query/impl/resource/jcr/query/JcrQueryBuilder.java b/src/main/java/org/apache/sling/query/impl/resource/jcr/query/JcrQueryBuilder.java
index 6bcef63..64dd729 100644
--- a/src/main/java/org/apache/sling/query/impl/resource/jcr/query/JcrQueryBuilder.java
+++ b/src/main/java/org/apache/sling/query/impl/resource/jcr/query/JcrQueryBuilder.java
@@ -22,7 +22,8 @@ package org.apache.sling.query.impl.resource.jcr.query;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+
+import org.apache.commons.lang3.StringUtils;
import org.apache.sling.query.impl.resource.jcr.JcrOperator;
import org.apache.sling.query.impl.resource.jcr.JcrTypeResolver;
import org.apache.sling.query.impl.resource.jcr.query.Formula.Operator;
diff --git a/src/main/java/org/apache/sling/query/impl/selector/parser/Attribute.java b/src/main/java/org/apache/sling/query/impl/selector/parser/Attribute.java
index f6fc2e9..a0cfe9b 100644
--- a/src/main/java/org/apache/sling/query/impl/selector/parser/Attribute.java
+++ b/src/main/java/org/apache/sling/query/impl/selector/parser/Attribute.java
@@ -19,8 +19,9 @@
package org.apache.sling.query.impl.selector.parser;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
public class Attribute {
private final String key;
diff --git a/src/main/java/org/apache/sling/query/impl/selector/parser/Modifier.java b/src/main/java/org/apache/sling/query/impl/selector/parser/Modifier.java
index 00a8a21..54db064 100644
--- a/src/main/java/org/apache/sling/query/impl/selector/parser/Modifier.java
+++ b/src/main/java/org/apache/sling/query/impl/selector/parser/Modifier.java
@@ -19,8 +19,9 @@
package org.apache.sling.query.impl.selector.parser;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
public class Modifier {
diff --git a/src/main/java/org/apache/sling/query/impl/selector/parser/SelectorParser.java b/src/main/java/org/apache/sling/query/impl/selector/parser/SelectorParser.java
index eff1ce1..19bc852 100644
--- a/src/main/java/org/apache/sling/query/impl/selector/parser/SelectorParser.java
+++ b/src/main/java/org/apache/sling/query/impl/selector/parser/SelectorParser.java
@@ -19,11 +19,13 @@
package org.apache.sling.query.impl.selector.parser;
+import org.apache.commons.lang3.StringUtils;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+
public final class SelectorParser {
diff --git a/src/main/java/org/apache/sling/query/impl/selector/parser/SelectorSegment.java b/src/main/java/org/apache/sling/query/impl/selector/parser/SelectorSegment.java
index 2dfa38c..e5a35d9 100644
--- a/src/main/java/org/apache/sling/query/impl/selector/parser/SelectorSegment.java
+++ b/src/main/java/org/apache/sling/query/impl/selector/parser/SelectorSegment.java
@@ -19,11 +19,12 @@
package org.apache.sling.query.impl.selector.parser;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
public class SelectorSegment {
private final String type;
diff --git a/src/main/java/org/apache/sling/query/impl/selector/parser/State.java b/src/main/java/org/apache/sling/query/impl/selector/parser/State.java
index a6b8883..6483998 100644
--- a/src/main/java/org/apache/sling/query/impl/selector/parser/State.java
+++ b/src/main/java/org/apache/sling/query/impl/selector/parser/State.java
@@ -19,7 +19,8 @@
package org.apache.sling.query.impl.selector.parser;
-import org.apache.commons.lang.ArrayUtils;
+
+import org.apache.commons.lang3.ArrayUtils;
public enum State {
START {
diff --git a/src/test/java/org/apache/sling/query/mock/ResourceMock.java b/src/test/java/org/apache/sling/query/mock/ResourceMock.java
index a49338f..3915690 100644
--- a/src/test/java/org/apache/sling/query/mock/ResourceMock.java
+++ b/src/test/java/org/apache/sling/query/mock/ResourceMock.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;