Denis Rekalov
c9056f171b
CORDA-4062: Bump platform version to 9 for safe identity key rotation ( #6777 )
2020-10-20 12:31:47 +03:00
Denis Rekalov
4193adf6fd
CORDA-3979: Support for multiple trust roots ( #6772 )
2020-10-20 12:18:00 +03:00
Denis Rekalov
401d8b8856
ENT-5888: Resurrect node_hash_to_key ( #6776 )
2020-10-19 12:56:12 +03:00
Denis Rekalov
551b3f0811
CORDA-4054: combine different identities of the same notary after its key rotation ( #6734 )
2020-10-16 13:53:04 +01:00
Alexey Kadyrov
d0cfeb1fbe
EG-3714 reverted previous change as unnecessarily ( #6773 )
2020-10-15 13:03:24 +03:00
Ross Nicoll
8ef739b555
NOTICK Merge OS 4.6 -> 4.7
2020-10-15 09:01:55 +01:00
Ross Nicoll
1ccd84bbcb
Merge remote-tracking branch 'origin/release/os/4.6' into rni/notick/merge-46-47
2020-10-14 15:52:56 +01:00
Alexey Kadyrov
9d87c5dfb9
added @Throws to CryptoService and changed the CustomConfigParser to be JAVA annotation ( #6767 )
2020-10-14 14:08:03 +01:00
Ross Nicoll
64dc73c7b1
ENT-5679 Correct instability of linear builds ( #6722 ) ( #6770 )
...
Disable test which triggers OOM
2020-10-14 13:51:35 +01:00
Ross Nicoll
eb65cdc08a
CORDA-4045 Adjust test to remove scope for race conditions ( #6769 )
...
Change assertion in `Restart does not set senderUUID` to verify a single message has a sender UUID set, rather than the last to be recorded as sent has no sender UUID.
2020-10-14 13:44:41 +01:00
Ben McMahon
12f1603822
INFRA-504 Change to use an out of process node ( #6538 )
...
* Change to use an out of process node
* Remove exception swallowing and add package for test constants to test process
2020-10-12 17:00:39 +01:00
Denis Rekalov
cdd725e79c
CORDA-3972: Support for node identity rotation in IdentityService ( #6752 )
2020-10-12 18:01:32 +03:00
Ramzi El-Yafi
e2efbaea35
AG-341 Notary backpressure mechanism improvements ( #6762 )
...
Notary backpressure mechanism improvements
2020-10-08 09:12:45 +01:00
Ben McMahon
2790e945c6
INFRA-687 Change to use an out of process node ( #6696 )
...
* Change to use an out of process node
* Remove exception swallowing and add package for test constants to test process
2020-10-05 18:12:31 +01:00
Denis Rekalov
ee8f4ce733
Merge pull request #6761 from corda/denis/merge-os-4.5-to-4.6
...
NOTICK: merge OS 4.5 to 4.6
2020-10-05 12:58:32 +01:00
Denis Rekalov
6813033997
Merge branch 'release/os/4.5' into denis/merge-os-4.5-to-4.6
2020-10-05 14:09:00 +03:00
Ross Nicoll
75a744e297
Revert "INFRA-746 Block build changes to 4.6 ( #6737 )" ( #6760 )
...
This reverts commit b87e06c578
, which was only needed until the 4.6
release shipped.
2020-10-05 11:55:55 +01:00
Ross Nicoll
17c09cc98f
Merge pull request #6759 from corda/denis/merge-os-4.4-to-4.5
...
NOTICK: merge OS 4.4 to 4.5
2020-10-05 11:44:57 +01:00
Ramzi El-Yafi
f73bb5ae11
NOTICK Add AG tickets to pr title check ( #6747 )
2020-10-05 11:23:39 +01:00
Denis Rekalov
c823398f0c
Merge branch 'release/os/4.4' into denis/merge-os-4.4-to-4.5
2020-10-05 12:53:51 +03:00
Denis Rekalov
59d0410353
Merge pull request #6757 from corda/denis/merge_os_4.5_to_4.6
...
NOTICK: Merge OS 4.5 to 4.6
2020-10-05 10:35:12 +01:00
Rick Parker
3c919f0d69
Merge pull request #6756 from corda/denis/merge-os-4.3-to-4.4
...
NOTICK: Merge OS 4.3 to 4.4
2020-10-05 09:35:36 +01:00
Denis Rekalov
e837bb0ca8
Merge branch 'release/os/4.5' into denis/merge_os_4.5_to_4.6
2020-10-02 21:43:57 +01:00
Denis Rekalov
70769b137a
Merge branch 'release/os/4.3' into denis/merge-os-4.3-to-4.4
2020-10-01 13:05:50 +01:00
Denis Rekalov
07d9a1ead8
CORDA-4043: Generate 16-octets certificate serial numbers ( #6746 ) ( #6755 )
2020-10-01 12:26:51 +01:00
Denis Rekalov
396671cb87
CORDA-4043: Generate 16-octets certificate serial numbers ( #6746 )
2020-09-30 13:39:26 +01:00
Dan Newton
dcc65b1d65
NOTICK Change class byteman references ( #6749 )
...
Scripts now reference the class `ProxyConnection` which is an implementation of `Connection`, to address JDK 11 compatibility issue.
2020-09-25 15:42:14 +01:00
Ross Nicoll
2dd2029e24
Merge pull request #6748 from corda/INFRA-683-os-45-bouncy-castle
...
NOTICK Merge OS 4.4 to 4.5
2020-09-25 13:42:25 +01:00
Andrius Dagys
cfd57faf5f
NOTICK: Update network parameter maxMessageSize API doc ( #6334 )
...
This network parameter is now enforced contrary to the description.
2020-09-25 11:25:51 +01:00
Ross Nicoll
5c1ca20dae
Detekt
2020-09-25 10:38:46 +01:00
Ross Nicoll
5a93f848b0
Merge remote-tracking branch 'origin/release/os/4.4' into rni/notick-merge-44-45
2020-09-25 09:57:10 +01:00
Ross Nicoll
8048cb4966
CORDA-3845: Update BC, log4j, slf4j ( #6699 ) ( #6742 )
...
* CORDA-3845: Update BC, log4j, slf4j (#6699 )
* CORDA-3845: Update BC to 1.64
* CORDA-3845: Upgraded log4j to 2.12.1
* We can remove the use of Manifests from the logging package so that when _it_ logs it doesn't error on the fact the stream was already closed by the default Java logger.
* Remove the logging package as a plugin
* latest BC version
* Remove old test
* Fix some rebased changes to log file handling
* Update slf4j too
Co-authored-by: Ryan Fowler <fowlerrr@users.noreply.github.com>
Co-authored-by: Adel El-Beik <adel.el-beik@r3.com>
2020-09-25 09:54:59 +01:00
Jerome Gerakis
25ab7667a5
backport of bugfix ENT-5752 into OS 4.3 ( #6724 ) ( #6744 )
2020-09-24 14:30:35 +01:00
Rick Parker
d691037f3a
Merge pull request #6740 from corda/rfowler-os-4.6-ent-4.6-20200922
...
NOTICK Merge OS 4.6 -> OS 4.7 20200922
2020-09-23 11:02:48 +01:00
Kyriakos Tharrouniatis
60309114ec
NOTICK Properly merge the two RPCPermissionResolver classes as they diverged
2020-09-22 20:57:49 +01:00
Kyriakos Tharrouniatis
5ff95efbce
NOTICK Remove unused imports
2020-09-22 19:14:12 +01:00
Kyriakos Tharrouniatis
a274655e7b
NOTICK Delete duplicate class after merge
2020-09-22 18:58:56 +01:00
Kyriakos Tharrouniatis
98bf8a7996
NOTICK Remove eliminated code that was re-introduced from merge
2020-09-22 18:53:25 +01:00
Kyriakos Tharrouniatis
2b0d58c7aa
NOTICK Fix callsite after merge
2020-09-22 18:42:31 +01:00
Kyriakos Tharrouniatis
88386f38a9
NOTICK Remove leftover var after merge
2020-09-22 18:38:33 +01:00
Ross Nicoll
b87e06c578
INFRA-746 Block build changes to 4.6 ( #6737 )
2020-09-22 16:05:40 +01:00
Ross Nicoll
8215d41eb8
Merge pull request #6732 from corda/rni/notick/merge-43-44
...
NOTICK Merge test stability fixes from 4.3 to 4.4
2020-09-22 16:03:37 +01:00
Ross Nicoll
88a205600d
INFRA-749 Shut down and delete test H2 databases ( #6739 )
2020-09-22 14:32:01 +01:00
Ryan Fowler
ed9f6f0ce1
Merge branch 'release/os/4.6' into rfowler-os-4.6-ent-4.6-20200922
2020-09-22 11:42:00 +01:00
Jerome Gerakis
cfb28f6a1f
backport of bugfix ENT-5752 into OS 4.3 ( #6724 )
2020-09-21 12:27:12 +03:00
Waldemar Żurowski
b6cd4fa997
NOTICK: Fix JDK11 regression build ( #6733 )
...
* Sync JDK11 regression build with JDK8 parallel regression build
2020-09-19 09:08:14 +01:00
Ross Nicoll
f97bb594b2
Merge remote-tracking branch 'origin/release/os/4.3' into rni/notick/merge-43-44
2020-09-18 16:42:26 +01:00
Dan Newton
317b59ab9d
NOTICK Fix kill flow standalone rpc client test ( #6721 )
...
Test was flaky because the flow can finish below it can be killed,
therefore failing the test. Sleep for 1 minute instead to give plenty of
time for the test.
2020-09-18 15:15:44 +01:00
Waldemar Żurowski
a5db6b8ac0
Merge pull request #6728 from corda/INFRA-683-os-46-linear-builds-parallel-stages
...
INFRA-683: os 46 linear builds parallel stages
2020-09-18 13:21:33 +02:00
Waldemar Żurowski
da73cbf2a5
Merge pull request #6729 from corda/INFRA-683-os-47-linear-builds-parallel-stages
...
INFRA-683: Switching linear regression build on two agents
2020-09-18 11:14:47 +02:00