12395 Commits

Author SHA1 Message Date
josecoll
191eef12cb
Fix bootstrapper publication problem. (#3370) 2018-06-14 18:17:53 +01:00
Mike Hearn
0241c83809 Make Gradle fail fast when a unit test doesn't succeed. 2018-06-14 17:22:40 +01:00
Mike Hearn
94c7113305 Upgrade to Gradle 4.8 2018-06-14 17:22:40 +01:00
Michal Kit
377d980c99
Fixing filename typo (#3358) 2018-06-14 16:35:42 +01:00
Joel Dudley
df0c9dc135
Adds instructions for building Gradle plugins (#3372)
* Update building-against-master.rst

* Self-review.
2018-06-14 15:57:49 +01:00
Chris Rankin
14dcce49ac
ENT-1463, ENT-1903: Raise minimum JDK to 8u171 to fix ZIP compression bugs, (#3367)
* Update JarFilter unit tests to show any Gradle stacktraces.
* Raise minimum version of JDK8 to 8u171 - fixes ZIP compression bugs.
2018-06-14 15:18:44 +01:00
Konstantinos Chalkias
5a6af7f8ce Merge remote-tracking branch 'open/master' into kostas-merge-14_06_2018 2018-06-14 14:43:44 +01:00
Konstantinos Chalkias
81730b0a14 [CORDA-1515] Clarify distinction between non-validating and validating notaries (#3369) 2018-06-14 14:34:56 +01:00
Joel Dudley
c15fde242f
Adds header of SGX design doc subheaders don't spill (#3366) 2018-06-14 13:46:20 +01:00
Florian Friemel
8f4973cd00
[CORDA-1617] Fix explorer login error handling. (#3365)
When specifying incorrect connection details for the nodes (e.g.,
  wrong port), an RPCException would be thrown which was not
  handled correctly, resulting in busy waiting on the UI thread.

  Ideally the login should not block the UI thread anyways, but
  for now this fix is the most pragmatic solution.
2018-06-14 13:09:03 +01:00
Katarzyna Streich
3d107200a1
Fix flaky test (#3363) 2018-06-14 10:20:18 +01:00
Tommy Lillehagen
f3fb03a455
Merge pull request #999 from corda/tlil-os-merge-20180613
OS->ENT merge 2018-06-13
2018-06-14 09:16:49 +01:00
Tommy Lillehagen
a612ca234a Merge remote-tracking branch 'open/master' into tlil-os-merge-20180613 2018-06-13 21:45:00 +01:00
Joel Dudley
fea296058a
Cleanup of docs about building against master (#3361)
* Small fixes to building-against-master docs

* Self-review

* Fixes bullet numbers.
2018-06-13 19:51:34 +01:00
Tommy Lillehagen
18cfcb887d
Merge pull request #3359 from corda/tlil/CORDA-1609/fix-rpc-config-api-break
CORDA-1609 - Don't use reserved keyword as method name
2018-06-13 18:25:23 +01:00
Andrius Dagys
0056a2232c
CORDA-1628: Increase max restart count for notary client flows. (#3357)
This will ensure that the notary client flow will retry over a sufficient
period of time for the notary to update its network map.

With a backoff base of 1.8 and 5 retries the last retry will fire after
about 20 min 8 sec of the initial flow start:

#   Timeout, sec
0	30
1	54
2	97.2
3	174.96
4	314.928
5	566.8704

Total 1207.9584	= 20.13264 min
2018-06-13 17:46:32 +01:00
Tommy Lillehagen
50d9d80883 CORDA-1609 - Remove @NotNull annotation from toString() 2018-06-13 17:05:05 +01:00
Rick Parker
aa09e81464 CORDA-1599 Add remove call to multi-threaded killFlow implementation (#971) 2018-06-13 16:56:01 +01:00
Tommy Lillehagen
3bbf7258a1 CORDA-1609 - Update snapshot for CordaRPCClientConfiguration to reflect recent additions 2018-06-13 16:38:58 +01:00
James Brown
026a4864b1
ENT-1387 h2port config changes with new h2Settings block
* Introduce new h2Settings config block which overrides h2Port
* H2 server listens on localhost by default
* Change is backward compatible and old h2Port option can still be used but that always listens  on localhost now
* Update changelog and docs with H2 changes
2018-06-13 16:23:39 +01:00
Joel Dudley
636f0d8c92
Clearer docs of Dockerform options (#3350)
* Clearer docs of Dockerform options

* Self-review
2018-06-13 15:51:44 +01:00
Michele Sollecito
ac590d7920
Merge pull request #988 from corda/merges/june-13-13-27
Merges: June 13 at 13:27
2018-06-13 15:46:27 +01:00
Tommy Lillehagen
caee24ad7a CORDA-1609 - Manually patch API snapshot for CordaRPCClientConfiguration to V3.1 2018-06-13 15:43:41 +01:00
Tommy Lillehagen
fe313951ea CORDA-1609 - Don't use reserved keyword as method name
As reported in [CORDA-1609](https://r3-cev.atlassian.net/browse/CORDA-1609),
`CordaRPCClientConfiguration.default` is not accessible from Java since
`default` is a reserved keyword.

As part of the refactor made in #2831, `CordaRPCClientConfiguration` went
from being a data class to an interface with a backing implementation of
type `CordaRPCClientConfigurationImpl`.

This resulted in Java users having to rewrite code that was on the form:

```java
final CordaRPCClient client = new CordaRPCClient(
    nodeAddress, CordaRPCClientConfiguration.DEFAULT
);
```

to something like this:

```java
final CordaRPCClient client = new CordaRPCClient(
    nodeAddress, CordaRPCClientConfiguration.Companion.default()
);
```

However, this does not work. The user would get a compilation error because
`default` is a reserved keyword in Java.

Since `CordaRPCClientConfiguration` has been made an interface, there is no
easy way of introducing a static final field on the interface from Kotlin.

Consequently, I've changed this back to using a `class` with a static field
named `DEFAULT` instead of the static method `default()`.

It should be noted that `default()` / `DEFAULT` is currently only used
internally to pass in default values in `CordaRPCClient.kt` and
`CordaRPCClientUtils.kt`. That said, it is exposed as part of our API
surface and consequently shouldn't be broken.

The latter means that in the above example, the user would actually not
have to provide the parameter at all:

```java
final CordaRPCClient client = new CordaRPCClient(nodeAddress);
```

As can be seen from the definition of `CordaRPCClient`:

```kotlin
class CordaRPCClient private constructor(...) {
    @JvmOverloads
    constructor(
        hostAndPort: NetworkHostAndPort,
        configuration: CordaRPCClientConfiguration = CordaRPCClientConfiguration.DEFAULT
    ) : this(hostAndPort, configuration, null)
```

The mentioned [refactor](7a077e76f0 (diff-0948c125db93a22263eb81eaf3161c17R65))
did not make it into the 3.1 release, so from an API-stability perspective,
this change can be applied without affecting our commitment to a
backwards compatible API..
2018-06-13 15:39:03 +01:00
sollecitom
86b34b1227 Merge remote-tracking branch 'remotes/open/master' into merges/june-13-13-27
# Conflicts:
#	docs/source/changelog.rst
#	docs/source/index.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
2018-06-13 13:36:31 +01:00
Rick Parker
d95b1b0e6a
CORDA-1622 Correct broken de-dup header logic on node restart for restored flows. Multi-threaded version. (#985) 2018-06-13 13:31:18 +01:00
cburlinchon
70a1a3a3d4
[ENT-2039] Move mutual exclusion check to run first (#946)
* Don't sleep inside database transaction
2018-06-13 13:31:02 +01:00
Michele Sollecito
a4a75cf22d
[ENT-1893]: Db evolution documentation for CorDapp developers. (#986) 2018-06-13 13:25:23 +01:00
Thomas Schroeter
bc93275f00
Add HA notary setup tutorial (#937) 2018-06-13 13:18:44 +01:00
Rick Parker
ab2b27915a
Merge pull request #984 from corda/parkri-os-merge-20180613-1
OS -> ENT merge up to and including d5d46c674dda89332520b019c3fbf8ef7371fa48
2018-06-13 13:13:49 +01:00
Viktor Kolomeyko
1011e45b84
ENT-1962: Perform RPC retry in case of RejectedCommandException (#982)
* ENT-1962: Perform RPC retry in case of RejectedCommandException

(cherry picked from commit 2a7f0dd)

* ENT-1962: Address code-review comments.

(cherry picked from commit 7b4edde)
2018-06-13 12:33:36 +01:00
Mike Hearn
eaf7adab20 Fixup a merge conflict 2018-06-13 12:23:47 +01:00
Mike Hearn
9cedfbdd59 Docs: take out the participation section from the enterprise docs. 2018-06-13 12:23:47 +01:00
Mike Hearn
ebb351b76b Docs: create a top level Corda Firewall section. 2018-06-13 12:23:47 +01:00
Mike Hearn
454a75c612 Docs: rewrite the front page and re-arrange the enterprise toctree to highlight unique features. 2018-06-13 12:23:47 +01:00
Mike Hearn
b9156baa0b Docs: misc markup fixes to corda-bridge-component.rst 2018-06-13 12:23:47 +01:00
Michal Kit
d97f4f58be
CORDA-1624 updating the DEV certificate with CRL distribution point (#3353)
* CORDA-1624 updating DEV certificates with CRL distribution points implying R3 owned endpoints

* Keeping old keys but updating certificates
2018-06-13 12:01:15 +01:00
rick.parker
dce127768a CORDA-1599 Compilation fixes. 2018-06-13 11:13:47 +01:00
rick.parker
cb810f0660 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180613-1
# Conflicts:
#	.idea/compiler.xml
#	build.gradle
#	docs/source/changelog.rst
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
2018-06-13 11:13:43 +01:00
Tudor Malene
cb50e58367
CORDA-1558 Rename database migration to database management (#979)
* CORDA-1558 Rename database migration to database management

* CORDA-1558 Address code review comments

* CORDA-1558 Address code review comments

* CORDA-1558 Address code review comments
2018-06-13 10:52:00 +01:00
Matthew Nesbit
4bf5d809a5
If the Artemis connectionTTL configuration is not set then some of the cleanup actions do not happen on client kill. This prevents durable messages being replayed (#3351)
and may prevent cleanup of other resources.

Undo spurious code
2018-06-13 10:32:29 +01:00
Michele Sollecito
e2701e69d6
[CORDA-1612]: Fix truncated code snippets in docs PDF (#3347) 2018-06-13 09:43:16 +01:00
Andrius Dagys
d5d46c674d CORDA-1494: Minor - improve error message when max retries reached for notarisation (#3355) 2018-06-13 09:04:05 +01:00
Chris Rankin
2522cee010
Merge pull request #977 from corda/chrisr3-os-merge
Merge from OS up to 8087f3c5d3c823a5fbda9a728f129b0925c1fddb.
2018-06-12 18:45:12 +01:00
Michele Sollecito
7fec9df99e
Fixed double JAR publishing problem with network bootstrapper. (#3354) 2018-06-12 18:08:31 +01:00
Rick Parker
2f737cd6bc
CORDA-1622 Correct broken de-dup header logic on node restart for res… (#3352)
* CORDA-1622 Correct broken de-dup header logic on node restart for restored flows.

* Missed a volatile
2018-06-12 18:00:44 +01:00
Rick Parker
bfc3ab2427
CORDA-1620 Disable some perf tests to keep the number of RPC clients down. (#980) 2018-06-12 15:46:18 +01:00
Christian Sailer
b09a57d768
ENT-1943 non clustered primary keys (#880)
* ENT-1943 Add liquibase change sets to remove clustered indices from primary  keys

* ENT-1943 Add liquibase change sets to remove clustered indices from primary  keys

* Don't apply non-clustered PK change when using H2

* Move primary key changesets to separate file for core migration files
Use `onValidationFail` rather than precondition to exclude these changes from H2

* Remove/readd foreign key constraint to make SQL server less unhappy

* Fix linear states schema migration

* Fix notary states changelog issues

* Remove v3-GA from master changelog
2018-06-12 15:40:25 +01:00
Chris Rankin
319953ba41 Merge commit '8087f3c5d3c823a5fbda9a728f129b0925c1fddb' into chrisr3-os-merge 2018-06-12 14:11:27 +01:00
Joel Dudley
92889cef5c
Update task so it can be run outside of the main Corda repo. (#3349) 2018-06-12 14:10:57 +01:00