From 92ee247fa7e8de5e522031429a0ada60155d244a Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Sat, 6 Jun 2020 08:44:41 +0200 Subject: [PATCH 1/7] Bump version number for v1.3.5 release --- build.gradle | 2 +- common/src/main/java/bisq/common/app/Version.java | 2 +- desktop/package/linux/Dockerfile | 2 +- desktop/package/linux/package.sh | 2 +- desktop/package/linux/release.sh | 2 +- desktop/package/macosx/Info.plist | 4 ++-- desktop/package/macosx/create_app.sh | 2 +- desktop/package/macosx/finalize.sh | 2 +- desktop/package/macosx/replace_version_number.sh | 4 ++-- desktop/package/windows/package.bat | 2 +- desktop/package/windows/release.bat | 2 +- relay/src/main/resources/version.txt | 2 +- seednode/src/main/java/bisq/seednode/SeedNodeMain.java | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 14bca27bb3..b6ffc15208 100644 --- a/build.gradle +++ b/build.gradle @@ -378,7 +378,7 @@ configure(project(':desktop')) { apply plugin: 'witness' apply from: '../gradle/witness/gradle-witness.gradle' - version = '1.3.4-SNAPSHOT' + version = '1.3.5' mainClassName = 'bisq.desktop.app.BisqAppMain' diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java index 4d14b9a0f2..5a7c04ae1f 100644 --- a/common/src/main/java/bisq/common/app/Version.java +++ b/common/src/main/java/bisq/common/app/Version.java @@ -27,7 +27,7 @@ public class Version { // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update // Therefore all sub versions start again with 1 // We use semantic versioning with major, minor and patch - public static final String VERSION = "1.3.4"; + public static final String VERSION = "1.3.5"; public static int getMajorVersion(String version) { return getSubVersion(version, 0); diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index 8787cf7d8e..d6d0e45a85 100644 --- a/desktop/package/linux/Dockerfile +++ b/desktop/package/linux/Dockerfile @@ -8,7 +8,7 @@ # pull base image FROM openjdk:8-jdk -ENV version 1.3.4-SNAPSHOT +ENV version 1.3.5 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* && apt-get install -y vim fakeroot diff --git a/desktop/package/linux/package.sh b/desktop/package/linux/package.sh index 2df84547be..73c4cfcb81 100755 --- a/desktop/package/linux/package.sh +++ b/desktop/package/linux/package.sh @@ -6,7 +6,7 @@ # - Update version below # - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory -version=1.3.4-SNAPSHOT +version=1.3.5 version_base=$(echo $version | awk -F'[_-]' '{print $1}') if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then diff --git a/desktop/package/linux/release.sh b/desktop/package/linux/release.sh index 054c1b3bee..11962989ee 100755 --- a/desktop/package/linux/release.sh +++ b/desktop/package/linux/release.sh @@ -4,7 +4,7 @@ # Prior to running this script: # - Update version below -version=1.3.4-SNAPSHOT +version=1.3.5 base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../.. package_dir=$base_dir/desktop/package release_dir=$base_dir/desktop/release/$version diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist index f3a53e27a1..e43fe58900 100644 --- a/desktop/package/macosx/Info.plist +++ b/desktop/package/macosx/Info.plist @@ -5,10 +5,10 @@ CFBundleVersion - 1.3.4 + 1.3.5 CFBundleShortVersionString - 1.3.4 + 1.3.5 CFBundleExecutable Bisq diff --git a/desktop/package/macosx/create_app.sh b/desktop/package/macosx/create_app.sh index aad425a296..4c165ea19e 100755 --- a/desktop/package/macosx/create_app.sh +++ b/desktop/package/macosx/create_app.sh @@ -6,7 +6,7 @@ mkdir -p deploy set -e -version="1.3.4-SNAPSHOT" +version="1.3.5" cd .. ./gradlew :desktop:build -x test shadowJar diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index ccdf39f104..ba8034c642 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -2,7 +2,7 @@ cd ../../ -version="1.3.4-SNAPSHOT" +version="1.3.5" target_dir="releases/$version" diff --git a/desktop/package/macosx/replace_version_number.sh b/desktop/package/macosx/replace_version_number.sh index e4d241a8d2..609a4cdc8c 100755 --- a/desktop/package/macosx/replace_version_number.sh +++ b/desktop/package/macosx/replace_version_number.sh @@ -2,8 +2,8 @@ cd $(dirname $0)/../../../ -oldVersion=1.3.3 -newVersion=1.3.4 +oldVersion=1.3.4 +newVersion=1.3.5 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/desktop/package/windows/package.bat b/desktop/package/windows/package.bat index a6ccbed41c..68cf1eda2a 100644 --- a/desktop/package/windows/package.bat +++ b/desktop/package/windows/package.bat @@ -11,7 +11,7 @@ @echo off -set version=1.3.4-SNAPSHOT +set version=1.3.5 if not exist "%JAVA_HOME%\bin\javapackager.exe" ( if not exist "%ProgramFiles%\Java\jdk-10.0.2" ( echo Javapackager not found. Update JAVA_HOME variable to point to OracleJDK. diff --git a/desktop/package/windows/release.bat b/desktop/package/windows/release.bat index ea1410f910..c4c47981e0 100644 --- a/desktop/package/windows/release.bat +++ b/desktop/package/windows/release.bat @@ -6,7 +6,7 @@ @echo off -set version=1.3.4-SNAPSHOT +set version=1.3.5 set release_dir=%~dp0..\..\..\releases\%version% set package_dir=%~dp0.. diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt index 815b8e0f03..80e78df683 100644 --- a/relay/src/main/resources/version.txt +++ b/relay/src/main/resources/version.txt @@ -1 +1 @@ -1.3.4-SNAPSHOT +1.3.5 diff --git a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java index 6b03431ae9..aebbb701da 100644 --- a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java +++ b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java @@ -30,7 +30,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class SeedNodeMain extends ExecutableForAppWithP2p { - private static final String VERSION = "1.3.4"; + private static final String VERSION = "1.3.5"; private SeedNode seedNode; public SeedNodeMain() { From 4ee2f355dca1e0b8e6a482a192d1c0b0c214b4d8 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 7 Jun 2020 17:04:11 +0900 Subject: [PATCH 2/7] Update IPs and onions for wiz Bitcoin nodes --- core/src/main/java/bisq/core/btc/nodes/BtcNodes.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/bisq/core/btc/nodes/BtcNodes.java b/core/src/main/java/bisq/core/btc/nodes/BtcNodes.java index 1d6f084b1b..997c1eeb14 100644 --- a/core/src/main/java/bisq/core/btc/nodes/BtcNodes.java +++ b/core/src/main/java/bisq/core/btc/nodes/BtcNodes.java @@ -75,9 +75,10 @@ public class BtcNodes { new BtcNode("btc.bisq.cc", "4nnuyxm5k5tlyjq3.onion", "167.71.168.194", BtcNode.DEFAULT_PORT, "@m52go"), // wiz - new BtcNode("node100.wiz.network", "m3yqzythryowgedc.onion", "103.99.168.100", BtcNode.DEFAULT_PORT, "@wiz"), - new BtcNode("node130.wiz.network", "22tg6ufbwz6o3l2u.onion", "103.99.168.130", BtcNode.DEFAULT_PORT, "@wiz"), - new BtcNode("node140.wiz.network", "jiuuuislm7ooesic.onion", "103.99.168.140", BtcNode.DEFAULT_PORT, "@wiz"), + new BtcNode("node100.hnl.wiz.biz", "m3yqzythryowgedc.onion", "103.99.168.100", BtcNode.DEFAULT_PORT, "@wiz"), + new BtcNode("node140.hnl.wiz.biz", "jiuuuislm7ooesic.onion", "103.99.168.140", BtcNode.DEFAULT_PORT, "@wiz"), + new BtcNode("node210.fmt.wiz.biz", "orsy2v63ecrmdj55.onion", "103.99.170.210", BtcNode.DEFAULT_PORT, "@wiz"), + new BtcNode("node220.fmt.wiz.biz", "z6mbqq7llxlrn4kq.onion", "103.99.170.220", BtcNode.DEFAULT_PORT, "@wiz"), // Rob Kaandorp new BtcNode(null, "2pj2o2mrawj7yotg.onion", null, BtcNode.DEFAULT_PORT, "@robkaandorp") // cannot provide IP because no static IP From f422b3fdceb9ea9517eec9b6ff6bcd984648231a Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 10 Jun 2020 16:26:56 +0200 Subject: [PATCH 3/7] Update bitcoinj checkpoints --- core/src/main/resources/wallet/checkpoints.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/wallet/checkpoints.txt b/core/src/main/resources/wallet/checkpoints.txt index 4688b9d937..a5c0d9da83 100644 --- a/core/src/main/resources/wallet/checkpoints.txt +++ b/core/src/main/resources/wallet/checkpoints.txt @@ -1,6 +1,6 @@ TXT CHECKPOINTS 1 0 -310 +313 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G @@ -311,3 +311,6 @@ DQOCnM/692T/c/vpAAlxoAAgACBpKU8xBXETUdlfq3ziC5HqY2sbxpLaBgAAAAAAAAAAAC2Podb2UVE3 DXJv6TyZC6dJNCJfAAl5gAAAwCC821K+00n7cVERL9d6Jzo0wkE8NSY/BAAAAAAAAAAAANEvjjQwmKBYHwf7qsdzHSrM+7AC4wGhHxMBliBwDnPi7SJmXhkBERcyCjYC Dej8cVmdICmGlGmsAAmBYAAAgCAMNQrVauCVnJhLXbUm+wi+s6FYCIDGCwAAAAAAAAAAAHSgbycFfzUIokW6wOwg6yoHf88c9CrCsoU3LGXqo65Awhh8XkE7FBcTwPq1 Dkyiv/CRkmMKmkEzAAmJQADgACBD4xnvCIUw3EDxERdHu3/bAmPjwJ15DAAAAAAAAAAAAHiPGbRWrMMMyL6BA6eaJfNIo5XiUMXo0B7u72S1QqDZLpGNXrwgExchnuav +DrYJPtE6p0g5WpqUAAmRIAAAACAUOgCoJeMzIDa34vdMEznyR1cSUIbpDQAAAAAAAAAAAKlIg5av2zB0dTVJcJhbennqbQ9kisot+0OheDaM0jzyNJueXjOjEReyl0xD +DyhWrFlPqEc/c9+uAAmZAAAgACDcrvMMuRSy9GQxh8BFNt6wIDWYhvU4EQAAAAAAAAAAABVOP5QKoWx9atpYrUh6L+UeYRrgD4sj3ZOBngyn3WuRAeawXjl6EReMHTLH +D5uvExILinkBRJMsAAmg4ADg/yfO2pclcPlRE5XVKCPZeF63mn30v+yHDgAAAAAAAAAAAPaDA4g+h9tjjVWtJ587WMHb07Mcfa1BoDJCANQd+z94wJDEXvaXEhf5l8cN From 2f344f4bf19ba81b16c462d6bfd466ca2bc1d587 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 10 Jun 2020 16:40:23 +0200 Subject: [PATCH 4/7] Update data stores for v1.3.5 --- p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/DaoStateStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/TradeStatistics2Store_BTC_MAINNET | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET b/p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET index f1800f9fbb..e096b41f55 100644 --- a/p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET +++ b/p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acef74748656b25cb528a592d1bc94aeec681931095ef860059ee35e9a9f5c48 -size 1598925 +oid sha256:2ae579df07bba23056e1483b97f19c4495480f88a9bcc24c3ba888d4eb29de2d +size 1707456 diff --git a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET index f9bcbd6a69..694e5d3084 100644 --- a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET +++ b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79e9c7ffee2bb4b95d89c00ea0c69abebc01a82821663227d8b8b20b8c6822be -size 60988519 +oid sha256:53e93950083c15a39cf539e81f50b3f160d6312a1be749416fa4d54f54290f7a +size 67681068 diff --git a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET index a6590d6230..2cc97acf26 100644 --- a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET +++ b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb62c12e8cef6eb57278c21b82bbce9462c3204906a1f67a4c70f6b89c3b00ac -size 2136301 +oid sha256:cb566f488ef238a20173e0f46278e8bdeb1c5751f92835a3f49c31547b5ec923 +size 2421203 diff --git a/p2p/src/main/resources/TradeStatistics2Store_BTC_MAINNET b/p2p/src/main/resources/TradeStatistics2Store_BTC_MAINNET index 078919af5b..b3db913477 100644 --- a/p2p/src/main/resources/TradeStatistics2Store_BTC_MAINNET +++ b/p2p/src/main/resources/TradeStatistics2Store_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebc597e157f6f892de4661c2da73d52a707bb8e6707366c4528cea7aa4e73ba1 -size 12873466 +oid sha256:26ab3d59e6a476c1ca26549c7b19110183bf93000a7b456378b0ef9f1484803e +size 13787380 From 8bb33863408cc653774eaeccd3feb65f455ae181 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 11 Jun 2020 10:52:35 +0200 Subject: [PATCH 5/7] apply fix for #2798 only in edit offer view --- .../bisq/desktop/main/offer/MutableOfferViewModel.java | 10 ++++++---- .../main/portfolio/editoffer/EditOfferViewModel.java | 8 +++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java index f8f787a1a1..3fb6731d5f 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java @@ -812,14 +812,16 @@ public abstract class MutableOfferViewModel ext // We want to trigger a recalculation of the volume and minAmount UserThread.execute(() -> { onFocusOutVolumeTextField(true, false); - // do not update BTC Amount or minAmount here - // issue 2798: "after a few edits of offer the BTC amount has increased" - // intentionally removed: onFocusOutAmountTextField(true, false); - // intentionally removed: onFocusOutMinAmountTextField(true, false); + triggerFocusOutOnAmountFields(); }); } } + public void triggerFocusOutOnAmountFields() { + onFocusOutAmountTextField(true, false); + onFocusOutMinAmountTextField(true, false); + } + public void onFocusOutPriceAsPercentageTextField(boolean oldValue, boolean newValue) { inputIsMarketBasedPrice = !oldValue && newValue; if (oldValue && !newValue) { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java index 0960653ec4..f85d1978b5 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java @@ -30,8 +30,8 @@ import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.offer.OpenOffer; import bisq.core.provider.price.PriceFeedService; import bisq.core.user.Preferences; -import bisq.core.util.coin.BsqFormatter; import bisq.core.util.FormattingUtils; +import bisq.core.util.coin.BsqFormatter; import bisq.core.util.coin.CoinFormatter; import bisq.common.handlers.ErrorMessageHandler; @@ -108,4 +108,10 @@ class EditOfferViewModel extends MutableOfferViewModel { public boolean isSecurityDepositValid() { return securityDepositValidator.validate(buyerSecurityDeposit.get()).isValid; } + + @Override + public void triggerFocusOutOnAmountFields() { + // do not update BTC Amount or minAmount here + // issue 2798: "after a few edits of offer the BTC amount has increased" + } } From 289e013500d2aba8e10e5fbaab484be512b23a71 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 11 Jun 2020 13:29:23 +0200 Subject: [PATCH 6/7] Update copyright notice --- desktop/package/macosx/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist index e43fe58900..05f3338ae2 100644 --- a/desktop/package/macosx/Info.plist +++ b/desktop/package/macosx/Info.plist @@ -26,7 +26,7 @@ public.app-category.finance NSHumanReadableCopyright - Copyright © 2013-2019 - The Bisq developers + Copyright © 2013-2020 - The Bisq developers From d2fdc79c262fcb1c64bdeb247de40125a7731fff Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 23 Jun 2020 15:32:57 +0200 Subject: [PATCH 7/7] Revert to SNAPSHOT version --- build.gradle | 2 +- desktop/package/linux/Dockerfile | 2 +- desktop/package/linux/package.sh | 2 +- desktop/package/linux/release.sh | 2 +- desktop/package/macosx/create_app.sh | 2 +- desktop/package/macosx/finalize.sh | 2 +- desktop/package/macosx/insert_snapshot_version.sh | 2 +- desktop/package/windows/package.bat | 2 +- desktop/package/windows/release.bat | 2 +- relay/src/main/resources/version.txt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index b6ffc15208..8e83abb183 100644 --- a/build.gradle +++ b/build.gradle @@ -378,7 +378,7 @@ configure(project(':desktop')) { apply plugin: 'witness' apply from: '../gradle/witness/gradle-witness.gradle' - version = '1.3.5' + version = '1.3.5-SNAPSHOT' mainClassName = 'bisq.desktop.app.BisqAppMain' diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index d6d0e45a85..e282d28ec5 100644 --- a/desktop/package/linux/Dockerfile +++ b/desktop/package/linux/Dockerfile @@ -8,7 +8,7 @@ # pull base image FROM openjdk:8-jdk -ENV version 1.3.5 +ENV version 1.3.5-SNAPSHOT RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* && apt-get install -y vim fakeroot diff --git a/desktop/package/linux/package.sh b/desktop/package/linux/package.sh index 73c4cfcb81..2825f88df2 100755 --- a/desktop/package/linux/package.sh +++ b/desktop/package/linux/package.sh @@ -6,7 +6,7 @@ # - Update version below # - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory -version=1.3.5 +version=1.3.5-SNAPSHOT version_base=$(echo $version | awk -F'[_-]' '{print $1}') if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then diff --git a/desktop/package/linux/release.sh b/desktop/package/linux/release.sh index 11962989ee..488a57ce30 100755 --- a/desktop/package/linux/release.sh +++ b/desktop/package/linux/release.sh @@ -4,7 +4,7 @@ # Prior to running this script: # - Update version below -version=1.3.5 +version=1.3.5-SNAPSHOT base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../.. package_dir=$base_dir/desktop/package release_dir=$base_dir/desktop/release/$version diff --git a/desktop/package/macosx/create_app.sh b/desktop/package/macosx/create_app.sh index 4c165ea19e..fc1697a94d 100755 --- a/desktop/package/macosx/create_app.sh +++ b/desktop/package/macosx/create_app.sh @@ -6,7 +6,7 @@ mkdir -p deploy set -e -version="1.3.5" +version="1.3.5-SNAPSHOT" cd .. ./gradlew :desktop:build -x test shadowJar diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index ba8034c642..fab2269c2b 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -2,7 +2,7 @@ cd ../../ -version="1.3.5" +version="1.3.5-SNAPSHOT" target_dir="releases/$version" diff --git a/desktop/package/macosx/insert_snapshot_version.sh b/desktop/package/macosx/insert_snapshot_version.sh index 35c0262dda..20382a2185 100755 --- a/desktop/package/macosx/insert_snapshot_version.sh +++ b/desktop/package/macosx/insert_snapshot_version.sh @@ -2,7 +2,7 @@ cd $(dirname $0)/../../../ -version=1.3.4 +version=1.3.5 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/desktop/package/windows/package.bat b/desktop/package/windows/package.bat index 68cf1eda2a..422e385cfc 100644 --- a/desktop/package/windows/package.bat +++ b/desktop/package/windows/package.bat @@ -11,7 +11,7 @@ @echo off -set version=1.3.5 +set version=1.3.5-SNAPSHOT if not exist "%JAVA_HOME%\bin\javapackager.exe" ( if not exist "%ProgramFiles%\Java\jdk-10.0.2" ( echo Javapackager not found. Update JAVA_HOME variable to point to OracleJDK. diff --git a/desktop/package/windows/release.bat b/desktop/package/windows/release.bat index c4c47981e0..ede7a46fc4 100644 --- a/desktop/package/windows/release.bat +++ b/desktop/package/windows/release.bat @@ -6,7 +6,7 @@ @echo off -set version=1.3.5 +set version=1.3.5-SNAPSHOT set release_dir=%~dp0..\..\..\releases\%version% set package_dir=%~dp0.. diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt index 80e78df683..fd2d489dba 100644 --- a/relay/src/main/resources/version.txt +++ b/relay/src/main/resources/version.txt @@ -1 +1 @@ -1.3.5 +1.3.5-SNAPSHOT