9984 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rick Parker	097011784b	Merge pull request #7350 from corda/cc/merge/os-4.6-os-4.7/24-apr-2023 ... ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates	2023-04-25 08:49:36 +01:00
Ronan Browne	95a494f75a	INFRA-2040: Merging forward updates from 4.9 to 4.10 (2023-04-24)	2023-04-24 20:41:10 +01:00
Chris Cochrane	91c38fa84b	Merge branch 'release/os/4.6' into cc/merge/os-4.6-os-4.7/24-apr-2023 ... Fwd-merge from OS 4.6.	2023-04-24 20:13:50 +01:00
Adel El-Beik	58366caa3d	Merge pull request #7340 from corda/cc/merge/os-4.5-os-4.6/20-apr-2023 ... ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates	2023-04-24 14:57:34 +01:00
Ronan Browne	82018bc7eb	Merge pull request #7341 from corda/ronanb/merge-4.8-4.9-2023-04-21 ... INFRA-2040: Merging forward updates from 4.8 to 4.9	2023-04-21 16:38:40 +01:00
Chris Cochrane	e5a6cac9e8	Flakey test fix	2023-04-21 16:00:19 +01:00
Ronan Browne	5db96e679c	use correct agent	2023-04-21 08:43:29 +01:00
Ronan Browne	269b196c57	INFRA-2040: Merging forward updates from 4.8 to 4.9 (2023-04-21)	2023-04-21 08:42:42 +01:00
Chris Cochrane	fc758ab766	Update build.gradle ... Co-authored-by: Viktor Kolomeyko <viktor.kolomeyko@r3.com>	2023-04-20 17:14:23 +01:00
Chris Cochrane	c58c49d27a	Upgrade corda/crash, snakeyaml	2023-04-20 14:01:20 +01:00
Adel El-Beik	845a72cf5b	Merge pull request #7337 from corda/cc/os/4.5/ent-7033/upgrade_shiro ... ENT-7033 - upgrade shiro	2023-04-20 10:10:40 +01:00
Chris Cochrane	641a47bf32	Upgraded shiro to address security issues	2023-04-20 07:37:00 +01:00
Adel El-Beik	f906bfc14b	Merge pull request #7335 from corda/cc/os/4.5/security_vulnerabilities ... ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096 - dependency updates	2023-04-19 15:35:17 +01:00
Chris Cochrane	c263ba7563	Updated to fix Jackson tests	2023-04-19 13:06:35 +01:00
Ronan Browne	b6fbef5463	Merge pull request #7334 from corda/ronanb/merge-4.7-4.8-2023-04-18 ... INFRA-2040: Merging forward updates from 4.7 to 4.8	2023-04-19 09:11:34 +01:00
Chris Cochrane	29dfda3730	Resolved build-check issues	2023-04-18 20:34:42 +01:00
Chris Cochrane	dfbfda5520	Upgrade corda/crash	2023-04-18 19:30:22 +01:00
Ronan Browne	90cecf69e5	INFRA-2040: Merging forward updates from 4.7 to 4.8 (2023-04-18)	2023-04-18 19:20:47 +01:00
Ronan Browne	2ffe2eafcb	Merge pull request #7333 from corda/ronanb/merge-4.6-4.7-2023-04-17 ... INFRA-2040: Merging forward updates from 4.6 to 4.7 2023-04-17	2023-04-18 17:11:24 +01:00
Ronan Browne	1e7a515a8a	INFRA-2040: Merging forward updates from 4.6 to 4.7	2023-04-17 17:26:39 +01:00
Ronan Browne	f189fad14a	Merge pull request #7331 from corda/ronanb/merge-4.5-4.6-2023-04-16 ... * INFRA-1955: Shared lib implicit import syntax * INFRA-2040: remove lingering nexus code (#7330)	2023-04-17 17:22:53 +01:00
Ronan Browne	5e9dee18b1	INFRA-2040: Merging forward updates from 4.5 to 4.6 (2023-04-16)	2023-04-16 18:23:22 +01:00
Ronan Browne	2e9f62f4da	INFRA-2040: remove lingering nexus code (#7330)	2023-04-16 18:19:43 +01:00
Rick Parker	fc53176175	Merge pull request #7328 from corda/shams-4.10-fwrd-merge-ceb76c56 ... ENT-8898 & ENT-9569: Forward merge from 4.9 to 4.10 (ceb76c56)	2023-04-13 09:21:28 +01:00
Shams Asari	33f7fea8d2	Fix compile issues	2023-04-12 16:30:37 +01:00
Shams Asari	7b6fc51710	Merge branch 'release/os/4.9' into shams-4.10-fwrd-merge-ceb76c56 ... # Conflicts: # common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/SSLHelper.kt	2023-04-12 16:23:59 +01:00
Rick Parker	ceb76c56de	Merge pull request #7325 from corda/shams-4.9-fwrd-merge-d140cb59 ... ENT-8898 & ENT-9569: Forward merge from 4.8 to 4.9 (4cedeb7)	2023-04-12 15:30:55 +01:00
Shams Asari	40697d5450	Merge branch 'release/os/4.8' into shams-4.9-fwrd-merge-d140cb59	2023-04-12 10:46:00 +01:00
Adel El-Beik	4cedeb7b9e	Merge pull request #7326 from corda/shams-revert-quasar-jar ... ENT-9569: Revert lib/quasar.jar	2023-04-12 09:47:40 +01:00
Shams Asari	04d86e9cfe	ENT-9569: Revert lib/quasar.jar ... It was meant to be deleted (since it's meant to be git ignored), instead it was changed. Reverting the file back to its original content, and leaving as is.	2023-04-11 15:56:55 +01:00
Shams Asari	c9fd22855e	Resolve compile issues	2023-04-11 12:16:02 +01:00
Shams Asari	724a4e5a36	Merge branch 'release/os/4.8' into shams-4.9-fwrd-merge-d140cb59 ... # Conflicts: # node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt # node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt # node/src/main/kotlin/net/corda/node/internal/artemis/CertificateChainCheckPolicy.kt	2023-04-11 11:54:26 +01:00
Adel El-Beik	d140cb5974	Merge pull request #7323 from corda/shams-ent-8898-cherrypick ... ENT-8898: Revert change made to externalCrlSource checking	2023-04-11 09:33:38 +01:00
Chris Cochrane	95c4a18352	ENT-6336,ENT-6960 - upgrade snakeyaml to address security vulnerabilities	2023-04-06 19:14:30 +01:00
Shams Asari	ddb979d693	ENT-8898: Revert change made to externalCrlSource checking ... It's now moved back to createPKIXRevocationChecker(). RevocationConfig.enrichExternalCrlSource has also been removed, and moved to where it's called.	2023-04-06 14:42:38 +01:00
Shams Asari	1e6ccfdb60	ENT-8898: Replaced JDK cert revocation with custom plugable implementation (#7322)	2023-04-03 10:26:01 +01:00
Shams Asari	0213861d22	ENT-9569: Apply the 60s SSL handshake timeout to the embedded Artemis server (#7315)	2023-03-22 13:22:12 +00:00
Adel El-Beik	96eb683d89	Merge pull request #7319 from corda/connelm/INFRA-1955/forward-merge-49-410 ... INFRA-1955: Merging forward from 4.9 to 4.10	2023-03-22 09:49:56 +00:00
Connel McGovern	db08eb3a9b	INFRA-1955: Merging forward from 4.9 to 4.10	2023-03-21 14:59:02 +00:00
Adel El-Beik	55ef162764	Merge pull request #7314 from corda/connelm/INFRA-1955/shared-lib-import-syntax4.7 ... INFRA-1955: Shared lib implicit import syntax	2023-03-17 10:09:10 +00:00
Adel El-Beik	5794ddd695	Merge pull request #7316 from corda/connelm/INFRA-1955/forward-merge-48-49 ... INFRA-1955: Merging forward from 4.8 to 4.9	2023-03-17 10:08:18 +00:00
Connel McGovern	6e56dffba8	INFRA-1955: Shared lib implicit import syntax (#7313)	2023-03-15 14:49:10 +00:00
Ronan Browne	212cee2406	Merge pull request #7312 from corda/connelm/INFRA-1955/shared-lib-import-syntax ... INFRA-1955: Shared lib implicit import syntax	2023-03-15 14:49:01 +00:00
Connel McGovern	519ae9ab81	INFRA-1955: Merging forward from 4.8 to 4.9	2023-03-15 10:48:53 +00:00
Connel McGovern	21d91171bc	INFRA-1955: Shared lib implicit import syntax	2023-03-15 09:58:00 +00:00
Connel McGovern	e70505afca	INFRA-1955: Shared lib implicit import syntax	2023-03-15 09:53:13 +00:00
Ronan Browne	ae953885d6	Merge pull request #7311 from corda/connelm/INFRA-1955/forward-merge-47-48 ... INFRA-1955: Merging forward from 4.7 to 4.8	2023-03-15 09:33:36 +00:00
Ronan Browne	f7c465d3f2	use correct syntax	2023-03-14 21:55:15 +00:00
Connel McGovern	a32b6483a4	INFRA-1955: Correcting post stage formatting	2023-03-14 17:06:20 +00:00
Connel McGovern	e83de1adf6	INFRA-1955: Merging forward from 4.7 to 4.8	2023-03-14 17:00:56 +00:00