rick.parker
028b4f73d9
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1
2018-05-25 15:51:26 +01:00
rick.parker
c830d50647
Enterprise changes for OS merge.
2018-05-25 15:50:44 +01:00
Rick Parker
5e14277770
Add back import. ( #3237 )
2018-05-25 15:47:01 +01:00
rick.parker
033a5798a1
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1
...
# Conflicts:
# .idea/compiler.xml
# node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/transitions/DeliverSessionMessageTransition.kt
# node/src/main/resources/reference.conf
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# settings.gradle
2018-05-25 14:19:15 +01:00
Rick Parker
59fdb3df67
CORDA-1475 CORDA-1465 Allow flows to retry from last checkpoint ( #3204 )
2018-05-25 13:26:00 +01:00
Katelyn Baker
a3d88f752d
CORDA-1510 - Allow Doorman and NetworkMap to be configured independently ( #3220 )
...
* CORDA-1510 - Allow Doorman and NetworkMap to be configured independently
Currently only one compatabilityZoneURL can be specified, however the
two services can be run on as separate servers. Allow nodes to be
configured in this manner
* Partial review comments
* Review comments
* review comments
2018-05-25 11:37:20 +01:00
bpaunescu
d13cca49ec
ENT-1959: add a default value for mutualExclusionConfiguration.machineName ( #877 )
...
* ENT-1959: add a default value for mutualExclusionConfiguration.machineName
* ENT-1959: update docs
* ENT-1959: update docs, remove machineName from default conf, add unit test
2018-05-25 11:13:53 +01:00
Shams Asari
4e0378de9c
CORDA-1238: Moved the blob inspector out of experimental and wired it to JackonSupport ( #3224 )
...
The existing output format was not complete and so was deleted to avoid it becoming a tech debt. We can always resurrect it at a later point.
2018-05-24 18:26:55 +01:00
Thomas Schroeter
15b262f25f
Remove default value for myLegalName ( #3230 )
2018-05-24 17:37:43 +01:00
Matthew Nesbit
2e72f784f1
Late start bridges (unless configured otherwise) if the queue is empty. ( #3227 )
2018-05-24 16:54:09 +01:00
Shams Asari
77ef131c0f
Merge pull request #876 from corda/os-merge-3136e97
...
O/S merge from 3136e97
2018-05-24 16:53:03 +01:00
Michele Sollecito
6ec394b6be
[ENT-1843]: Not properly caught exception when node starts first time without migration (fix). ( #879 )
2018-05-24 16:29:22 +01:00
Shams Asari
62f12dde11
Merge fixes, including removing dependency to Kryo in the bridge and removing the kryo serialisation scheme for the enclave.
2018-05-24 13:32:09 +01:00
Shams Asari
c40e080dcc
Merge remote-tracking branch 'open/master' into os-merge-3136e97
...
# Conflicts:
# .idea/compiler.xml
# node/src/main/kotlin/net/corda/node/serialization/kryo/CordaClassResolver.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/CordaClosureSerializer.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/DefaultKryoCustomizer.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/KryoSerializationScheme.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/SerializeAsTokenSerializer.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/serialization/kryo/KryoStreamsTest.kt
# node/src/test/kotlin/net/corda/node/serialization/kryo/KryoTests.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt
2018-05-24 13:20:16 +01:00
Michele Sollecito
61fedb5fd2
[CORDA-1528]: Node configuration not containing property "rpcSettings.address" fails with error "No configuration setting found for key 'address'" (fix). ( #3229 )
2018-05-24 13:20:04 +01:00
Shams Asari
3136e973a7
CORDA-1511: Kryo only used for node checkpoints and so moved out of serialization module and into node ( #3228 )
2018-05-24 12:18:07 +01:00
Katarzyna Streich
1083e28343
ENT-1882: Don't remove own node info - fix ( #3219 )
...
* ENT-1882: Don't remove own node info
Don't remove own node info from cache on network map update.
2018-05-23 16:33:08 +01:00
Michele Sollecito
1137a0cc8f
[CORDA-1458]: Prevent passwords from being logged as part of node's configuration. ( #3223 )
2018-05-23 13:51:40 +01:00
Siddhartha Sengupta
093be1b88c
Using a List for the identity certs in InMemoryIdentityService and PersistentIdentityService ( #3210 )
2018-05-23 10:14:13 +01:00
Michele Sollecito
cafcecec2b
[CORDA-1264]: Mask internal errors if devMode is false. ( #871 )
2018-05-23 09:55:24 +01:00
Katelyn Baker
cba83aca13
Move RxNotification serializer into the serialization package ( #3214 )
2018-05-22 15:17:18 +01:00
sollecitom
766093c1aa
Merge remote-tracking branch 'remotes/open/master' into merges/may-22-14-56
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2018-05-22 14:57:59 +01:00
Michele Sollecito
072cf0fa97
Enabling logging in ExceptionSerialisingRpcOpsProxy. ( #3212 )
2018-05-22 13:37:09 +01:00
Tudor Malene
c2c792eccf
Silence SASL exception ( #3208 )
2018-05-22 11:25:31 +01:00
sollecitom
ee45c8280d
Merge remote-tracking branch 'remotes/open/master' into merges/may-21-17-24
...
# Conflicts:
# client/rpc/src/main/kotlin/net/corda/client/rpc/PermissionException.kt
2018-05-22 09:51:02 +01:00
bpaunescu
bff419e9af
Corda-1505 catch connection failure exception and re-throw as RPCException ( #3203 )
...
* CORDA-1505: catch connection failure exception and rethrow as RPCException
* CORDA-1443: remove incorrect import
* CORDA-1443: fix some failing tests
* CORDA-1505: fix broken CordaRPCClient test
* fix tests
* CORDA-1505: catch connection failure exception and rethrow as RPCException
* CORDA-1443: remove incorrect import
* CORDA-1443: fix some failing tests
* CORDA-1505: fix broken CordaRPCClient test
* fix tests
* CORDA-1505: changed exception handling to RPCException
* CORDA-1505: changed exception handling to RPCException
2018-05-21 18:01:31 +01:00
sollecitom
e3b2d3332d
Merge remote-tracking branch 'remotes/open/master' into merges/may-21-17-24
...
# Conflicts:
# constants.properties
# node-api/src/main/kotlin/net/corda/nodeapi/exceptions/RejectedCommandException.kt
# node/src/main/kotlin/net/corda/node/internal/RpcAuthorisationProxy.kt
# node/src/main/kotlin/net/corda/node/internal/SecureCordaRPCOps.kt
2018-05-21 17:29:26 +01:00
Michele Sollecito
f0db76d854
Re-enabled commented out test and fixed warnings in Finance. ( #3206 )
2018-05-21 17:00:30 +01:00
Tudor Malene
7a08ebca5a
Fix merge
2018-05-21 14:37:59 +01:00
tudor.malene@gmail.com
2ca11d7996
Merge remote-tracking branch 'open/master' into tudor-merge-21-05-18
...
# Conflicts:
# .idea/compiler.xml
# client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
# client/rpc/src/main/kotlin/net/corda/client/rpc/internal/CordaRPCClientUtils.kt
# docs/source/generating-a-node.rst
# finance/src/main/kotlin/net/corda/finance/contracts/asset/CommodityContract.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/kotlin/net/corda/node/services/config/SslOptions.kt
# node/src/main/kotlin/net/corda/node/services/messaging/RPCMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/rpc/NodeLoginModule.kt
# tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
2018-05-21 13:49:59 +01:00
Michele Sollecito
5de2c2aa4b
[CORDA-1264}: Complete obfuscation of exceptions to client side. ( #3155 )
2018-05-21 13:34:37 +01:00
Tudor Malene
9f8d6b4fdc
Merge pull request #861 from corda/feature/ENT-1932/move_MigrationExporter
...
ENT-1932 Move MigrationExporter to the "node" module
2018-05-21 15:25:59 +03:00
Shams Asari
b2f41d82f9
Merge fixes
2018-05-21 11:25:13 +01:00
Tudor Malene
455221629b
CORDA-1343 Make the RPCClient ssl constructors public. Clean up broke… ( #3039 )
...
* CORDA-1343 Make the RPCClient ssl constructors public. Clean up broker authentication logic
* CORDA-1343 small fix
* CORDA-1343 cleanup
* CORDA-1343 fixed api changes script
* CORDA-1343 fixed merge
* CORDA-1343 removed unused property
* CORDA-1343 add separate p2p and rpc node users
* CORDA-1343 remove test configuration
* CORDA-1343 fix tests
* CORDA-1343 address core review comments
* CORDA-1343 some documentation and adding createWithSsl method for a haAddressPool
* CORDA-1343 clean up the CordaRPCClient interface
* CORDA-1343 add internal shell test
* CORDA-1343 address code review comments
* CORDA-1343 split the internalShell user from the System Rpc user
* CORDA-1343 fix test
* CORDA-1343 Add warning when certificateChainCheckPolicies is being configured
* CORDA-1343 Address code review changes
* CORDA-1343 fix merge
* CORDA-1343 added test, docs, clarify comments
* CORDA-1343 clean up docs
* CORDA-1343 fix api
* CORDA-1343 fix merge
* CORDA-1343 fix merge
* CORDA-1343 fix merge
* CORDA-1343 fix merge
2018-05-21 13:05:08 +03:00
szymonsztuka
fc88cefbc8
CORDA-1288 Node properties can be set as system properties. ( #3172 )
2018-05-21 10:55:44 +01:00
Tudor Malene
8356316d2e
ENT-1932 Move MigrationExporter to the "node" module
2018-05-21 10:44:07 +01:00
Shams Asari
152848730d
Merge remote-tracking branch 'open/master' into os-merge-2907250
...
# Conflicts:
# build.gradle
# client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
# node-api/build.gradle
# node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/StringBufferSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/AllButBlacklisted.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/AttachmentsClassLoader.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/DefaultWhitelist.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/GeneratedAttachment.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/OrdinalIO.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SerializationFormat.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SerializationScheme.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SerializeAsTokenContextImpl.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/UseCaseAwareness.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPDescriptorRegistry.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPPrimitiveSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializerFactories.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ArraySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CollectionSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CorDappCustomSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CustomSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializationInput.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializedGenericArrayType.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializedParameterizedType.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EnumEvolutionSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EnumSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Envelope.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EvolutionSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/FingerPrinter.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/MapSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializers.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Schema.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationHelper.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationOutput.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializerFactory.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SingletonSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SupportedTransforms.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/TransformTypes.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/TransformsSchema.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BigDecimalSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BigIntegerSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BitSetSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/CertPathSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ClassSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ContractAttachmentSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/CurrencySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/DurationSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/EnumSetSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/InputStreamSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/InstantSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalDateSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalDateTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/MonthDaySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OffsetDateTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OffsetTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OpaqueBytesSubSequenceSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PeriodSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PrivateKeySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PublicKeySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/SimpleStringSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ThrowableSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/X509CRLSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/X509CertificateSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/YearMonthSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/YearSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ZoneIdSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ZonedDateTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenter.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/Exceptions.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/MetaCarpenter.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/Schema.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/SchemaFields.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/CordaClassResolver.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/CordaClosureSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/DefaultKryoCustomizer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/Kryo.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/KryoSerializationScheme.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/SerializeAsTokenSerializer.kt
# serialization/src/test/java/net/corda/serialization/internal/ForbiddenLambdaSerializationTests.java
# serialization/src/test/java/net/corda/serialization/internal/LambdaCheckpointSerializationTest.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/ErrorMessageTests.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/JavaGenericsTest.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/JavaPrivatePropertyTests.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/JavaSerialiseEnumTests.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/JavaSerializationOutputTests.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/ListsSerializationJavaTest.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/SetterConstructorTests.java
# serialization/src/test/kotlin/net/corda/serialization/internal/AttachmentsClassLoaderTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/ContractAttachmentSerializerTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/CordaClassResolverTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/ListsSerializationTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/MapsSerializationTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/PrivateKeySerializationTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/SerializationTokenTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/SetsSerializationTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/CorDappSerializerTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeAndReturnEnvelopeTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeMapTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentryOfEnumsTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentrySimpleTypesTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentryTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeSimpleTypesTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializedParameterizedTypeTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolvabilityTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolveTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/ErrorMessagesTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolutionSerializerGetterTesting.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolvabilityTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/FingerPrinterTesting.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/GenericsTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/OverridePKSerializerTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/PrivatePropertyTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/SerializationPropertyOrdering.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/SerializeAndReturnSchemaTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/StaticInitialisationOfSerializedObjectTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterTestUtils.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterWhitelistTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/CompositeMemberCompositeSchemaToClassCarpenterTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/EnumClassTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/InheritanceSchemaToClassCarpenterTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/MultiMemberCompositeSchemaToClassCarpenterTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/SingleMemberCompositeSchemaToClassCarpenterTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/kryo/KryoStreamsTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/kryo/KryoTests.kt
# settings.gradle
2018-05-21 10:31:57 +01:00
Matthew Nesbit
b07d5b3f26
Merge pull request #853 from corda/kat-merge-20180517
...
OS -> Ent merge
2018-05-21 09:48:39 +01:00
Katelyn Baker
956f798a74
Fix Socks Proxy Tests
2018-05-19 12:44:03 +01:00
Stefano Franz
b2bc411321
fix build issue on windows
2018-05-18 18:08:42 +01:00
Katelyn Baker
8925ca8954
Fix GitHub's attempt at conflict resolution
2018-05-18 15:42:42 +01:00
Katelyn Baker
3778f029df
Merge branch 'master' into kat-merge-20180517
2018-05-18 14:42:05 +01:00
Stefano Franz
79f18abe60
Merge pull request #458 from corda/stories/ENT-1152/bootstrapper
...
Standalone packaging using two-stage loader (experimental) [ENT-1152]
2018-05-18 14:37:35 +01:00
Patrick
f8070b0811
fix test
2018-05-18 12:02:00 +01:00
Michal Kit
da6957e6d1
Fixes for the CRL feature after the first round of testing ( #837 )
...
* Fixes for the CRL feature after the first round of testing
* Addressing review comments
* Synchronising changes with OS
* Addressing review comments - round 2
2018-05-18 11:17:43 +01:00
Katelyn Baker
1cfc9c6e0c
Post merge cleanup for Max Mem Size
2018-05-18 09:54:56 +01:00
Stefano Franz
07d89c79be
add dependency on node jar task to get corda-node on classpath
...
fix example-node.conf for current master
2018-05-17 16:35:46 +01:00
igor nitto
7d71233a35
Rebased on master (tested manually against simm-valuation-demo)
2018-05-17 16:35:46 +01:00
IgorNitto
d85b17c042
fixes
2018-05-17 16:35:06 +01:00
IgorNitto
18cc1bbb0c
Some Gradle refactoring
2018-05-17 16:35:06 +01:00
