Version 1.0.2 (#79)

* Update to actual dependencies

* Version 1.0.2

* Use direct version property

pom.xml

@@ -6,11 +6,11 @@
 
     <groupId>com.wavesplatform</groupId>
     <artifactId>wavesj</artifactId>
-    <version>${revision}</version>
+    <version>1.0.2</version>
     <packaging>jar</packaging>
 
     <properties>
-        <revision>1.0.1-SNAPSHOT</revision>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <name>WavesJ</name>
@@ -99,6 +99,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.9.1</version>
+                <configuration>
+                    <source>8</source>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -146,19 +149,14 @@
     <dependencies>
         <!-- Waves -->
         <dependency>
-            <groupId>im.mak</groupId>
+            <groupId>com.wavesplatform</groupId>
             <artifactId>waves-transactions</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3</version>
         </dependency>
         <dependency>
             <groupId>com.wavesplatform</groupId>
             <artifactId>protobuf-schemas</artifactId>
-            <version>1.2.6</version>
-        </dependency>
-        <dependency> <!-- todo remove after com.wavesplatform.protobuf-schemas 1.2.7 -->
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>3.12.2</version>
+            <version>1.2.10</version>
         </dependency>
 
         <!-- http client -->

src/main/java/com/wavesplatform/wavesj/AssetBalance.java

@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.Transaction;
-import im.mak.waves.transactions.common.AssetId;
+import com.wavesplatform.transactions.Transaction;
+import com.wavesplatform.transactions.common.AssetId;
 
 import java.util.Objects;
 

src/main/java/com/wavesplatform/wavesj/AssetDetails.java

@@ -2,10 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.account.Address;
-import im.mak.waves.transactions.account.PublicKey;
-import im.mak.waves.transactions.common.AssetId;
-import im.mak.waves.transactions.common.Id;
+import com.wavesplatform.transactions.account.Address;
+import com.wavesplatform.transactions.account.PublicKey;
+import com.wavesplatform.transactions.common.AssetId;
+import com.wavesplatform.transactions.common.Id;
 
 import java.util.Objects;
 

src/main/java/com/wavesplatform/wavesj/AssetDistribution.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.account.Address;
+import com.wavesplatform.transactions.account.Address;
 
 import java.util.Map;
 import java.util.Objects;

src/main/java/com/wavesplatform/wavesj/BalanceDetails.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.account.Address;
+import com.wavesplatform.transactions.account.Address;
 
 import java.util.Objects;
 

src/main/java/com/wavesplatform/wavesj/Block.java

@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.account.Address;
-import im.mak.waves.transactions.common.Base58String;
+import com.wavesplatform.transactions.account.Address;
+import com.wavesplatform.transactions.common.Base58String;
 
 import java.util.List;
 import java.util.Objects;

src/main/java/com/wavesplatform/wavesj/BlockHeaders.java

@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.account.Address;
-import im.mak.waves.transactions.common.Base58String;
+import com.wavesplatform.transactions.account.Address;
+import com.wavesplatform.transactions.common.Base58String;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/wavesplatform/wavesj/Node.java

@@ -4,16 +4,16 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.wavesplatform.transactions.LeaseTransaction;
+import com.wavesplatform.transactions.Transaction;
+import com.wavesplatform.transactions.WavesConfig;
+import com.wavesplatform.transactions.account.Address;
+import com.wavesplatform.transactions.common.*;
+import com.wavesplatform.transactions.data.DataEntry;
+import com.wavesplatform.transactions.serializers.json.JsonSerializer;
 import com.wavesplatform.wavesj.exceptions.NodeException;
 import com.wavesplatform.wavesj.json.TypeRef;
 import com.wavesplatform.wavesj.json.WavesJMapper;
-import im.mak.waves.transactions.WavesConfig;
-import im.mak.waves.transactions.account.Address;
-import im.mak.waves.transactions.LeaseTransaction;
-import im.mak.waves.transactions.Transaction;
-import im.mak.waves.transactions.common.*;
-import im.mak.waves.transactions.data.DataEntry;
-import im.mak.waves.transactions.serializers.json.JsonSerializer;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.HttpClient;
@@ -30,10 +30,13 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
 import java.util.regex.Pattern;
 
-import static im.mak.waves.transactions.serializers.json.JsonSerializer.JSON_MAPPER;
+import static com.wavesplatform.transactions.serializers.json.JsonSerializer.JSON_MAPPER;
 
 @SuppressWarnings("unused")
 public class Node {

src/main/java/com/wavesplatform/wavesj/ScriptDetails.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.common.Base64String;
+import com.wavesplatform.transactions.common.Base64String;
 
 import java.util.Objects;
 

src/main/java/com/wavesplatform/wavesj/ScriptInfo.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.common.Base64String;
+import com.wavesplatform.transactions.common.Base64String;
 
 import java.util.Map;
 import java.util.Objects;

src/main/java/com/wavesplatform/wavesj/StateChanges.java

@@ -2,11 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wavesplatform.wavesj.actions.*;
+import com.wavesplatform.transactions.data.DataEntry;
 import com.wavesplatform.wavesj.actions.Error;
-import im.mak.waves.transactions.data.DataEntry;
+import com.wavesplatform.wavesj.actions.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 @SuppressWarnings("unused")
 public class StateChanges {

src/main/java/com/wavesplatform/wavesj/TransactionDebugInfo.java

@@ -1,6 +1,6 @@
 package com.wavesplatform.wavesj;
 
-import im.mak.waves.transactions.Transaction;
+import com.wavesplatform.transactions.Transaction;
 
 import java.util.Objects;
 

src/main/java/com/wavesplatform/wavesj/TransactionInfo.java

@@ -1,7 +1,7 @@
 package com.wavesplatform.wavesj;
 
-import im.mak.waves.transactions.GenesisTransaction;
-import im.mak.waves.transactions.Transaction;
+import com.wavesplatform.transactions.GenesisTransaction;
+import com.wavesplatform.transactions.Transaction;
 
 import java.util.Objects;
 

src/main/java/com/wavesplatform/wavesj/TransactionStatus.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.common.Id;
+import com.wavesplatform.transactions.common.Id;
 
 import java.util.Objects;
 

src/main/java/com/wavesplatform/wavesj/actions/BurnAction.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.common.AssetId;
+import com.wavesplatform.transactions.common.AssetId;
 
 import java.util.Objects;
 

src/main/java/com/wavesplatform/wavesj/actions/IssueAction.java

@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.common.AssetId;
-import im.mak.waves.transactions.common.Base64String;
+import com.wavesplatform.transactions.common.AssetId;
+import com.wavesplatform.transactions.common.Base64String;
 
 import java.util.Objects;
 

src/main/java/com/wavesplatform/wavesj/actions/ReissueAction.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.common.AssetId;
+import com.wavesplatform.transactions.common.AssetId;
 
 import java.util.Objects;
 

src/main/java/com/wavesplatform/wavesj/actions/ScriptTransfer.java

@@ -2,9 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wavesplatform.transactions.common.AssetId;
+import com.wavesplatform.transactions.common.Recipient;
 import com.wavesplatform.wavesj.Common;
-import im.mak.waves.transactions.common.AssetId;
-import im.mak.waves.transactions.common.Recipient;
 
 import java.util.Objects;
 

src/main/java/com/wavesplatform/wavesj/actions/SponsorFeeAction.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import im.mak.waves.transactions.common.AssetId;
+import com.wavesplatform.transactions.common.AssetId;
 
 import java.util.Objects;
 

src/main/java/com/wavesplatform/wavesj/json/TypeRef.java

@@ -1,12 +1,12 @@
 package com.wavesplatform.wavesj.json;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.wavesplatform.transactions.LeaseTransaction;
+import com.wavesplatform.transactions.Transaction;
+import com.wavesplatform.transactions.account.Address;
+import com.wavesplatform.transactions.common.Alias;
+import com.wavesplatform.transactions.data.DataEntry;
 import com.wavesplatform.wavesj.*;
-import im.mak.waves.transactions.account.Address;
-import im.mak.waves.transactions.LeaseTransaction;
-import im.mak.waves.transactions.Transaction;
-import im.mak.waves.transactions.common.Alias;
-import im.mak.waves.transactions.data.DataEntry;
 
 import java.util.List;
 

src/main/java/com/wavesplatform/wavesj/json/WavesJModule.java

@@ -1,9 +1,10 @@
 package com.wavesplatform.wavesj.json;
 
+import com.wavesplatform.transactions.serializers.json.WavesTransactionsModule;
 import com.wavesplatform.wavesj.TransactionDebugInfo;
 import com.wavesplatform.wavesj.TransactionInfo;
-import com.wavesplatform.wavesj.json.deser.*;
-import im.mak.waves.transactions.serializers.json.WavesTransactionsModule;
+import com.wavesplatform.wavesj.json.deser.TransactionDebugInfoDeser;
+import com.wavesplatform.wavesj.json.deser.TransactionInfoDeser;
 
 public class WavesJModule extends WavesTransactionsModule {
     public WavesJModule() {

src/main/java/com/wavesplatform/wavesj/json/deser/TransactionDebugInfoDeser.java

@@ -5,10 +5,10 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.wavesplatform.transactions.Transaction;
 import com.wavesplatform.wavesj.ApplicationStatus;
-import com.wavesplatform.wavesj.TransactionDebugInfo;
 import com.wavesplatform.wavesj.StateChanges;
-import im.mak.waves.transactions.Transaction;
+import com.wavesplatform.wavesj.TransactionDebugInfo;
 
 import java.io.IOException;
 

src/main/java/com/wavesplatform/wavesj/json/deser/TransactionInfoDeser.java

@@ -5,9 +5,9 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.wavesplatform.transactions.Transaction;
 import com.wavesplatform.wavesj.ApplicationStatus;
 import com.wavesplatform.wavesj.TransactionInfo;
-import im.mak.waves.transactions.Transaction;
 
 import java.io.IOException;