Merge pull request #3 from ottuzzi/mavenized

Mavenized
ipfs-shipyard · Oct 29, 2015 · 647f80a · 647f80a
2 parents a27ef5b + 7d1298d
commit 647f80a
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 39 deletions.
diff --git a/Makefile b/Makefile
diff --git a/lib/hamcrest-core-1.3.jar b/lib/hamcrest-core-1.3.jar
diff --git a/lib/junit-4.12.jar b/lib/junit-4.12.jar
diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,47 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.ipfs</groupId>
+	<artifactId>api</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>java-ipfs-api</name>
+	<url>https://github.com/ipfs/java-ipfs-api</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<junit.version>4.12</junit.version>
+		<hamcrest.version>1.3</hamcrest.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-core</artifactId>
+			<version>${hamcrest.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/src/org/ipfs/Base58.java → src/main/java/org/ipfs/api/Base58.java b/src/org/ipfs/Base58.java → src/main/java/org/ipfs/api/Base58.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 /**
  * Copyright 2011 Google Inc.

diff --git a/src/org/ipfs/IPFS.java → src/main/java/org/ipfs/api/IPFS.java b/src/org/ipfs/IPFS.java → src/main/java/org/ipfs/api/IPFS.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.io.*;
 import java.net.*;

diff --git a/src/org/ipfs/JSONParser.java → src/main/java/org/ipfs/api/JSONParser.java b/src/org/ipfs/JSONParser.java → src/main/java/org/ipfs/api/JSONParser.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.util.*;
 

diff --git a/src/org/ipfs/MerkleNode.java → src/main/java/org/ipfs/api/MerkleNode.java b/src/org/ipfs/MerkleNode.java → src/main/java/org/ipfs/api/MerkleNode.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.util.*;
 import java.util.stream.*;

diff --git a/src/org/ipfs/MultiAddress.java → src/main/java/org/ipfs/api/MultiAddress.java b/src/org/ipfs/MultiAddress.java → src/main/java/org/ipfs/api/MultiAddress.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.io.*;
 import java.util.*;

diff --git a/src/org/ipfs/Multihash.java → src/main/java/org/ipfs/api/Multihash.java b/src/org/ipfs/Multihash.java → src/main/java/org/ipfs/api/Multihash.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.io.*;
 import java.util.*;

diff --git a/src/org/ipfs/Multipart.java → src/main/java/org/ipfs/api/Multipart.java b/src/org/ipfs/Multipart.java → src/main/java/org/ipfs/api/Multipart.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.io.*;
 import java.net.*;

diff --git a/src/org/ipfs/NamedStreamable.java → ...in/java/org/ipfs/api/NamedStreamable.java b/src/org/ipfs/NamedStreamable.java → ...in/java/org/ipfs/api/NamedStreamable.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.io.*;
 import java.util.*;

diff --git a/src/org/ipfs/Protocol.java → src/main/java/org/ipfs/api/Protocol.java b/src/org/ipfs/Protocol.java → src/main/java/org/ipfs/api/Protocol.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.io.*;
 import java.net.*;

diff --git a/test/org/ipfs/test/Test.java → src/test/java/org/ipfs/api/Test.java b/test/org/ipfs/test/Test.java → src/test/java/org/ipfs/api/Test.java
@@ -1,9 +1,12 @@
-package org.ipfs.test;
+package org.ipfs.api;
 
-import org.ipfs.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
 
 public class Test {