mirror of
https://github.com/Qortal/altcoinj.git
synced 2025-08-08 03:31:34 +00:00
Merge branch 'master' of https://github.com/bitcoinj/bitcoinj into rebase
Conflicts: README.md core/pom.xml core/src/main/java/com/dogecoin/dogecoinj/core/DownloadListener.java core/src/main/java/com/dogecoin/dogecoinj/core/MemoryPool.java core/src/main/java/com/dogecoin/dogecoinj/core/NetworkParameters.java core/src/main/java/com/dogecoin/dogecoinj/core/PeerFilterProvider.java core/src/main/java/com/dogecoin/dogecoinj/core/PeerGroup.java core/src/main/java/com/dogecoin/dogecoinj/core/StoredTransactionOutput.java core/src/main/java/com/dogecoin/dogecoinj/core/Wallet.java core/src/main/java/com/dogecoin/dogecoinj/crypto/EncryptedPrivateKey.java core/src/main/java/com/dogecoin/dogecoinj/crypto/KeyCrypterScrypt.java core/src/main/java/com/dogecoin/dogecoinj/jni/NativeTransactionConfidenceListener.java core/src/main/java/com/dogecoin/dogecoinj/kits/WalletAppKit.java core/src/main/java/com/dogecoin/dogecoinj/net/FilterMerger.java core/src/main/java/com/dogecoin/dogecoinj/protocols/channels/IPaymentChannelClient.java core/src/main/java/com/dogecoin/dogecoinj/protocols/channels/PaymentChannelClient.java core/src/main/java/com/dogecoin/dogecoinj/protocols/channels/PaymentChannelClientConnection.java core/src/main/java/com/dogecoin/dogecoinj/protocols/channels/PaymentChannelClientState.java core/src/main/java/com/dogecoin/dogecoinj/store/BlockStore.java core/src/main/java/com/dogecoin/dogecoinj/store/FullPrunedBlockStore.java core/src/main/java/com/dogecoin/dogecoinj/store/H2FullPrunedBlockStore.java core/src/main/java/com/dogecoin/dogecoinj/store/PostgresFullPrunedBlockStore.java core/src/main/java/com/dogecoin/dogecoinj/testing/FakeTxBuilder.java core/src/main/java/com/dogecoin/dogecoinj/testing/TestWithPeerGroup.java core/src/main/java/com/dogecoin/dogecoinj/wallet/KeyChainGroup.java core/src/main/java/org/bitcoinj/core/DownloadListener.java core/src/main/java/org/bitcoinj/core/DownloadProgressTracker.java core/src/main/java/org/bitcoinj/core/MemoryPool.java core/src/main/java/org/bitcoinj/core/StoredTransactionOutput.java core/src/main/java/org/bitcoinj/core/TxConfidenceTable.java core/src/main/java/org/bitcoinj/core/UTXO.java core/src/main/java/org/bitcoinj/params/MainNetParams.java core/src/test/java/com/dogecoin/dogecoinj/core/AbstractFullPrunedBlockChainTest.java core/src/test/java/com/dogecoin/dogecoinj/core/BitcoindComparisonTool.java core/src/test/java/com/dogecoin/dogecoinj/core/FilteredBlockAndPartialMerkleTreeTests.java core/src/test/java/com/dogecoin/dogecoinj/core/FullBlockTestGenerator.java core/src/test/java/com/dogecoin/dogecoinj/core/PostgresFullPrunedBlockChainTest.java core/src/test/java/com/dogecoin/dogecoinj/core/WalletTest.java core/src/test/java/com/dogecoin/dogecoinj/crypto/ChildKeyDerivationTest.java core/src/test/java/com/dogecoin/dogecoinj/store/WalletProtobufSerializerTest.java core/src/test/java/com/dogecoin/dogecoinj/wallet/DefaultRiskAnalysisTest.java core/src/test/java/com/dogecoin/dogecoinj/wallet/DeterministicKeyChainTest.java tools/src/main/java/com/dogecoin/dogecoinj/tools/WalletTool.java wallettemplate/pom.xml wallettemplate/src/main/java/wallettemplate/Main.java wallettemplate/src/main/java/wallettemplate/MainController.java wallettemplate/src/main/java/wallettemplate/SendMoneyController.java
This commit is contained in:
13
pom.xml
13
pom.xml
@@ -11,6 +11,7 @@
|
||||
<module>core</module>
|
||||
<module>examples</module>
|
||||
<module>tools</module>
|
||||
<module>wallettemplate</module>
|
||||
</modules>
|
||||
|
||||
<parent>
|
||||
@@ -66,13 +67,12 @@
|
||||
<!-- Common build plugin configuration -->
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- Ensure compilation is done under Java 6 for backwards compatibility -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>1.6</source>
|
||||
<target>1.6</target>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
<showDeprecation>true</showDeprecation>
|
||||
<showWarnings>true</showWarnings>
|
||||
</configuration>
|
||||
@@ -86,7 +86,7 @@
|
||||
<configuration>
|
||||
<serverId>ossrh</serverId>
|
||||
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
|
||||
<autoReleaseAfterClose>false</autoReleaseAfterClose>
|
||||
<autoReleaseAfterClose>true</autoReleaseAfterClose>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
@@ -120,6 +120,10 @@
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>2.5</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.9.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>2.6</version>
|
||||
@@ -211,7 +215,6 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.9.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-javadocs</id>
|
||||
|
Reference in New Issue
Block a user