ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-29 17:28:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,326 Commits 91 Branches 405 Tags 354 MiB
19c8dd5cfb
Commit Graph

9326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan Szkaradek
19c8dd5cfb
added modules for snyk scanning (#7232) 2022-09-02 14:17:31 +02:00
Ronan Browne
0b26ffa300
Merge pull request #7219 from corda/add-snyk-scan-4.6 
INFRA-1805 Add snyk scan to 4.6 release job
 2022-07-26 19:11:05 +02:00
ronanbrowne88
cd577afcd9 CORE-4769 add snyk scan open source 4.4 2022-07-26 16:06:05 +01:00
ronanbrowne88
121e67aa11 INFRA-1805 add snyk scanning to corda os 4.4 2022-07-26 16:06:05 +01: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
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
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
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
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
Adel El-Beik
e33265f60d ENT-6765: Upgraded quassar and hibernate. 2022-05-09 13:36:16 +01:00
Connel McGovern
cd8ecac19e INFRA-1743 Slack & E-mail notification 2022-05-09 13:17:58 +01:00
Connel McGovern
5149889b34 INFRA-1743 Slack & E-mail notification 2022-05-09 13:16:38 +01:00
Connel McGovern
56581b340a INFRA-1743 Slack & E-mail notification 2022-05-09 13:15:27 +01:00
Adel El-Beik
6592920aeb
Merge pull request #7150 from corda/adel/merge-from-os-4.5-5Apr 
NOTICK: Merge from OS 4.5
 2022-04-06 10:02:08 +01:00
Adel El-Beik
6d2a9931af NOTICK: Reverted Jenkins.nightly. 2022-04-05 18:07:25 +01:00
Adel El-Beik
6023482412 Merge remote-tracking branch 'origin/release/os/4.5' into adel/merge-from-os-4.5-5Apr 2022-04-05 18:02:16 +01:00
Adel El-Beik
a99a25fcf7
Merge pull request #7149 from corda/adel/merge-from-os4.4-4Apr 
NOTICK: Merge from OS 4.4
 2022-04-05 17:02:51 +01:00
Adel El-Beik
52451fcb6e NOTICK: Reverted file in merge. 2022-04-05 14:31:17 +01:00
Adel El-Beik
4fba67b8c5 Merge remote-tracking branch 'origin/release/os/4.4' into adel/merge-from-os4.4-4Apr 2022-04-05 14:25:59 +01:00
Adel El-Beik
ee55da42fd
Merge pull request #7147 from corda/adel/merge-from-4.3-4Apr 
NOTICK: Merge from OS 4.3
 2022-04-05 14:17:11 +01:00
Adel El-Beik
2e47c4ea43 Merge remote-tracking branch 'origin/release/os/4.3' into adel/merge-from-4.3-4Apr 2022-04-04 10:32:15 +01:00