diff --git a/json-path/pom.xml b/json-path/pom.xml index 8f06999d..4d534b4e 100644 --- a/json-path/pom.xml +++ b/json-path/pom.xml @@ -34,8 +34,8 @@ - commons-lang - commons-lang + org.apache.commons + commons-lang3 diff --git a/json-path/src/main/java/com/jayway/jsonpath/Criteria.java b/json-path/src/main/java/com/jayway/jsonpath/Criteria.java index 222c9dfa..8e67cf10 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/Criteria.java +++ b/json-path/src/main/java/com/jayway/jsonpath/Criteria.java @@ -18,8 +18,8 @@ import java.util.*; import java.util.regex.Pattern; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.notEmpty; -import static org.apache.commons.lang.Validate.notNull; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; /** * @author Kalle Stenflo diff --git a/json-path/src/main/java/com/jayway/jsonpath/JsonModel.java b/json-path/src/main/java/com/jayway/jsonpath/JsonModel.java index 5981c760..e9971b0a 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/JsonModel.java +++ b/json-path/src/main/java/com/jayway/jsonpath/JsonModel.java @@ -28,7 +28,7 @@ import java.net.URL; import java.util.*; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.*; +import static org.apache.commons.lang3.Validate.*; /** * A JsonModel holds a parsed JSON document and provides easy read and write operations. In contrast to the diff --git a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java index 5af8a171..cb708788 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java +++ b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java @@ -22,7 +22,7 @@ import com.jayway.jsonpath.internal.filter.PathTokenFilter; import com.jayway.jsonpath.spi.HttpProviderFactory; import com.jayway.jsonpath.spi.JsonProvider; import com.jayway.jsonpath.spi.JsonProviderFactory; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.*; import java.net.URL; @@ -32,7 +32,7 @@ import java.util.Map; import java.util.regex.Pattern; import static java.util.Arrays.asList; -import static org.apache.commons.lang.Validate.*; +import static org.apache.commons.lang3.Validate.*; /** *

diff --git a/json-path/src/main/java/com/jayway/jsonpath/spi/impl/AbstractJsonProvider.java b/json-path/src/main/java/com/jayway/jsonpath/spi/impl/AbstractJsonProvider.java index 10951b84..c0abb31e 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/spi/impl/AbstractJsonProvider.java +++ b/json-path/src/main/java/com/jayway/jsonpath/spi/impl/AbstractJsonProvider.java @@ -15,7 +15,7 @@ package com.jayway.jsonpath.spi.impl; import com.jayway.jsonpath.spi.JsonProvider; -import org.apache.commons.lang.SerializationUtils; +import org.apache.commons.lang3.SerializationUtils; import java.io.Serializable; import java.util.List; diff --git a/json-path/src/test/java/com/jayway/jsonpath/JsonProviderTest.java b/json-path/src/test/java/com/jayway/jsonpath/JsonProviderTest.java index c87d56b0..97949795 100644 --- a/json-path/src/test/java/com/jayway/jsonpath/JsonProviderTest.java +++ b/json-path/src/test/java/com/jayway/jsonpath/JsonProviderTest.java @@ -1,7 +1,7 @@ package com.jayway.jsonpath; import com.jayway.jsonpath.spi.impl.JacksonProvider; -import org.apache.commons.lang.SerializationUtils; +import org.apache.commons.lang3.SerializationUtils; import org.junit.Test; import java.io.Serializable; diff --git a/pom.xml b/pom.xml index e3c9bb00..87ea1607 100644 --- a/pom.xml +++ b/pom.xml @@ -215,9 +215,9 @@ - commons-lang - commons-lang - 2.6 + org.apache.commons + commons-lang3 + 3.1