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

Prepare for release 0.4.9.2

Browse source
This commit is contained in:
Manfred Karrer 2016-07-30 00:32:40 +02:00
parent 6f59b7c87c
commit e3ce6e9125
26 changed files with 46 additions and 47 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>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.4.9.1</version>
<version>0.4.9.2</version>
</parent>
<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);
// The application versions
public static final String VERSION = "0.4.9.1";
public static final String VERSION = "0.4.9.2";
// 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.

2
core/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.4.9.1</version>
<version>0.4.9.2</version>
</parent>
<artifactId>core</artifactId>

2
core/src/main/java/io/bitsquare/btc/WalletService.java
View file

@ -170,7 +170,7 @@ public class WalletService {
backupWallet();
final Socks5Proxy socks5Proxy = preferences.getUseTorForBitcoinJ() ? socks5ProxyProvider.getSocks5Proxy() : null;
log.info("Use socks5Proxy for bitcoinj: " + socks5Proxy);
log.debug("Use socks5Proxy for bitcoinj: " + socks5Proxy);
// If seed is non-null it means we are restoring from backup.
walletAppKit = new WalletAppKitBitSquare(params, socks5Proxy, walletDir, "Bitsquare") {

6
doc/build.md
View file

@ -71,11 +71,11 @@ You need to get the Bitsquare dependencies first as we need to copy the BountyCa
### 4. Copy the jdkfix jar file
Copy the jdkfix-0.4.9.1.jar from the Bitsquare jdkfix/target directory to $JAVA_HOME/jre/lib/ext/.
jdkfix-0.4.9.1.jar includes a bugfix of the SortedList class which will be released with the next JDK version.
Copy the jdkfix-0.4.9.2.jar from the Bitsquare jdkfix/target directory to $JAVA_HOME/jre/lib/ext/.
jdkfix-0.4.9.2.jar includes a bugfix of the SortedList class which will be released with the next JDK version.
We need to load that class before the default java class. This step will be removed once the bugfix is in the official JDK.
$ sudo cp bitsquare/jdkfix/target/jdkfix-0.4.9.1.jar $JAVA_HOME/jre/lib/ext/jdkfix-0.4.9.1.jar
$ sudo cp bitsquare/jdkfix/target/jdkfix-0.4.9.2.jar $JAVA_HOME/jre/lib/ext/jdkfix-0.4.9.2.jar
### 5. Copy the BountyCastle provider jar file

2
gui/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.4.9.1</version>
<version>0.4.9.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

30
gui/src/main/resources/logback.xml
View file

@ -10,21 +10,21 @@
<appender-ref ref="CONSOLE_APPENDER"/>
</root>
<logger name="io.bitsquare.storage.Storage" level="WARN"/>
<logger name="io.bitsquare.storage.FileManager" level="WARN"/>
<logger name="io.bitsquare.locale.BSResources" level="ERROR"/>
<!--<logger name="io.bitsquare.p2p" level="WARN"/>-->
<logger name="io.bitsquare.btc.pricefeed" level="WARN"/>
<logger name="io.bitsquare.storage.Storage" level="WARN"/>
<logger name="io.bitsquare.storage.FileManager" level="WARN"/>
<logger name="io.bitsquare.p2p.peers" level="WARN"/>
<logger name="io.bitsquare.p2p.peers.getdata" level="WARN"/>
<logger name="io.bitsquare.p2p.peers.keepalive" level="WARN"/>
<logger name="io.bitsquare.p2p.peers.peerexchange" level="WARN"/>
<!-- <logger name="io.bitsquare.storage.Storage" level="WARN"/>
<logger name="io.bitsquare.storage.FileManager" level="WARN"/>
<logger name="io.bitsquare.locale.BSResources" level="ERROR"/>
&lt;!&ndash;<logger name="io.bitsquare.p2p" level="WARN"/>&ndash;&gt;
<logger name="io.bitsquare.btc.pricefeed" level="WARN"/>
<logger name="io.bitsquare.storage.Storage" level="WARN"/>
<logger name="io.bitsquare.storage.FileManager" level="WARN"/>
<logger name="io.bitsquare.p2p.peers" level="WARN"/>
<logger name="io.bitsquare.p2p.peers.getdata" level="WARN"/>
<logger name="io.bitsquare.p2p.peers.keepalive" level="WARN"/>
<logger name="io.bitsquare.p2p.peers.peerexchange" level="WARN"/>-->
<!--<logger name="io.bitsquare.p2p.network" level="WARN"/>-->
<!-- <logger name="io.bitsquare.p2p.P2PService" level="WARN"/>-->

2
headless/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.4.9.1</version>
<version>0.4.9.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jdkfix/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.4.9.1</version>
<version>0.4.9.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jsocks/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.4.9.1</version>
<version>0.4.9.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jtorctl/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.4.9.1</version>
<version>0.4.9.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jtorproxy/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.4.9.1</version>
<version>0.4.9.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
monitor/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.4.9.1</version>
<version>0.4.9.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
network/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.4.9.1</version>
<version>0.4.9.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

6
network/src/main/java/io/bitsquare/http/HttpClient.java
View file

@ -57,13 +57,13 @@ public class HttpClient {
socks5Proxy = socks5ProxyProvider.getSocks5Proxy();
if (ignoreSocks5Proxy) {
log.info("Use clear net for HttpClient because ignoreSocks5Proxy is set to true");
log.debug("Use clear net for HttpClient because ignoreSocks5Proxy is set to true");
return requestWithGETNoProxy(param);
} else if (socks5Proxy == null) {
log.info("Use clear net for HttpClient because socks5Proxy is null");
log.debug("Use clear net for HttpClient because socks5Proxy is null");
return requestWithGETNoProxy(param);
} else {
log.info("Use socks5Proxy for HttpClient: " + socks5Proxy);
log.debug("Use socks5Proxy for HttpClient: " + socks5Proxy);
return requestWithGETProxy(param, socks5Proxy);
}
}

4
network/src/main/java/io/bitsquare/p2p/network/Connection.java
View file

@ -180,7 +180,7 @@ public class Connection implements MessageListener {
long now = System.currentTimeMillis();
long elapsed = now - lastSendTimeStamp;
if (elapsed < 20) {
log.info("We got 2 sendMessage requests in less than 20 ms. We set the thread to sleep " +
log.debug("We got 2 sendMessage requests in less than 20 ms. We set the thread to sleep " +
"for 50 ms to avoid flooding our peer. lastSendTimeStamp={}, now={}, elapsed={}",
lastSendTimeStamp, now, elapsed);
Thread.sleep(50);
@ -727,7 +727,7 @@ public class Connection implements MessageListener {
long now = System.currentTimeMillis();
long elapsed = now - lastReadTimeStamp;
if (elapsed < 10) {
log.info("We got 2 messages received in less than 10 ms. We set the thread to sleep " +
log.debug("We got 2 messages received in less than 10 ms. We set the thread to sleep " +
"for 20 ms to avoid getting flooded by our peer. lastReadTimeStamp={}, now={}, elapsed={}",
lastReadTimeStamp, now, elapsed);
Thread.sleep(20);

5
network/src/main/java/io/bitsquare/p2p/peers/PeerManager.java
View file

@ -162,8 +162,7 @@ public class PeerManager implements ConnectionListener {
final boolean seedNode = isSeedNode(connection);
final Optional<NodeAddress> addressOptional = connection.getPeersNodeAddressOptional();
log.info("++ Connection created: peer = {}{}", (addressOptional.isPresent() ? addressOptional.get().hostName : "unknown address"), seedNode ? " (SeedNode)" : "");
log.info("onConnection: peer = {}{}", (addressOptional.isPresent() ? addressOptional.get().hostName : "unknown address"), seedNode ? " (SeedNode)" : "");
if (seedNode)
connection.setPeerType(Connection.PeerType.SEED_NODE);
@ -185,7 +184,7 @@ public class PeerManager implements ConnectionListener {
" / closeConnectionReason: " + closeConnectionReason);
final Optional<NodeAddress> addressOptional = connection.getPeersNodeAddressOptional();
log.info("-- Connection closed: peer = {}{}", (addressOptional.isPresent() ? addressOptional.get().hostName : "unknown address"), isSeedNode(connection) ? " (SeedNode)" : "");
log.info("onDisconnect: peer = {}{}", (addressOptional.isPresent() ? addressOptional.get().hostName : "unknown address"), isSeedNode(connection) ? " (SeedNode)" : "");
handleConnectionFault(connection);

2
package/linux/32bitBuild.sh
View file

@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e
# Edit version
version=0.4.9.1
version=0.4.9.2
jarFile="/media/sf_vm_shared_ubuntu14_32bit/Bitsquare-$version.jar"
jdkfixFile="/media/sf_vm_shared_ubuntu14_32bit/jdkfix-$version.jar"

2
package/linux/64bitBuild.sh
View file

@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e
# Edit version
version=0.4.9.1
version=0.4.9.2
jarFile="/media/sf_vm_shared_ubuntu/Bitsquare-$version.jar"
jdkfixFile="/media/sf_vm_shared_ubuntu/jdkfix-$version.jar"

2
package/mac/create_app.sh
View file

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

2
package/mac/finalize.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash
version="0.4.9.1"
version="0.4.9.2"
target_dir="/Users/mk/Documents/__bitsquare/_releases/$version"
src_dir="/Users/mk/Documents/_intellij/bitsquare"

2
package/windows/32bitBuild.bat
View file

@ -6,7 +6,7 @@
:: 64 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
SET version=0.4.9.1
SET version=0.4.9.2
SET jdk=C:\Program Files\Java\jdk1.8.0_92
SET outdir=\\VBOXSVR\vm_shared_windows_32bit

2
package/windows/64bitBuild.bat
View file

@ -8,7 +8,7 @@
:: Did not get -BjvmOptions=-Xbootclasspath working on windows, but if the jdkfix jar is copied into the jdk/jre dir it will override the default classes
SET version=0.4.9.1
SET version=0.4.9.2
SET jdk=C:\Program Files\Java\jdk1.8.0_92
SET outdir=\\VBOXSVR\vm_shared_windows

2
package/windows/Bitsquare.iss
View file

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

2
pom.xml
View file

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

2
seednode/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<version>0.4.9.1</version>
<version>0.4.9.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>