Browse Source

Merge pull request #18 from jochenberger/update-commons-lang

update commons-lang to version 3.1
pull/28/head
kallestenflo 11 years ago
parent
commit
41c13ecdf9
  1. 4
      json-path/pom.xml
  2. 4
      json-path/src/main/java/com/jayway/jsonpath/Criteria.java
  3. 2
      json-path/src/main/java/com/jayway/jsonpath/JsonModel.java
  4. 4
      json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
  5. 2
      json-path/src/main/java/com/jayway/jsonpath/spi/impl/AbstractJsonProvider.java
  6. 2
      json-path/src/test/java/com/jayway/jsonpath/JsonProviderTest.java
  7. 6
      pom.xml

4
json-path/pom.xml

@ -34,8 +34,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<dependency> <dependency>

4
json-path/src/main/java/com/jayway/jsonpath/Criteria.java

@ -18,8 +18,8 @@ import java.util.*;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static org.apache.commons.lang.Validate.notEmpty; import static org.apache.commons.lang3.Validate.notEmpty;
import static org.apache.commons.lang.Validate.notNull; import static org.apache.commons.lang3.Validate.notNull;
/** /**
* @author Kalle Stenflo * @author Kalle Stenflo

2
json-path/src/main/java/com/jayway/jsonpath/JsonModel.java

@ -28,7 +28,7 @@ import java.net.URL;
import java.util.*; import java.util.*;
import static java.util.Arrays.asList; 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 * A JsonModel holds a parsed JSON document and provides easy read and write operations. In contrast to the

4
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.HttpProviderFactory;
import com.jayway.jsonpath.spi.JsonProvider; import com.jayway.jsonpath.spi.JsonProvider;
import com.jayway.jsonpath.spi.JsonProviderFactory; import com.jayway.jsonpath.spi.JsonProviderFactory;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.io.*; import java.io.*;
import java.net.URL; import java.net.URL;
@ -32,7 +32,7 @@ import java.util.Map;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static org.apache.commons.lang.Validate.*; import static org.apache.commons.lang3.Validate.*;
/** /**
* <p/> * <p/>

2
json-path/src/main/java/com/jayway/jsonpath/spi/impl/AbstractJsonProvider.java

@ -15,7 +15,7 @@
package com.jayway.jsonpath.spi.impl; package com.jayway.jsonpath.spi.impl;
import com.jayway.jsonpath.spi.JsonProvider; import com.jayway.jsonpath.spi.JsonProvider;
import org.apache.commons.lang.SerializationUtils; import org.apache.commons.lang3.SerializationUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;

2
json-path/src/test/java/com/jayway/jsonpath/JsonProviderTest.java

@ -1,7 +1,7 @@
package com.jayway.jsonpath; package com.jayway.jsonpath;
import com.jayway.jsonpath.spi.impl.JacksonProvider; import com.jayway.jsonpath.spi.impl.JacksonProvider;
import org.apache.commons.lang.SerializationUtils; import org.apache.commons.lang3.SerializationUtils;
import org.junit.Test; import org.junit.Test;
import java.io.Serializable; import java.io.Serializable;

6
pom.xml

@ -215,9 +215,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang</artifactId> <artifactId>commons-lang3</artifactId>
<version>2.6</version> <version>3.1</version>
</dependency> </dependency>
<dependency> <dependency>

Loading…
Cancel
Save