Merge pull request #18 from celeduc/mavenize

ianopolous · web-flow · commit 659bafe22423 · 2016-12-11T20:43:31.000Z
Mavenize
diff --git 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
@@ -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="api"/>
+        <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="io.ipfs.api.APITest" haltonfailure="yes">
 	<formatter type="plain"/>
 	<formatter type="xml"/>
       </test>
-      </junit>
+    </junit>
   </target>
 
   <target name="clean" description="clean up">
diff --git a/lib/Multiaddr.jar b/lib/Multiaddr.jar
diff --git a/lib/Multihash.jar b/lib/Multihash.jar
diff --git a/lib/multiaddr.jar b/lib/multiaddr.jar
diff --git a/lib/multihash.jar b/lib/multihash.jar
diff --git a/pom.xml b/pom.xml
@@ -2,21 +2,47 @@
 	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>
+	<groupId>io.ipfs</groupId>
 	<artifactId>api</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>v1.0.0</version>
 	<packaging>jar</packaging>
 
 	<name>java-ipfs-api</name>
 	<url>https://github.com/ipfs/java-ipfs-api</url>
 
+	<issueManagement>
+ 		<url>https://github.com/ipfs/java-ipfs-api/issues</url>
+ 		<system>GitHub Issues</system>
+ 	</issueManagement>
+
+ 	<scm>
+ 		<url>https://github.com/ipfs/java-ipfs-api</url>
+ 		<connection>scm:git:git://github.com/ipfs/java-ipfs-api.git</connection>
+ 		<developerConnection>scm:git:git@github.com:ipfs/java-ipfs-api.git</developerConnection>
+ 	</scm>
+
+ 	<licenses>
+ 		<license>
+ 			<name>MIT License</name>
+ 			<url>https://github.com/ipfs/java-ipfs-api/blob/master/LICENSE</url>
+ 			<distribution>repo</distribution>
+ 		</license>
+ 	</licenses>
+
 	<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>
 
+	<repositories>
+		<repository>
+			<id>jitpack.io</id>
+			<url>https://jitpack.io</url>
+		</repository>
+	</repositories>
+
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
@@ -28,6 +54,17 @@
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-core</artifactId>
 			<version>${hamcrest.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.github.multiformats</groupId>
+			<artifactId>java-multiaddr</artifactId>
+			<version>v1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.multiformats</groupId>
+			<artifactId>java-multihash</artifactId>
+			<version>v1.0.0</version>
 		</dependency>
 	</dependencies>
 
@@ -42,6 +79,23 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.19.1</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.0.2</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/src/main/java/io/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/io/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;
     }
-}
+}
diff --git a/src/main/java/io/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/io/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/io/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/io/ipfs/api/APITest.java b/src/test/java/io/ipfs/api/APITest.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"));
 
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.ipfs.api;`
	`1`	`+package io.ipfs.api;`
`2`	`2`
`3`	`3`	`import java.util.*;`
`4`	`4`
`@@ -451,4 +451,4 @@ public static Object getValue(Object json, String path)`
`451`	`451`
`452`	`452`	`return json;`
`453`	`453`	`}`
`454`		`-}`
	`454`	`+}`