Merge pull request #170 from ipfs-shipyard/fix/ipfs-v0.5.0

Update to ipfs v0.5.0

Author: ianopolous

.github/workflows/ant.yml

@@ -0,0 +1,22 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+    - name: Install and run ipfs
+      run: ./install-run-ipfs.sh
+    - name: Build with Ant
+      run: ant -noinput -buildfile build.xml dist
+    - name: Run tests
+      timeout-minutes: 10
+      run: ant -noinput -buildfile build.xml test

.travis.yml

@@ -40,26 +40,29 @@
         <attribute name="Class-Path" value="${manifest_cp}"/>
         <attribute name="Implementation-Vendor" value="io.ipfs"/>
         <attribute name="Implementation-Title" value="api"/>
-        <attribute name="Implementation-Version" value="1.2.0"/>
+        <attribute name="Implementation-Version" value="1.3.0"/>
       </manifest>
     </jar>
   </target>
 
   <target name="test" depends="compile,dist">
-    <junit printsummary="yes" fork="true" haltonfailure="yes">
+    <junit printsummary="yes" fork="true">
       <jvmarg value="-Xmx1g"/>
       <classpath>
-	<pathelement location="lib/junit-4.11.jar" />
+	<pathelement location="lib/junit-4.12.jar" />
 	<pathelement location="lib/hamcrest-core-1.3.jar" />
-	<pathelement location="lib/multihash.jar" />
-	<pathelement location="lib/multiaddr.jar" />
 	<pathelement location="dist/ipfs.jar" />
       </classpath>
-      <test name="io.ipfs.api.APITest" haltonfailure="yes">
+      <batchtest haltonfailure="yes">
+	<fileset dir="src/test/java">
+	</fileset>
 	<formatter type="plain"/>
 	<formatter type="xml"/>
-      </test>
+      </batchtest>
     </junit>
+    <exec executable="./print_test_errors.sh" failonerror="true">
+      <arg value="./TEST*"/>
+    </exec>
   </target>
 
   <target name="clean" description="clean up">

build.xml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   ipfs-daemon:
-    image: 'ipfs/go-ipfs:v0.4.16'
+    image: 'ipfs/go-ipfs:v0.6.0'
     ports:
       - "4001:4001"
       - "5001:5001"

docker-compose.yml

@@ -0,0 +1,6 @@
+#! /bin/sh
+wget https://dist.ipfs.io/go-ipfs/v0.6.0/go-ipfs_v0.6.0_linux-amd64.tar.gz -O /tmp/go-ipfs_linux-amd64.tar.gz
+tar -xvf /tmp/go-ipfs_linux-amd64.tar.gz
+export PATH=$PATH:$PWD/go-ipfs/
+ipfs init
+ipfs daemon --enable-pubsub-experiment --routing=dhtclient &

install-run-ipfs.sh

@@ -4,7 +4,7 @@
 
     <groupId>com.github.ipfs</groupId>
     <artifactId>java-ipfs-http-client</artifactId>
-	<version>v1.2.3</version>
+	<version>v1.3.0</version>
 	<packaging>jar</packaging>
 
 	<name>java-ipfs-http-client</name>
@@ -34,7 +34,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <version.junit>4.12</version.junit>
         <version.hamcrest>1.3</version.hamcrest>
-        <version.multiaddr>v1.3.1</version.multiaddr>
+        <version.multiaddr>v1.4.1</version.multiaddr>
 	</properties>
 
 	<repositories>