You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2019/06/15 12:23:09 UTC
[sling-org-apache-sling-feature-io] branch master updated:
SLING-8502 : Update to latest Apache Felix Utils
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-io.git
The following commit(s) were added to refs/heads/master by this push:
new 8c821b5 SLING-8502 : Update to latest Apache Felix Utils
8c821b5 is described below
commit 8c821b547e33e905a7d23085be0a00cb9b1ae0bb
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sat Jun 15 14:22:59 2019 +0200
SLING-8502 : Update to latest Apache Felix Utils
---
pom.xml | 2 +-
.../org/apache/sling/feature/io/json/JSONReaderBase.java | 15 ---------------
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3c3bc33..04fe24f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
- <version>1.11.0</version>
+ <version>1.11.2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/feature/io/json/JSONReaderBase.java b/src/main/java/org/apache/sling/feature/io/json/JSONReaderBase.java
index 4f1a9b0..5c7988a 100644
--- a/src/main/java/org/apache/sling/feature/io/json/JSONReaderBase.java
+++ b/src/main/java/org/apache/sling/feature/io/json/JSONReaderBase.java
@@ -30,7 +30,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Objects;
import java.util.Set;
import java.util.function.BiConsumer;
@@ -686,19 +685,5 @@ abstract class JSONReaderBase {
public MatchingRequirementImpl(Resource res, String ns, Map<String, String> dirs, Map<String, Object> attrs) {
super(res, ns, dirs, attrs);
}
-
- @Override
- public boolean equals(final Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || !(o instanceof RequirementImpl)) {
- return false;
- }
- final RequirementImpl that = (RequirementImpl) o;
- return Objects.equals(resource, that.getResource()) && Objects.equals(namespace, that.getNamespace())
- && Objects.equals(attributes, that.getAttributes())
- && Objects.equals(directives, that.getDirectives());
- }
}
}