Shams Asari
1d91272698
Moved a bunch of tests that were in the integration bucket into unit ( #3576 )
2018-07-13 14:17:56 +01:00
bpaunescu
92f59f2ad2
Revert " Create Artemis p2p.inbound addresses before starting the broker ( #3407 )" ( #3590 )
...
This reverts commit ed3944c54606e876abd6483ff5d66a764f9cf577.
2018-07-13 14:00:02 +01:00
Katarzyna Streich
4fb7f7d3d0
CORDA-1733 X500Principal configuration parsing ( #3580 )
...
CORDA-1733 X500Principal configuration parsing
Change the NodeConfiguration.tlsCertCrlIssuer type from String to X500Principal
2018-07-13 13:44:29 +01:00
rick.parker
4e81d26985
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180713-1
2018-07-13 13:15:53 +01:00
Shams Asari
ab08ce21f4
Made NodeUnloadHandlerTests a unit test by using mock node ( #3572 )
2018-07-12 15:22:31 +01:00
Thomas Schroeter
12174fdaae
Add jib gradle plugin to node ( #3571 )
...
* Add jib gradle plugin to node
Available tasks:
./gradlew node:jibExportDockerContext
./gradlew node:jib --image <image>
2018-07-12 14:39:17 +01:00
Katarzyna Streich
b275f4349a
ENT-1968: Add RPC for refreshing network map cache ( #3552 )
...
ENT-1968: Add RPC for refreshing network map cache
2018-07-12 13:40:33 +01:00
Shams Asari
f4a248f81f
Made CashSelectionTest a unit test by using mock network. ( #3570 )
...
Also includes adding a default value of emptyList() to InternalMockNetwork.cordappPackages
2018-07-12 11:55:51 +01:00
Thomas Schroeter
cb1d880c1c
Merge pull request #1266 from corda/thomas/os-merge-2018-07-11
...
Thomas/os merge 2018 07 11
2018-07-12 11:21:28 +01:00
Rick Parker
a23b3f4b29
ENT-933 Prioritise flow completion. Executor prioritises flows created first. ( #1255 )
...
* ENT-933 Prioritise flow completion. Executor prioritises flows created first.
* Unit tests
* More unit tests
* Formatting
2018-07-12 08:30:02 +01:00
Roman Plášil
a4355ce198
Configure NetworkMapUpdater executor so that it doesn't block node shutdown ( #3530 )
2018-07-11 18:10:43 +01:00
szymonsztuka
0ceac42dae
Revert removing db integration test support and update db schema names for BootTest.
2018-07-11 17:27:57 +01:00
Thomas Schroeter
baabf8ceb9
Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-07-11
...
Conflicts:
finance/src/integration-test/kotlin/net/corda/finance/flows/CashConfigDataFlowTest.kt
node/src/integration-test/kotlin/net/corda/node/BootTests.kt
node/src/integration-test/kotlin/net/corda/node/NodeUnloadHandlerTests.kt
node/src/integration-test/kotlin/net/corda/node/flows/FlowRetryTest.kt
tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-07-11 14:56:03 +01:00
Stefano Franz
9503c9684e
CORDA-1747 - Client RPC classloader and Java Generics fixes ( #3553 )
...
* fix for spring boot rpc and it work with deterministic serialization
* really really fix tests
* up log level
* reenable allWarningsAsErrors
2018-07-11 13:28:01 +01:00
Patrick Kuo
389c0d0ffa
CRL url checks and warning for mis-configurated CRL endpoint ( #1258 )
...
(cherry picked from commit 7ef0703)
2018-07-11 11:49:59 +01:00
Stefano Franz
480698bc46
Merge remote-tracking branch 'open/master' into my-merge-july-11-11-27
...
# Conflicts:
# CONTRIBUTORS.md
2018-07-11 11:37:49 +01:00
Shams Asari
2833ec2a88
Avoiding starting notaries in driver-based integration tests to speed them up ( #3544 )
2018-07-11 11:36:36 +01:00
Katelyn Baker
fa55221b66
fix for spring boot rpc and it work with deterministic serialization
2018-07-11 10:59:21 +01:00
Viktor Kolomeyko
1f5520ca40
CORDA-1743: Remove "isDebug = true" leftovers in the Enterprise. ( #1236 )
2018-07-11 10:28:40 +01:00
Anthony Keenan
8d7aa5f590
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180710
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# docs/source/network-bootstrapper.rst
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/identity/IdentityServiceUtil.kt
# node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt
2018-07-10 11:19:23 +01:00
Dan Newton
7b4ace16e1
Remove duplicated code between PersistentIdentityService and InMemoryIdentityService ( #3428 )
2018-07-10 08:35:14 +01:00
Michele Sollecito
54161a630a
[CORDA-1659]: Improve handling/logging of failed address binding. ( #3498 )
2018-07-09 18:45:20 +01:00
Viktor Kolomeyko
61a8bd0a5a
Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge
...
# Conflicts:
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
2018-07-09 16:45:20 +01:00
Viktor Kolomeyko
d481c55b82
CORDA-1743: Remove isDebug = true
from Node driver to speed-up integration tests execution. ( #3535 )
...
* CORDA-1743: Remove `isDebug = true` from Node driver to speed-up integration tests execution.
* CORDA-1743: Undo removal of "isDebug = true" from the test that specifically checks for this condition.
* CORDA-1743: Address input from @shamsasari
2018-07-09 16:37:01 +01:00
Michal Kit
408cc68c65
CORDA-1715 Ordering the X500 name for the CRL extension of the TLS certificates ( #3515 )
...
* CORDA-1715 Ordering the X500 name for the CRL extension of the TLS certificate
* Addressing review comments
* Addressing review comments - round 2
* Throwing an exception on incorrect TLS CRL issuer configuration
* Changes after the redesign decisions
* Small refactoring
2018-07-09 13:45:38 +01:00
Mike Hearn
5d738ac8e8
[CORDA-1671] Minor: some more places where we were printing stack traces instead of clean error messages. ( #3512 )
...
* [CORDA-1671] Minor: some more places where we were printing stack traces instead of clean error messages.
* Address review comments.
2018-07-09 13:25:23 +01:00
Shams Asari
5d55a87d70
Merge remote-tracking branch 'open/master' into os-merge-aefd90f
...
# Conflicts:
# CONTRIBUTORS.md
2018-07-09 12:33:47 +01:00
James Brown
18e7cd4cfd
CORDA-1737 update jolokia dependency to latest version ( #3524 )
2018-07-06 11:15:48 +01:00
Anthony Keenan
3203bdae97
Merge from O/S
2018-07-05 19:09:25 +01:00
Shams Asari
0c8c914882
Removing warnings
2018-07-05 15:45:28 +01:00
Maksymilian Pawlak
f7dd4f7880
Use in-memory H2 for integration test ( #2508 )
...
* Default integration tests running with in-memory H2
2018-07-05 14:58:51 +01:00
Chris Rankin
02978fc174
Resolve warnings for Kotlin ByteArray. ( #3521 )
2018-07-05 13:00:29 +01:00
Tudor Malene
2ab5a4cf12
CORDA-1392 Make Hibernate entities non-Serializable ( #3458 )
...
* CORDA-1392 Make Hibernate entities non-Serializable
* CORDA-1392 Make Hibernate entities non-Serializable - fix api
* CORDA-1392 Fix determinise
* CORDA-1392 Add changelog entry
* CORDA-1392 Address code review changes
2018-07-05 09:37:30 +01:00
Shams Asari
20a589d66d
Merge remote-tracking branch 'open/master' into os-merge-244167d
...
# Conflicts:
# docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/LaunchSpaceshipFlow.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/tearoffs/TutorialTearOffs.kt
# docs/source/running-a-node.rst
# experimental/behave/build.gradle
# experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Substeps.kt
# experimental/kryo-hook/build.gradle
# experimental/quasar-hook/build.gradle
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
2018-07-04 18:38:34 +01:00
Shams Asari
244167d3e9
Enabled warnings as errors ( #3514 )
2018-07-04 17:17:27 +01:00
Matthew Nesbit
0d18bf8e33
Merge up of cleanup of AMQP protocol code
2018-07-03 17:05:05 +01:00
Matthew Nesbit
15d868b113
Merge up of cleanup of AMQP protocol code
2018-07-03 17:04:42 +01:00
Matthew Nesbit
d0568121b7
Some code tidy up ahead of post-GA development. ( #3500 )
...
Handle SSL Handshake timeouts properly
2018-07-03 14:16:31 +01:00
Christian Sailer
13d7892ded
Merge commit 'a5f43110f01c1bb116bb13274f1046204ee76e5f' into christians/merge-CORDA-1710
2018-07-03 13:05:39 +01:00
Tudor Malene
95d1b1f84e
ENT-2001 use versionInfo when registering node with the doorman ( #3435 )
...
* ENT-2001 use versionInfo when registering node with the doorman
* ENT-2001 address code review changes
2018-07-03 09:16:48 +01:00
Stefano Franz
d5ebb6da4f
gradle magic to publish installer
2018-07-02 18:01:08 +01:00
Stefano Franz
139ebf7977
Merge pull request #1164 from corda/fix_installer_build
...
ENT-2193 fix issue with base-directory not being set
2018-07-02 17:27:37 +01:00
Matthew Nesbit
0f98a1cbcd
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180702
...
# Conflicts:
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
2018-07-02 11:31:18 +01:00
PokeyBot
2b6018f050
Merge pull request #3473 from corda/fix_flaky_test
...
[CORDA-1698] Fix flaky test
2018-06-29 16:26:24 +01:00
Stefano Franz
b129a44271
Merge pull request #1087 from corda/add_licence_to_installer_2
...
ENT-2098 add license acceptance step to installer
2018-06-29 15:58:08 +01:00
stefanofranz
3b6fd50244
fix issue with base-directory not being set
...
fix build issue with installer.sh not containing security.policy from JRE^
2018-06-29 15:35:00 +01:00
Tommy Lillehagen
43e934beb3
ENT-2194 - Fix badly formatted characters in startup banner ( #1142 )
2018-06-29 10:03:17 +01:00
Florian Friemel
136500d48d
Advance TestClock instead of sleeping.
2018-06-28 17:58:46 +01:00
Florian Friemel
61d9d475c8
Advance TestClock instead of sleeping.
2018-06-28 17:14:50 +01:00
Patrick Kuo
8df18e954f
ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries ( #1101 )
...
* ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries
ENT-1880 Move identity key generation to network registration process
(cherry picked from commit c3ac203)
2018-06-28 15:20:22 +01:00