Merge PR #871 with latest Development branch

.travis.yml

@@ -3,6 +3,24 @@ jdk: oraclejdk8
 
 script: mvn clean install -DskipTests
 
+os:
+  - linux
+  - osx
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo "put custom osx code in here"    ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "put custom linux code in here" ; fi
+
+matrix:
+  include:
+    - os: linux
+      jdk: oraclejdk8
+    - os: osx
+      osx_image: xcode9
+
+# -Dgpg.skip to not sign installer with gpg, if omitted add a -Dgpg.passphrase=thephrase or use encrypted entry in settings.xml see http://maven.apache.org/plugins/maven-gpg-plugin/usage.html
+script: mvn clean install -DskipTests -Dgpg.skip
+
 notifications:
   slack:
     rooms:

package/osx/finalize.sh → gui/package/sign.sh

@@ -44,7 +44,6 @@ cp "/Users/dev/vm_shared_windows/bundles/$exe" "/Users/dev/vm_shared_win10/$win6
 
 cd "$target_dir"
 
-
 gpg --digest-algo SHA256 --local-user [email protected] --output $mac.asc --detach-sig --armor $mac
 gpg --digest-algo SHA256 --local-user [email protected] --output $deb64.asc --detach-sig --armor $deb64
 gpg --digest-algo SHA256 --local-user [email protected] --output $deb32.asc --detach-sig --armor $deb32

package/win/Bisq.iss → gui/package/windows/Bisq.iss

@@ -3,7 +3,7 @@
 [Setup]
 AppId={{bisq}}
 AppName=Bisq
-AppVersion=0.5.3
+AppVersion=${project.version}
 AppVerName=Bisq
 AppPublisher=Bisq
 AppComments=Bisq

gui/pom.xml

@@ -127,7 +127,7 @@
                         <configuration>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>bundled</shadedClassifierName>
-                            <finalName>shaded</finalName>
+                            <finalName>${artifactId}-${version}-app</finalName>
                         </configuration>
                     </execution>
                 </executions>
@@ -252,7 +252,7 @@
                                             org.apache.maven.plugins:maven-deploy-plugin:2.7:maven-plugin:null:runtime:6dadfb75679ca010b41286794f737088ebfe12fd
                                         </urn>
                                         <urn>
-                                            org.apache.maven.plugins:maven-enforcer-plugin:1.4.1:maven-plugin:null:runtime:e9bd7df541415bfe587ce082458f9a48bf9b55b4
+                                            org.apache.maven.plugins:maven-enforcer-plugin:RELEASE:maven-plugin:null:runtime:e9bd7df541415bfe587ce082458f9a48bf9b55b4
                                         </urn>
                                         <urn>
                                             org.apache.maven.plugins:maven-install-plugin:2.4:maven-plugin:null:runtime:9d1316166fe4c313f56276935e08df11f45267c2
@@ -367,4 +367,4 @@
         </dependency>
 
     </dependencies>
-</project>
+</project>

pom.xml

@@ -225,6 +225,18 @@
             <version>1.30</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java-util</artifactId>
+            <version>3.3.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>