ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-30 01:39:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,495 Commits 91 Branches 405 Tags 354 MiB
91c38fa84b
Commit Graph

9495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ronanbrowne88
d669d39e64 INFRA-1805 add snyk scanning to corda os 4.4 2022-07-10 19:33:37 +01:00
Adel El-Beik
0d98426310
Merge pull request #7211 from corda/adel/ENT-6865 
ENT-6865: Bumped quasar version for compatibility with ENT.
 2022-06-28 18:00:06 +01:00
Adel El-Beik
000019b65c ENT-6865: Bumped quasar version for compatibility with ENT. 2022-06-28 10:48:27 +01:00
Adel El-Beik
a78ad86c61
Merge pull request #7206 from corda/adel/ENT-6858-com 
ENT-6858: Updated bouncy castle to 1.68 to match 4.5.
 2022-06-23 11:00:35 +01:00
Adel El-Beik
872a81617a ENT-6858: Updated bouncy castle to 1.68 to match 4.5. 2022-06-22 14:35:54 +01:00
Adel El-Beik
b56be89fb1
Merge pull request #7205 from corda/adel/ENT-6858 
ENT-6858: In our Corda BC provider add support for Signature.Ed25519
 2022-06-17 14:02:03 +01:00
Adel El-Beik
aa0963bc76 ENT-6858: In our Corda BC provider add support for Signature.Ed25519 using our own X509EdDSAEngine. Needed so that we can upgrade BC in ENT. 2022-06-16 18:01:32 +01:00
Waldemar Żurowski
3042136743
Merge pull request #7197 from corda/wz/merge-os-46-47-2022-05-31 
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-31)
 2022-05-31 11:52:29 +02:00
Waldemar Zurowski
bc9f7e6513 NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-31) 2022-05-31 09:21:29 +02:00
Waldemar Żurowski
1baedbeb7c
Merge pull request #7196 from corda/wz/merge-os-45-46-2022-05-30 
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-30)
 2022-05-31 09:18:57 +02:00
Waldemar Zurowski
911f033e42 NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-30) 2022-05-30 18:08:16 +02:00
Waldemar Żurowski
8d110c1691
Merge pull request #7195 from corda/wz/merge-os-44-45-2022-05-30 
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-05-30)
 2022-05-30 18:07:38 +02:00
Waldemar Zurowski
142b7d3fd0 NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-05-30) 2022-05-30 14:49:32 +02:00
Waldemar Żurowski
6a3e6276a4
CORE-4784: remove obsolete check when generating NexusIQ reports (#7194) 
* do not use `isReleasePatch` when deciding if NexusIQ reports should be
  created. That is not available after 4.8 branch and reports should be
  generated for the patched releases in the first place.
 2022-05-30 13:57:13 +02:00
Waldemar Żurowski
d6eceed2df
Merge pull request #7188 from corda/wz/merge-os-46-47-2022-05-25 
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-25)
 2022-05-26 14:10:24 +02:00
Waldemar Zurowski
63008c12db Removed obsolete MS Teams hooks from nightly builds 2022-05-26 11:39:41 +02:00
Waldemar Zurowski
0336c938a6 NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-25) 
Conflicts:
* .ci/dev/regression/Jenkinsfile
*
core/src/main/kotlin/net/corda/core/internal/PlatformVersionSwitches.kt
 2022-05-25 19:07:45 +02:00
Ronan Browne
84c6e94571
Merge pull request #7120 from corda/ronanb/INFRA-1699/tidy-up-wrapper-4.4 
INFRA-1699: Tidy up Gradle wrapper URL
 2022-05-25 18:05:11 +01:00
Waldemar Żurowski
dc6c51b273
Merge pull request #7187 from corda/wz/merge-os-45-46-2022-05-25 
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-25) v2
 2022-05-25 19:00:22 +02:00
Waldemar Zurowski
0d294e3472 NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-25) v2 2022-05-25 17:02:44 +02:00
Waldemar Żurowski
c4b2349a9d
Merge pull request #7186 from corda/wz/merge-os-44-45-2022-05-25 
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-05-25)
 2022-05-25 16:59:10 +02:00
Waldemar Zurowski
494079b2f2 NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-05-25) 2022-05-25 14:50:19 +02:00
Waldemar Żurowski
cb2c54e2b7
NOTICK: added missing backslash (#7185) 2022-05-25 14:38:29 +02:00
Waldemar Żurowski
47620618c2
Merge pull request #7184 from corda/wz/merge-os-45-46-2022-05-25 
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-25)
 2022-05-25 14:37:52 +02:00
Waldemar Zurowski
ef76ae0973 NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-25) 
Conflicts:
*
client/rpc/src/integration-test/kotlin/net/corda/client/rpcreconnect/CordaRPCClientReconnectionTest.kt
*
client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
* constants.properties
* gradle/wrapper/gradle-wrapper.properties
* tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt
 2022-05-25 10:14:38 +02:00
Ronan Browne
ca087980a9
Merge pull request #7182 from corda/wz/merge-os-44-45-2022-05-24 
NOTICK: Merging forward updates from OS 4.4 to OS 4.5
 2022-05-24 17:44:00 +01:00
Waldemar Zurowski
bb54f77e09 Merge branch 'release/os/4.4' into wz/merge-os-44-45-2022-05-24 2022-05-24 16:48:08 +02:00
Waldemar Żurowski
589c714cba
CORE-4784: Generate license and wiki reports (#7181) 2022-05-24 16:45:09 +02:00
Ronan Browne
5d1599b97c
Merge pull request #7118 from corda/ronanb/INFRA-1699/tidy-up-wrapper-4.6 
INFRA-1699: Update Gradle wrapper URL
 2022-05-23 17:11:57 +01:00
Ronan Browne
0bf29d238c
Merge pull request #7117 from corda/ronanb/INFRA-1699/tidy-up-wrapper-4.7 
INFRA-1699: Update Gradle wrapper URL
 2022-05-23 17:11:34 +01:00
Ronan Browne
0faeae6982
Merge pull request #7119 from corda/ronanb/INFRA-1699/tidy-up-wrapper-4.5 
INFRA-1699: tidy up Gradle wrapper URL
 2022-05-23 17:11:13 +01:00
Adel El-Beik
3c70454d86
Merge pull request #7173 from corda/ENT-6511-gracefulShutdown-backport-from-4.6 
ENT-6511: graceful shutdown backport from 4.6
 2022-05-16 14:21:05 +01:00
Ryan Fowler
a5a0c64e2d CORDA-3918: Port of ENT-5417: Allow exceptions to propagate when shutdown commands are called (#6516) 2022-05-16 10:06:01 +01:00
Tamas Veingartner
bfcd1d8791 ENT-5379 Reconnecting RPC fixed to recognize shutdown calls and break reconnect attempts (#6316) 2022-05-16 10:06:00 +01:00
Ronan Browne
4d16d94848
Merge pull request #7167 from corda/connelm/INFRA-1743/release-email-notification4.7 
NOTICK Remove Slack tagging on successful/unstable builds
 2022-05-11 18:15:44 +01:00
Ronan Browne
58661bc2bf
Merge pull request #7170 from corda/connelm/INFRA-1743/release-email-notifications4.4 
NOTICK Remove Slack tagging on successful/unstable builds
 2022-05-11 17:36:45 +01:00
Ronan Browne
ce672f50dd
Merge pull request #7169 from corda/connelm/INFRA-1743/release-email-notifications4.5 
NOTICK Remove Slack tagging on successful/unstable builds
 2022-05-11 17:36:35 +01:00
Ronan Browne
b458d37f0b
Merge pull request #7168 from corda/connelm/INFRA-1743/release-email-notifications4.6 
NOTICK Remove Slack tagging on successful/unstable builds
 2022-05-11 17:36:15 +01:00
Connel McGovern
bbb6b1a51d
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:26:04 +01:00
Connel McGovern
ab19a61169
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:25:07 +01:00
Connel McGovern
bdf96634ee
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:24:25 +01:00
Connel McGovern
e8e46a220a
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:23:35 +01:00
Ronan Browne
75ddc62902
Merge pull request #7132 from corda/connelm/INFRA-1743/release-email-notification4.7 
INFRA-1743 Activate C4 email notifications Open source and Ent
 2022-05-10 17:13:46 +01:00
Ronan Browne
43146e5d2a
Merge pull request #7162 from corda/connelm/INFRA-1743/release-email-notifications4.6 
INFRA-1743 Slack & E-mail notification
 2022-05-10 17:13:21 +01:00
Ronan Browne
4dc26b8f91
Merge pull request #7161 from corda/connelm/INFRA-1743/release-email-notifications4.5 
INFRA-1743 Slack & E-mail notification
 2022-05-10 09:57:28 +01:00
Ronan Browne
3f22575f8e
Merge pull request #7160 from corda/connelm/INFRA-1743/release-email-notifications4.4 
INFRA-1743 Slack & E-mail notification
 2022-05-09 18:35:23 +01:00
Adel El-Beik
c174135a05
Merge pull request #7163 from corda/adel/ENT-6765-quasar 
ENT-6765: Upgraded quassar and hibernate.
 2022-05-09 16:51:37 +01:00
Connel McGovern
6484945513
Update Jenkinsfile 2022-05-09 16:16:44 +01:00
Connel McGovern
48980134c9
Update Jenkinsfile 2022-05-09 16:16:32 +01:00
Connel McGovern
c30e7be3a7
Update Jenkinsfile 2022-05-09 16:16:20 +01:00