set JitPack dependencies; rename classes as discussed in #1

Author: celeduc

build.xml

@@ -20,7 +20,7 @@
   <target name="compile" depends="init" description="compile the source">
     <javac includeantruntime="false" srcdir="${src}" destdir="${build}" debug="true" debuglevel="lines,vars,source">
       <classpath>
-	<fileset dir="lib">
+        <fileset dir="lib">
           <include name="**/*.jar" />
         </fileset>
       </classpath>
@@ -35,32 +35,31 @@
     <manifestclasspath property="manifest_cp" jarfile="myjar.jar">
       <classpath refid="dep.runtime" />
     </manifestclasspath>
-    <jar jarfile="${dist}/IPFS.jar" basedir="${build}">
+    <jar jarfile="${dist}/ipfs.jar" basedir="${build}">
       <manifest>
-	  <attribute name="Class-Path" value="${manifest_cp}"/>
+        <attribute name="Class-Path" value="${manifest_cp}"/>
+        <attribute name="Implementation-Vendor" value="io.ipfs"/>
+        <attribute name="Implementation-Title" value="multiaddr"/>
+        <attribute name="Implementation-Version" value="1.0.0"/>
       </manifest>
     </jar>
-    <copy todir=".">
-      <fileset file="${dist}/IPFS.jar"/>
-    </copy>
   </target>
 
-
   <target name="test" depends="compile,dist">
     <junit printsummary="yes" fork="true" haltonfailure="yes">
       <jvmarg value="-Xmx1g"/>
       <classpath>
 	<pathelement location="lib/junit-4.11.jar" />
 	<pathelement location="lib/hamcrest-core-1.3.jar" />
-	<pathelement location="lib/Multihash.jar" />
-	<pathelement location="lib/Multiaddr.jar" />
-	<pathelement location="IPFS.jar" />
+	<pathelement location="lib/multihash.jar" />
+	<pathelement location="lib/multiaddr.jar" />
+	<pathelement location="dist/ipfs.jar" />
       </classpath>
-      <test name="org.ipfs.api.APITests" haltonfailure="yes">
+      <test name="org.ipfs.api.APITest" haltonfailure="yes">
 	<formatter type="plain"/>
 	<formatter type="xml"/>
       </test>
-      </junit>
+    </junit>
   </target>
 
   <target name="clean" description="clean up">

pom.xml

@@ -57,13 +57,13 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>io.ipfs.multiformats</groupId>
-			<artifactId>multiaddr</artifactId>
+			<groupId>com.github.multiformats</groupId>
+			<artifactId>java-multiaddr</artifactId>
 			<version>v1.0.0</version>
 		</dependency>
 		<dependency>
-			<groupId>io.ipfs.multiformats</groupId>
-			<artifactId>multihash</artifactId>
+			<groupId>com.github.multiformats</groupId>
+			<artifactId>java-multihash</artifactId>
 			<version>v1.0.0</version>
 		</dependency>
 	</dependencies>

src/main/java/org/ipfs/api/IPFS.java

@@ -1,5 +1,8 @@
 package org.ipfs.api;
 
+import io.ipfs.multiaddr.Multihash;
+import io.ipfs.multiaddr.MultiAddress;
+
 import java.io.*;
 import java.net.*;
 import java.util.*;

src/main/java/org/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;
     }
-}
+}

src/main/java/org/ipfs/api/MerkleNode.java

@@ -1,5 +1,7 @@
 package org.ipfs.api;
 
+import io.ipfs.multihash.Multihash;
+
 import java.util.*;
 import java.util.stream.*;
 

src/test/java/org/ipfs/api/APITests.java

@@ -1,12 +1,15 @@
-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.*;
 import java.util.*;
 
 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"));