Merge pull request #63 from hashgraph/v0.2.0-tidyUp

Making sure all v0.2.0 changes are in master

.gitignore

@@ -1,5 +1,27 @@
-# Created by https://www.gitignore.io/api/java,linux,macos,maven,windows,eclipse,netbeans,intellij
-# Edit at https://www.gitignore.io/?templates=java,linux,macos,maven,windows,eclipse,netbeans,intellij
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+/target/
 
 ### Eclipse ###
 
@@ -71,32 +93,56 @@ local.properties
 
 .sts4-cache/
 
+
+# End of https://www.gitignore.io/api/eclipse
+
+# Created by https://www.gitignore.io/api/visualstudiocode
+
+### VisualStudioCode ###
+.vscode/
+
+# End of https://www.gitignore.io/api/visualstudiocode
+
+# Created by https://www.gitignore.io/api/macos
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+# End of https://www.gitignore.io/api/macos
+
+# Created by https://www.gitignore.io/api/intellij
+
 ### Intellij ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
+.idea/
 
 # Gradle and Maven with auto-import
 # When using Gradle or Maven with auto-import, you should exclude module files,
@@ -109,9 +155,6 @@ local.properties
 # CMake
 cmake-build-*/
 
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
 # File-based project format
 *.iws
 
@@ -124,9 +167,6 @@ out/
 # JIRA plugin
 atlassian-ide-plugin.xml
 
-# Cursive Clojure plugin
-.idea/replstate.xml
-
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties

dependency-reduced-pom.xml

@@ -4,10 +4,6 @@
   <groupId>com.hedera.hashgraph</groupId>
   <artifactId>java-sdk</artifactId>
   <name>hedera-sdk-java</name>
-<<<<<<< HEAD
-  <version>0.1.0</version>
-  <url>http://maven.apache.org</url>
-=======
   <version>0.2.0</version>
   <description>Java SDK for interacting with the Hedera API</description>
   <url>http://www.hedera.com</url>
@@ -29,7 +25,6 @@
     <developerConnection>scm:git:ssh://github.com:hashgraph/hedera-sdk-java.git</developerConnection>
     <url>http://github.com/hashgraph/hedera-sdk-java</url>
   </scm>
->>>>>>> 073dd1c... Merge pull request #30 from hashgraph/vnext-noexamples
   <build>
     <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
     <resources>
@@ -43,12 +38,7 @@
         <targetPath>${project.build.directory}</targetPath>
         <directory>${basedir}/src/main/resources</directory>
         <includes>
-<<<<<<< HEAD
-          <include>log4j.xml</include>
-          <include>simpleStorage.bin</include>
-=======
           <include>logback.xml</include>
->>>>>>> 073dd1c... Merge pull request #30 from hashgraph/vnext-noexamples
         </includes>
       </resource>
     </resources>
@@ -125,34 +115,6 @@
           </artifactSet>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>com.github.os72</groupId>
-        <artifactId>protoc-jar-maven-plugin</artifactId>
-        <version>3.6.0.1</version>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <protocArtifact>com.google.protobuf:protoc:3.6.1</protocArtifact>
-              <inputDirectories>
-                <include>${basedir}/src/main/proto</include>
-              </inputDirectories>
-              <outputTargets>
-                <outputTarget>
-                  <type>java</type>
-                </outputTarget>
-                <outputTarget>
-                  <type>grpc-java</type>
-                  <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.14.0</pluginArtifact>
-                </outputTarget>
-              </outputTargets>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
@@ -350,7 +312,7 @@
   </distributionManagement>
   <properties>
     <proto.version>3.6.1</proto.version>
-    <grpc.version>1.14.0</grpc.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <grpc.version>1.14.0</grpc.version>
   </properties>
 </project>

examples/pom.xml

@@ -5,11 +5,11 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.hedera.hashgraph</groupId>
-	<artifactId>java-sdk-examples</artifactId>
+	<artifactId>hedera-sdk-java-examples</artifactId>
 	<version>0.2.0</version>
 	<packaging>jar</packaging>
 
-	<name>hedera-sdk-java-examples</name>
+	<name>examples</name>
 	<description>Example usage of the java SDK for interacting with the Hedera API</description>
 	<url>http://www.hedera.com</url>
 
@@ -47,5 +47,21 @@
 			<artifactId>java-sdk</artifactId>
 			<version>0.2.0</version>
         </dependency>
+
+		<dependency>
+			<groupId>org.ethereum</groupId>
+			<artifactId>ethereumj-core</artifactId>
+			<version>1.6.3-RELEASE</version>
+			<exclusions>
+				<exclusion>
+					<groupId>ch.qos.logback</groupId>
+					<artifactId>logback-classic</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 </project>