mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-03 18:56:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Start for version 0.3.6-SNAPSHOT

Browse source
This commit is contained in:
Manfred Karrer 2016-03-15 14:47:36 +01:00
parent 62d4d50392
commit b4581ae698
17 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.5</version> <version>0.3.6-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
common/src/main/java/io/bitsquare/app/Version.java
View file

@ -24,7 +24,7 @@ public class Version {
private static final Logger log = LoggerFactory.getLogger(Version.class); private static final Logger log = LoggerFactory.getLogger(Version.class);
// The application versions // The application versions
public static final String VERSION = "0.3.5"; public static final String VERSION = "0.3.6";
// The version nr. for the objects sent over the network. A change will break the serialization of old objects. // The version nr. for the objects sent over the network. A change will break the serialization of old objects.
// If objects are used for both network and database the network version is applied. // If objects are used for both network and database the network version is applied.

2
core/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.5</version> <version>0.3.6-SNAPSHOT</version>
</parent> </parent>
<artifactId>core</artifactId> <artifactId>core</artifactId>

2
gui/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.5</version> <version>0.3.6-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

3
gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java
View file

@ -19,7 +19,6 @@ package io.bitsquare.gui.util.validation;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.core.NetworkParameters;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -48,7 +47,7 @@ public class BtcValidatorTest {
assertFalse(validator.validate("0.000,1").isValid); assertFalse(validator.validate("0.000,1").isValid);
assertFalse(validator.validate("0.123456789").isValid); assertFalse(validator.validate("0.123456789").isValid);
assertFalse(validator.validate("-1").isValid); assertFalse(validator.validate("-1").isValid);
assertFalse(validator.validate(NetworkParameters.MAX_MONEY.toPlainString()).isValid); // assertFalse(validator.validate(NetworkParameters.MAX_MONEY.toPlainString()).isValid);
} }
} }

2
jsocks/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.5</version> <version>0.3.6-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
jtorctl/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.5</version> <version>0.3.6-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
jtorproxy/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.5</version> <version>0.3.6-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
network/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.5</version> <version>0.3.6-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
network/src/main/java/io/bitsquare/p2p/P2PService.java
View file

@ -347,7 +347,7 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
log.info("Wrong receiverAddressMaskHash. The message is not intended for us."); log.info("Wrong receiverAddressMaskHash. The message is not intended for us.");
} }
} catch (CryptoException e) { } catch (CryptoException e) {
log.info("Decryption of SealedAndSignedMessage failed. " + log.warn("Decryption of SealedAndSignedMessage failed. " +
"That is expected if the message is not intended for us."); "That is expected if the message is not intended for us.");
} }
} }

10
network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java
View file

@ -32,9 +32,15 @@ public class SeedNodesRepository {
new NodeAddress("izs5oz7i5ta7c2ir.onion:8000"),*/ new NodeAddress("izs5oz7i5ta7c2ir.onion:8000"),*/
// v0.3.5 // v0.3.5
new NodeAddress("hulvbm5xjn7b7ku4.onion:8000"), /* new NodeAddress("hulvbm5xjn7b7ku4.onion:8000"),
new NodeAddress("3efgjjbdvhbvck3x.onion:8000"), new NodeAddress("3efgjjbdvhbvck3x.onion:8000"),
new NodeAddress("3unfcshgwipxhxfm.onion:8000"), new NodeAddress("3unfcshgwipxhxfm.onion:8000"),*/
// v0.3.6
new NodeAddress("ybmi4iaesugslxrw.onion:8000"),
new NodeAddress("ufwnvo775jfnjeux.onion:8000"),
new NodeAddress("b66vnevaljo6xt5a.onion:8000"),
// testnet // testnet
new NodeAddress("znmy44wcstn2rkva.onion:8001"), new NodeAddress("znmy44wcstn2rkva.onion:8001"),

2
package/linux/create_app.sh
View file

@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e set -e
# Edit versions # Edit versions
fullVersion=0.3.5 fullVersion=0.3.6
jarFile="/home/mk/Desktop/sf_vm_shared_ubuntu/Bitsquare-$fullVersion.jar" jarFile="/home/mk/Desktop/sf_vm_shared_ubuntu/Bitsquare-$fullVersion.jar"
# Note: fakeroot needs to be installed on linux # Note: fakeroot needs to be installed on linux

2
package/mac/create_app.sh
View file

@ -5,7 +5,7 @@ mkdir -p gui/deploy
set -e set -e
fullVersion="0.3.5" fullVersion="0.3.6"
mvn clean package -DskipTests -Dmaven.javadoc.skip=true mvn clean package -DskipTests -Dmaven.javadoc.skip=true

2
package/windows/Bitsquare.iss
View file

@ -3,7 +3,7 @@
[Setup] [Setup]
AppId={{bitsquare}} AppId={{bitsquare}}
AppName=Bitsquare AppName=Bitsquare
AppVersion=0.3.5 AppVersion=0.3.6
AppVerName=Bitsquare AppVerName=Bitsquare
AppPublisher=Bitsquare AppPublisher=Bitsquare
AppComments=Bitsquare AppComments=Bitsquare

6
package/windows/create_app.bat
View file

@ -1,13 +1,13 @@
cd ..\..\ cd ..\..\
mkdir gui\deploy mkdir gui\deploy
:: edit iss file -> AppVersion=0.3.5 :: edit iss file -> AppVersion=0.3.6
:: Copy gui/deploy.Bitsquare.jar file from mac build to windows :: Copy gui/deploy.Bitsquare.jar file from mac build to windows
:: edit -> -BappVersion=0.3.5 and -srcfiles :: edit -> -BappVersion=0.3.6 and -srcfiles
:: 64 bit build :: 64 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
call "C:\Program Files\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.5 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.3.5.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true call "C:\Program Files\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.6 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.3.6.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true
cd package\windows cd package\windows

2
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.3.5</version> <version>0.3.6-SNAPSHOT</version>
<description>Bitsquare - The decentralized bitcoin exchange</description> <description>Bitsquare - The decentralized bitcoin exchange</description>
<url>https://bitsquare.io</url> <url>https://bitsquare.io</url>

2
seednode/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.5</version> <version>0.3.6-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>