From 38aa38ac468cf89661ef8a850e2249c6b67d3429 Mon Sep 17 00:00:00 2001 From: anw Date: Thu, 6 Sep 2018 00:02:27 +0200 Subject: [PATCH 1/4] add jitpack repository --- README.md | 4 +++- core/pom.xml | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 895486a..0d16ffc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -[![Build Status](https://travis-ci.org/bitcoinj/bitcoinj.png?branch=master)](https://travis-ci.org/bitcoinj/bitcoinj) [![Coverage Status](https://coveralls.io/repos/bitcoinj/bitcoinj/badge.png?branch=master)](https://coveralls.io/r/bitcoinj/bitcoinj?branch=master) +[![](https://jitpack.io/v/Samourai-Wallet/bitcoinj.svg)](https://jitpack.io/#Samourai-Wallet/bitcoinj) + +[![Build Status](https://travis-ci.org/bitcoinj/bitcoinj.png?branch=master)](https://travis-ci.org/bitcoinj/bitcoinj) [![Coverage Status](https://coveralls.io/repos/bitcoinj/bitcoinj/badge.png?branch=master)](https://coveralls.io/r/bitcoinj/bitcoinj?branch=master) [![Visit our IRC channel](https://kiwiirc.com/buttons/irc.freenode.net/bitcoinj.png)](https://kiwiirc.com/client/irc.freenode.net/bitcoinj) diff --git a/core/pom.xml b/core/pom.xml index 81cc487..584ea22 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -432,5 +432,10 @@ 2.7.5 - + + + jitpack.io + https://jitpack.io + + From 69cdfcbe74f647a4e9a471d206717ae548d8759a Mon Sep 17 00:00:00 2001 From: anw Date: Thu, 6 Sep 2018 00:54:09 +0200 Subject: [PATCH 2/4] SPVBlockStore: Remove mmap hack for Windows (blocking maven releases) --- .../org/bitcoinj/store/SPVBlockStore.java | 4 -- .../org/bitcoinj/store/WindowsMMapHack.java | 39 ------------------- 2 files changed, 43 deletions(-) delete mode 100644 core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java diff --git a/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java b/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java index aaaa5d6..90f4250 100644 --- a/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java +++ b/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java @@ -278,10 +278,6 @@ public void setChainHead(StoredBlock chainHead) throws BlockStoreException { public void close() throws BlockStoreException { try { buffer.force(); - if (System.getProperty("os.name").toLowerCase().contains("win")) { - log.info("Windows mmap hack: Forcing buffer cleaning"); - WindowsMMapHack.forceRelease(buffer); - } buffer = null; // Allow it to be GCd and the underlying file mapping to go away. randomAccessFile.close(); } catch (IOException e) { diff --git a/core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java b/core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java deleted file mode 100644 index 88f47f2..0000000 --- a/core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright by the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.bitcoinj.store; - -import sun.misc.*; -import sun.nio.ch.*; - -import java.nio.*; - -/** - *

This class knows how to force an mmap'd ByteBuffer to reliquish its file handles before it becomes garbage collected, - * by exploiting implementation details of the HotSpot JVM implementation.

- * - *

This is required on Windows because otherwise an attempt to delete a file that is still mmapped will fail. This can - * happen when a user requests a "restore from seed" function, which involves deleting and recreating the chain file. - * At some point we should stop using mmap in SPVBlockStore and we can then delete this class.

- * - *

It is a separate class to avoid hitting unknown imports when running on other JVMs.

- */ -public class WindowsMMapHack { - public static void forceRelease(MappedByteBuffer buffer) { - Cleaner cleaner = ((DirectBuffer) buffer).cleaner(); - if (cleaner != null) cleaner.clean(); - } -} From b11e36c1e17bfc6546e4b6f1bc57e9005d528b3a Mon Sep 17 00:00:00 2001 From: anw Date: Thu, 6 Sep 2018 00:54:59 +0200 Subject: [PATCH 3/4] fix invalid hash for bcprov-jdk15on dependency (blocking maven release) --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 584ea22..65b6e10 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -191,7 +191,7 @@ com.google.protobuf:protobuf-java:2.6.1:jar:null:compile:d9521f2aecb909835746b7a5facf612af5e890e8 com.h2database:h2:1.3.167:jar:null:compile:d3867d586f087e53eb12fc65e5693d8ee9a5da17 com.lambdaworks:scrypt:1.4.0:jar:null:compile:906506b74f30c8c20bccd9ed4a11112d8941fe87 - org.bouncycastle:bcprov-jdk15on:1.55:jar:null:compile:6fc928491ada0974140257e85e2b016a2eee0e1d + org.bouncycastle:bcprov-jdk15on:1.55:jar:null:compile:935f2e57a00ec2c489cbd2ad830d4a399708f979 junit:junit:4.12:jar:null:test:2973d150c0dc1fefe998f834810d68f278ea58ec mysql:mysql-connector-java:5.1.33:jar:null:compile:8af455a9a3267e6664cafc87ace71a4e4ef02837 net.jcip:jcip-annotations:1.0:jar:null:compile:afba4942caaeaf46aab0b976afd57cc7c181467e From f7c9357194a74fdd0d2b61f92cb1ce7975d680f8 Mon Sep 17 00:00:00 2001 From: anw Date: Thu, 6 Sep 2018 01:06:19 +0200 Subject: [PATCH 4/4] remove unused repository --- core/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 65b6e10..72fea3e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -432,10 +432,4 @@ 2.7.5 - - - jitpack.io - https://jitpack.io - -