Commit Graph

9665 Commits

Author SHA1 Message Date
5c1ca20dae Detekt 2020-09-25 10:38:46 +01:00
5a93f848b0 Merge remote-tracking branch 'origin/release/os/4.4' into rni/notick-merge-44-45 2020-09-25 09:57:10 +01:00
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
25ab7667a5 backport of bugfix ENT-5752 into OS 4.3 (#6724) (#6744) 2020-09-24 14:30:35 +01:00
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
60309114ec NOTICK Properly merge the two RPCPermissionResolver classes as they diverged 2020-09-22 20:57:49 +01:00
5ff95efbce NOTICK Remove unused imports 2020-09-22 19:14:12 +01:00
a274655e7b NOTICK Delete duplicate class after merge 2020-09-22 18:58:56 +01:00
98bf8a7996 NOTICK Remove eliminated code that was re-introduced from merge 2020-09-22 18:53:25 +01:00
2b0d58c7aa NOTICK Fix callsite after merge 2020-09-22 18:42:31 +01:00
88386f38a9 NOTICK Remove leftover var after merge 2020-09-22 18:38:33 +01:00
b87e06c578 INFRA-746 Block build changes to 4.6 (#6737) 2020-09-22 16:05:40 +01:00
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
88a205600d INFRA-749 Shut down and delete test H2 databases (#6739) 2020-09-22 14:32:01 +01:00
ed9f6f0ce1 Merge branch 'release/os/4.6' into rfowler-os-4.6-ent-4.6-20200922 2020-09-22 11:42:00 +01:00
cfb28f6a1f backport of bugfix ENT-5752 into OS 4.3 (#6724) 2020-09-21 12:27:12 +03:00
b6cd4fa997 NOTICK: Fix JDK11 regression build (#6733)
* Sync JDK11 regression build with JDK8 parallel regression build
2020-09-19 09:08:14 +01:00
f97bb594b2 Merge remote-tracking branch 'origin/release/os/4.3' into rni/notick/merge-43-44 2020-09-18 16:42:26 +01:00
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
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
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
f27f6e307f Merge branch 'release/os/4.5' into INFRA-683-os-46-linear-builds-parallel-stages 2020-09-18 11:07:10 +02:00
87f7323f0e Merge pull request #6727 from corda/INFRA-683-os-45-linear-builds-parallel-stages
INFRA-683: Refactoring of regression Jenkins configuration
2020-09-18 10:59:49 +02:00
a56a93553b Refactoring of regression Jenkins configuration
* removed archiving of Gradle JUnit HTML reports
* collection of JUnit tests moved to stage in parallel branch
2020-09-18 10:57:54 +02:00
84c2a5157b Merge pull request #6725 from corda/INFRA-683-os-44-linear-builds-parallel-stages
INFRA-693: Refactoring of regression Jenkins configuration
2020-09-18 10:36:41 +02:00
c90eb8c805 Switching linear regression build on two agents 2020-09-18 08:46:08 +02:00
c8216be92c Refactoring of regression Jenkins configuration
* removed archiving of Gradle JUnit HTML reports
* collection of JUnit tests moved to stage in parallel branch
2020-09-18 08:14:26 +02:00
1d43471709 Refactoring of regression Jenkins configuration
* removed archiving of Gradle JUnit HTML reports
* collection of JUnit tests moved to stage in parallel branch
2020-09-18 08:09:20 +02:00
2064a572ba CORDA-4034 ENT-5679 CORDA-3845 Correct instability of linear builds (#6722)
* CORDA-4034 Reduce forkEvery to 15 to attempt to mitigate memory leak.
* ENT-5679 Disable test which triggers OOM
* Run tests on two Jenkins agents
* Fixed processing JUnit test results by Allure
* Add timeouts to VaultObserverExceptionTest
* Revert "CORDA-3845: Update BC, log4j, slf4j (#6699)" to eliminate introduced memory leaks

Co-authored-by: Waldemar Zurowski <waldemar.zurowski@r3.com>
2020-09-18 00:23:16 +01:00
0b20d8b928 Merge pull request #6720 from corda/adel/merge-from-4.5-17-Sept
NOTICK: Merge OS 4.5 to OS 4.6
2020-09-17 12:32:47 +01:00
01cd8d6415 Merge remote-tracking branch 'origin/release/os/4.5' into adel/merge-from-4.5-17-Sept 2020-09-17 10:34:01 +01:00
5c6acb0909 CORDA-3968: Prepare keystore handling for certificate rotation [OS] (#6698)
* CORDA-3968: Move keystore logic to KeyStoreHandler.

* CORDA-3967: Stop generating node legal identity in runtime.

* CORDA-3969: Remove Node CA access at node normal runtime.

* CORDA-3968: Fix handling of absent keystore file and wrong password.
2020-09-17 10:15:46 +01:00
acb82f77b4 CORDA-3974: NetworkMapCache should link entries with different public keys by X.500 name (#6711) 2020-09-17 09:25:42 +01:00
2498bb3ae1 [ENT-5752]-Fall back on NM cache if NM service is unreachable during node start-up (#6716) 2020-09-16 18:13:44 +01:00
cc14c8e53a CORDA-4034 Rebuild AuthDBTests so H2 shuts down correctly (#6718)
* CORDA-4034 Rebuild AuthDBTests so H2 shuts down correctly
2020-09-16 16:44:31 +01:00
83ec8289b6 ENT-5492 Let the MissingAttachmentException through the RPC (#6719)
* CORDA-4036: Put the identity failures on the same log so they aren't missed.

* ENT-5492: Let the MissingAttachmentException propagate out
2020-09-16 16:41:11 +01:00
afd3876faf CORDA-4036: Put the identity failures on the same log so they aren't missed. (#6717) 2020-09-16 16:37:16 +01:00
bd7b96e816 ENT-5768 startFlowWithClientId permissions (#6708)
Do not let a user reattach to a flow started by another user.

Reattaching to a flow using startFlowWithClientId for a flow not
started by the current user throws a PermissionException

Reattaching to a flow using reattachFlowWithClientId for a flow not
started by the current user returns null.

finishedFlowsWithClientIds does not return flows started by other
users.

Normal rpc permissions around startFlowWithClientId and
startFlowDynamicWithClientId has also been added.

To allow admins to remove client ids as well as be able to see all the
client ids on the node, admin versions have been added that bypass the
user restrictions. These can be permitted via rpc to only provide
their usage to admins.
2020-09-16 16:11:06 +01:00
6ab9557061 Use safe navigation operator for correct field
when checking the time of previous build.
Handles an edge case when there is the very first build for the branch
2020-09-16 14:54:57 +02:00
64b3000c27 CORDA-4035: Fixed issue with backslash on windows when scanning. (#6715) 2020-09-16 13:12:54 +01:00
0226f7ccb9 CORDA-4034 Shut down node in AuthDBTests (#6714) 2020-09-16 13:10:54 +01:00
1ac88c28d5 Merge pull request #6710 from corda/INFRA-683-os-45-linear-builds
INFRA-683: OS 45 linear builds
2020-09-16 13:07:03 +01:00
c387c2cb95 Synchronised changes with OS 4.4 branch 2020-09-16 10:23:11 +02:00
bcfbe22d1a Synchronised changes with OS 4.3 branch 2020-09-16 10:22:36 +02:00
b746d5cb22 ENT-5759 Give the failing test CorDapp a different package name so it does not get added automatically to all tests. (#6712) 2020-09-15 16:52:08 +01:00
ebd36c22e7 Removed unused import 2020-09-15 15:42:17 +02:00
342041c737 NOTICK - Remove unused code (#6694) 2020-09-15 13:53:57 +01:00
99841dcaeb Merge branch 'release/os/4.4' into INFRA-683-os-45-linear-builds 2020-09-15 14:27:34 +02:00
bcce0e9519 INFRA-683 Move OS 4.4 release branch builds to linear (#6705)
* Do not use Security.addProvider(BouncyCastleProvider()) in tests, to avoid disruptions of other tests.
* Forcibly register security providers before starting Jimfs, to resolve a sequencing problem where Jimfs triggers loading of the SFTP filesystem provider, which in turn registers the standard BouncyCastle provider rather than the patched version Corda needs.
* INFRA-683 Move Corda OS release branch builds to serial (#6703)

Co-authored-by: Waldemar Zurowski <waldemar.zurowski@r3.com>
Co-authored-by: Denis Rekalov <denis.rekalov@r3.com>
Co-authored-by: Waldemar Zurowski <waldemar.zurowski@r3.com>
2020-09-15 13:18:46 +01:00
80bac915ee INFRA-683: manual sync with enterprise 43 (#6709)
* Add support for handling release candidate for Docker publishing
* Re-enabled Sonatype check
* Artifactory build name includes branch / tag name
* Environment variables sorted alphabetically
2020-09-15 12:10:06 +01:00