Repository: giraph Updated Branches: refs/heads/trunk 6903248d4 -> 5ed0d65dd
JIRA-1153 closes 43 Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/5ed0d65d Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/5ed0d65d Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/5ed0d65d Branch: refs/heads/trunk Commit: 5ed0d65dd3b79a990f8f8c4974c3b20c82964e50 Parents: 6903248 Author: Dionysios Logothetis <dionys...@fb.com> Authored: Thu Aug 24 11:15:53 2017 -0700 Committer: Avery Ching <ach...@fb.com> Committed: Thu Aug 24 11:15:53 2017 -0700 ---------------------------------------------------------------------- .../apache/giraph/io/formats/multi/EdgeInputFormatDescription.java | 2 +- .../giraph/io/formats/multi/MappingInputFormatDescription.java | 2 +- .../giraph/io/formats/multi/VertexInputFormatDescription.java | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/5ed0d65d/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/EdgeInputFormatDescription.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/EdgeInputFormatDescription.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/EdgeInputFormatDescription.java index acc240d..9760c09 100644 --- a/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/EdgeInputFormatDescription.java +++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/EdgeInputFormatDescription.java @@ -116,7 +116,7 @@ public class EdgeInputFormatDescription<I extends WritableComparable, Lists.newArrayListWithCapacity(inputFormatsJson.length()); for (int i = 0; i < inputFormatsJson.length(); i++) { descriptions.add(new EdgeInputFormatDescription<I, E>( - inputFormatsJson.getString(i))); + inputFormatsJson.getJSONArray(i).toString())); } return descriptions; } catch (JSONException e) { http://git-wip-us.apache.org/repos/asf/giraph/blob/5ed0d65d/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/MappingInputFormatDescription.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/MappingInputFormatDescription.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/MappingInputFormatDescription.java index 6a3ba91..ded3503 100644 --- a/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/MappingInputFormatDescription.java +++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/MappingInputFormatDescription.java @@ -124,7 +124,7 @@ public class MappingInputFormatDescription<I extends WritableComparable, Lists.newArrayListWithCapacity(inputFormatsJson.length()); for (int i = 0; i < inputFormatsJson.length(); i++) { descriptions.add(new MappingInputFormatDescription<I, V, E, B>( - inputFormatsJson.getString(i))); + inputFormatsJson.getJSONArray(i).toString())); } return descriptions; } catch (JSONException e) { http://git-wip-us.apache.org/repos/asf/giraph/blob/5ed0d65d/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/VertexInputFormatDescription.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/VertexInputFormatDescription.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/VertexInputFormatDescription.java index e86f9ed..0359e98 100644 --- a/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/VertexInputFormatDescription.java +++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/multi/VertexInputFormatDescription.java @@ -120,7 +120,7 @@ public class VertexInputFormatDescription<I extends WritableComparable, Lists.newArrayListWithCapacity(inputFormatsJson.length()); for (int i = 0; i < inputFormatsJson.length(); i++) { descriptions.add(new VertexInputFormatDescription<I, V, E>( - inputFormatsJson.getString(i))); + inputFormatsJson.getJSONArray(i).toString())); } return descriptions; } catch (JSONException e) { http://git-wip-us.apache.org/repos/asf/giraph/blob/5ed0d65d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 91128f4..e2eff4b 100644 --- a/pom.xml +++ b/pom.xml @@ -340,7 +340,7 @@ under the License. <dep.jaxb-impl.version>2.2.4-1</dep.jaxb-impl.version> <dep.jersey.version>1.17</dep.jersey.version> <dep.jetty.version>6.1.26</dep.jetty.version> - <dep.json.version>20090211</dep.json.version> + <dep.json.version>20160810</dep.json.version> <dep.junit.version>4.11</dep.junit.version> <dep.jython.version>2.5.3</dep.jython.version> <dep.kryo.version>3.0.1</dep.kryo.version>
