diff --git a/.gitignore b/.gitignore
index 5ea3f9d..65a4e6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
*.log
dist/*
target/
+dependency-reduced-pom.xml
# Scala-IDE specific
.idea/*
diff --git a/build.xml b/build.xml
index 4e596c6..c22babc 100644
--- a/build.xml
+++ b/build.xml
@@ -20,7 +20,7 @@
-
+
@@ -35,32 +35,31 @@
-
+
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
-
+
-
+
diff --git a/lib/Multiaddr.jar b/lib/Multiaddr.jar
deleted file mode 100644
index ca8e504..0000000
Binary files a/lib/Multiaddr.jar and /dev/null differ
diff --git a/lib/Multihash.jar b/lib/Multihash.jar
deleted file mode 100644
index 65d02dc..0000000
Binary files a/lib/Multihash.jar and /dev/null differ
diff --git a/lib/multiaddr.jar b/lib/multiaddr.jar
new file mode 100644
index 0000000..d64dbf7
Binary files /dev/null and b/lib/multiaddr.jar differ
diff --git a/lib/multihash.jar b/lib/multihash.jar
new file mode 100644
index 0000000..2100237
Binary files /dev/null and b/lib/multihash.jar differ
diff --git a/pom.xml b/pom.xml
index c0f48ad..a7c180c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,14 +2,33 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- org.ipfs
+ io.ipfs
api
- 0.0.1-SNAPSHOT
+ v1.0.0
jar
java-ipfs-api
https://github.com/ipfs/java-ipfs-api
+
+ https://github.com/ipfs/java-ipfs-api/issues
+ GitHub Issues
+
+
+
+ https://github.com/ipfs/java-ipfs-api
+ scm:git:git://github.com/ipfs/java-ipfs-api.git
+ scm:git:git@github.com:ipfs/java-ipfs-api.git
+
+
+
+
+ MIT License
+ https://github.com/ipfs/java-ipfs-api/blob/master/LICENSE
+ repo
+
+
+
UTF-8
UTF-8
@@ -17,6 +36,13 @@
1.3
+
+
+ jitpack.io
+ https://jitpack.io
+
+
+
junit
@@ -28,6 +54,17 @@
org.hamcrest
hamcrest-core
${hamcrest.version}
+ test
+
+
+ com.github.multiformats
+ java-multiaddr
+ v1.0.0
+
+
+ com.github.multiformats
+ java-multihash
+ v1.0.0
@@ -42,6 +79,23 @@
1.8
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.19.1
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 3.0.2
+
+
+
+ true
+
+
+
+
diff --git a/src/main/java/org/ipfs/api/IPFS.java b/src/main/java/io/ipfs/api/IPFS.java
similarity index 99%
rename from src/main/java/org/ipfs/api/IPFS.java
rename to src/main/java/io/ipfs/api/IPFS.java
index 9d3604f..a803cb0 100755
--- a/src/main/java/org/ipfs/api/IPFS.java
+++ b/src/main/java/io/ipfs/api/IPFS.java
@@ -1,4 +1,7 @@
-package org.ipfs.api;
+package io.ipfs.api;
+
+import io.ipfs.multihash.Multihash;
+import io.ipfs.multiaddr.MultiAddress;
import java.io.*;
import java.net.*;
diff --git a/src/main/java/org/ipfs/api/JSONParser.java b/src/main/java/io/ipfs/api/JSONParser.java
similarity index 99%
rename from src/main/java/org/ipfs/api/JSONParser.java
rename to src/main/java/io/ipfs/api/JSONParser.java
index 40e6891..f3dcbfc 100644
--- a/src/main/java/org/ipfs/api/JSONParser.java
+++ b/src/main/java/io/ipfs/api/JSONParser.java
@@ -1,4 +1,4 @@
-package org.ipfs.api;
+package io.ipfs.api;
import java.util.*;
@@ -451,4 +451,4 @@ public static Object getValue(Object json, String path)
return json;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/ipfs/api/MerkleNode.java b/src/main/java/io/ipfs/api/MerkleNode.java
similarity index 98%
rename from src/main/java/org/ipfs/api/MerkleNode.java
rename to src/main/java/io/ipfs/api/MerkleNode.java
index da8b98d..ff50a01 100644
--- a/src/main/java/org/ipfs/api/MerkleNode.java
+++ b/src/main/java/io/ipfs/api/MerkleNode.java
@@ -1,4 +1,6 @@
-package org.ipfs.api;
+package io.ipfs.api;
+
+import io.ipfs.multihash.Multihash;
import java.util.*;
import java.util.stream.*;
diff --git a/src/main/java/org/ipfs/api/Multipart.java b/src/main/java/io/ipfs/api/Multipart.java
similarity index 99%
rename from src/main/java/org/ipfs/api/Multipart.java
rename to src/main/java/io/ipfs/api/Multipart.java
index 8983803..d911e0d 100755
--- a/src/main/java/org/ipfs/api/Multipart.java
+++ b/src/main/java/io/ipfs/api/Multipart.java
@@ -1,4 +1,4 @@
-package org.ipfs.api;
+package io.ipfs.api;
import java.io.*;
import java.net.*;
diff --git a/src/main/java/org/ipfs/api/NamedStreamable.java b/src/main/java/io/ipfs/api/NamedStreamable.java
similarity index 99%
rename from src/main/java/org/ipfs/api/NamedStreamable.java
rename to src/main/java/io/ipfs/api/NamedStreamable.java
index cabc8af..699b5f0 100755
--- a/src/main/java/org/ipfs/api/NamedStreamable.java
+++ b/src/main/java/io/ipfs/api/NamedStreamable.java
@@ -1,4 +1,4 @@
-package org.ipfs.api;
+package io.ipfs.api;
import java.io.*;
import java.net.*;
diff --git a/src/test/java/org/ipfs/api/APITests.java b/src/test/java/io/ipfs/api/APITest.java
similarity index 96%
rename from src/test/java/org/ipfs/api/APITests.java
rename to src/test/java/io/ipfs/api/APITest.java
index a6cb1c7..c2b1212 100755
--- a/src/test/java/org/ipfs/api/APITests.java
+++ b/src/test/java/io/ipfs/api/APITest.java
@@ -1,4 +1,7 @@
-package org.ipfs.api;
+package io.ipfs.api;
+
+import io.ipfs.multihash.Multihash;
+import io.ipfs.multiaddr.MultiAddress;
import java.io.*;
import java.nio.file.*;
@@ -6,7 +9,7 @@
import static org.junit.Assert.assertTrue;
-public class APITests {
+public class APITest {
private final IPFS ipfs = new IPFS(new MultiAddress("/ip4/127.0.0.1/tcp/5001"));
@@ -152,14 +155,14 @@ public void pinTest() {
public void indirectPinTest() {
try {
Multihash EMPTY = ipfs.object._new(Optional.empty()).hash;
- org.ipfs.api.MerkleNode data = ipfs.object.patch(EMPTY, "set-data", Optional.of("childdata".getBytes()), Optional.empty(), Optional.empty());
+ io.ipfs.api.MerkleNode data = ipfs.object.patch(EMPTY, "set-data", Optional.of("childdata".getBytes()), Optional.empty(), Optional.empty());
Multihash child = data.hash;
- org.ipfs.api.MerkleNode tmp1 = ipfs.object.patch(EMPTY, "set-data", Optional.of("parent1_data".getBytes()), Optional.empty(), Optional.empty());
+ io.ipfs.api.MerkleNode tmp1 = ipfs.object.patch(EMPTY, "set-data", Optional.of("parent1_data".getBytes()), Optional.empty(), Optional.empty());
Multihash parent1 = ipfs.object.patch(tmp1.hash, "add-link", Optional.empty(), Optional.of(child.toString()), Optional.of(child)).hash;
ipfs.pin.add(parent1);
- org.ipfs.api.MerkleNode tmp2 = ipfs.object.patch(EMPTY, "set-data", Optional.of("parent2_data".getBytes()), Optional.empty(), Optional.empty());
+ io.ipfs.api.MerkleNode tmp2 = ipfs.object.patch(EMPTY, "set-data", Optional.of("parent2_data".getBytes()), Optional.empty(), Optional.empty());
Multihash parent2 = ipfs.object.patch(tmp2.hash, "add-link", Optional.empty(), Optional.of(child.toString()), Optional.of(child)).hash;
ipfs.pin.add(parent2);
ipfs.pin.rm(parent1, true);