Repository: jena Updated Branches: refs/heads/master 23d1bde29 -> b36baca4e
Added commons-collections4 to parent/pom.xml modified jena-security/pom.xml to use managed versions fixes JENA-857 Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b36baca4 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b36baca4 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b36baca4 Branch: refs/heads/master Commit: b36baca4eeacac153bd8371741124c7b2606838b Parents: 23d1bde Author: Claude Warren <[email protected]> Authored: Tue Jan 20 22:47:01 2015 +0000 Committer: Claude Warren <[email protected]> Committed: Tue Jan 20 22:47:01 2015 +0000 ---------------------------------------------------------------------- jena-parent/pom.xml | 7 ++++++- jena-security/pom.xml | 14 ++++++-------- .../org/apache/jena/security/SecurityEvaluator.java | 2 +- .../org/apache/jena/security/impl/ItemHolder.java | 2 +- .../apache/jena/security/impl/SecuredItemImpl.java | 6 +++--- 5 files changed, 17 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/b36baca4/jena-parent/pom.xml ---------------------------------------------------------------------- diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml index 5a303f6..4f44f34 100644 --- a/jena-parent/pom.xml +++ b/jena-parent/pom.xml @@ -165,6 +165,12 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.0</version> + </dependency> + + <dependency> <groupId>com.github.jsonld-java</groupId> <artifactId>jsonld-java</artifactId> <version>${ver.jsonldjava}</version> @@ -287,7 +293,6 @@ </exclusion> </exclusions> </dependency> - </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/jena/blob/b36baca4/jena-security/pom.xml ---------------------------------------------------------------------- diff --git a/jena-security/pom.xml b/jena-security/pom.xml index 4dee0af..0b4bd80 100644 --- a/jena-security/pom.xml +++ b/jena-security/pom.xml @@ -111,14 +111,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>org.apache.jena</groupId> @@ -133,5 +127,9 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/jena/blob/b36baca4/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluator.java ---------------------------------------------------------------------- diff --git a/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluator.java b/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluator.java index ab8ea1d..c700090 100644 --- a/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluator.java +++ b/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluator.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; /** * SecurityEvaluator. http://git-wip-us.apache.org/repos/asf/jena/blob/b36baca4/jena-security/src/main/java/org/apache/jena/security/impl/ItemHolder.java ---------------------------------------------------------------------- diff --git a/jena-security/src/main/java/org/apache/jena/security/impl/ItemHolder.java b/jena-security/src/main/java/org/apache/jena/security/impl/ItemHolder.java index 33d3db9..0262001 100644 --- a/jena-security/src/main/java/org/apache/jena/security/impl/ItemHolder.java +++ b/jena-security/src/main/java/org/apache/jena/security/impl/ItemHolder.java @@ -21,7 +21,7 @@ import java.lang.reflect.Proxy; import java.util.LinkedHashSet; import java.util.Set; -import org.apache.commons.lang.ClassUtils; +import org.apache.commons.lang3.ClassUtils; /** * A class that holds the original item and the secured version of it. http://git-wip-us.apache.org/repos/asf/jena/blob/b36baca4/jena-security/src/main/java/org/apache/jena/security/impl/SecuredItemImpl.java ---------------------------------------------------------------------- diff --git a/jena-security/src/main/java/org/apache/jena/security/impl/SecuredItemImpl.java b/jena-security/src/main/java/org/apache/jena/security/impl/SecuredItemImpl.java index dac1036..01883c4 100644 --- a/jena-security/src/main/java/org/apache/jena/security/impl/SecuredItemImpl.java +++ b/jena-security/src/main/java/org/apache/jena/security/impl/SecuredItemImpl.java @@ -23,9 +23,9 @@ import com.hp.hpl.jena.vocabulary.RDF; import java.lang.reflect.Proxy; -import org.apache.commons.collections.map.LRUMap; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.collections4.map.LRUMap; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.jena.security.AccessDeniedException; import org.apache.jena.security.SecurityEvaluator; import org.apache.jena.security.SecurityEvaluator.Action;
