Skip to content

Commit 597fff8

Browse files
committed
Update dependencies, kubo install script, fix name test
Upgrade to Java 11
1 parent f757426 commit 597fff8

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<junit printsummary="yes" fork="true">
5050
<jvmarg value="-Xmx1g"/>
5151
<classpath>
52-
<pathelement location="lib/junit-4.12.jar" />
53-
<pathelement location="lib/hamcrest-core-1.3.jar" />
52+
<pathelement location="lib/junit-4.13.2.jar" />
53+
<pathelement location="lib/hamcrest-2.2.jar" />
5454
<pathelement location="dist/ipfs.jar" />
5555
</classpath>
5656
<batchtest haltonfailure="yes">

install-run-ipfs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
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
2+
wget https://dist.ipfs.io/kubo/v0.15.0/kubo_v0.15.0_linux-amd64.tar.gz -O /tmp/go-ipfs_linux-amd64.tar.gz
33
tar -xvf /tmp/go-ipfs_linux-amd64.tar.gz
44
export PATH=$PATH:$PWD/go-ipfs/
55
ipfs init

lib/cid.jar

156 Bytes
Binary file not shown.

lib/hamcrest-core-1.3.jar

-44 KB
Binary file not shown.

lib/junit-4.12.jar

-308 KB
Binary file not shown.

lib/multibase.jar

0 Bytes
Binary file not shown.

lib/multihash.jar

418 Bytes
Binary file not shown.

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
<properties>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3434
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
35-
<version.junit>4.13.1</version.junit>
36-
<version.hamcrest>1.3</version.hamcrest>
37-
<version.multiaddr>v1.4.1</version.multiaddr>
35+
<version.junit>4.13.2</version.junit>
36+
<version.hamcrest>2.2</version.hamcrest>
37+
<version.multiaddr>v1.4.2</version.multiaddr>
3838
</properties>
3939

4040
<repositories>
@@ -58,7 +58,7 @@
5858
</dependency>
5959
<dependency>
6060
<groupId>org.hamcrest</groupId>
61-
<artifactId>hamcrest-core</artifactId>
61+
<artifactId>hamcrest</artifactId>
6262
<version>${version.hamcrest}</version>
6363
<scope>test</scope>
6464
</dependency>
@@ -71,8 +71,8 @@
7171
<artifactId>maven-compiler-plugin</artifactId>
7272
<version>3.8.0</version>
7373
<configuration>
74-
<source>1.8</source>
75-
<target>1.8</target>
74+
<source>11</source>
75+
<target>11</target>
7676
</configuration>
7777
</plugin>
7878
<plugin>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public List<Multihash> update(Multihash existing, Multihash modified, boolean un
222222
}
223223
}
224224

225-
/* 'ipfs repo' is a plumbing command used to manipulate the repo.
225+
/* 'ipfs key' is a command for dealing with IPNS keys.
226226
*/
227227
public class Key {
228228
public KeyInfo gen(String name, Optional<String> type, Optional<String> size) throws IOException {

src/test/java/io/ipfs/api/APITest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,14 +607,14 @@ public void fileContentsTest() throws IOException {
607607
}
608608

609609
@Test
610-
@Ignore("name test may hang forever")
610+
// @Ignore("name test may hang forever")
611611
public void nameTest() throws IOException {
612612
MerkleNode pointer = new MerkleNode("QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB");
613613
Map pub = ipfs.name.publish(pointer.hash);
614614
String name = "key" + System.nanoTime();
615615
Object gen = ipfs.key.gen(name, Optional.of("rsa"), Optional.of("2048"));
616616
Map mykey = ipfs.name.publish(pointer.hash, Optional.of(name));
617-
String resolved = ipfs.name.resolve(Multihash.fromBase58((String) pub.get("Name")));
617+
String resolved = ipfs.name.resolve(Cid.decode((String) pub.get("Name")));
618618
}
619619

620620
@Test

0 commit comments

Comments
 (0)