ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-27 08:22:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,263 Commits 91 Branches 405 Tags 354 MiB
3cd2e809ce
Commit Graph

385 Commits

Author SHA1 Message Date
Shams Asari
2556fde971 Merge branch 'release/os/4.10' into shams-4.11-frwd-merge-fc531761 2023-04-13 10:55:03 +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
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
Connel McGovern
fda5cd07d2 INFRA-1955: Merging forward from 4.10 to 4.11 2023-03-22 11:24:31 +00:00
Connel McGovern
6e56dffba8
INFRA-1955: Shared lib implicit import syntax (#7313) 2023-03-15 14:49:10 +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
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
Connel McGovern
5a43cfb0cb
INFRA-1955: Remove duplicate 'Snyk Security' stage (#7310) 2023-03-14 16:44:18 +00:00
Connel McGovern
1dbd5147e5 INFRA-1955: Remove duplicate 'Snyk Security' stage 2023-03-14 14:47:42 +00:00
Connel McGovern
34d7c154a9 INFRA-1955: Merging forward from 4.6 to 4.7 2023-03-14 14:40:55 +00:00
Connel McGovern
7e908bb939 INFRA-1955: Merging forward from 4.5 to 4.6 2023-03-14 14:08:35 +00:00
Connel McGovern
81b694f40a INFRA-1804 - Use use latest AMI with snyk binaries 2023-03-14 11:53:46 +00:00
Connel McGovern
3180962640 INFRA-1919 - [C4 Automation] The output of the Git log between the RCs 2023-03-14 11:52:55 +00:00
Connel McGovern
5c68bc89e2 INFRA-2014 - Appy licence generation to C4 Community tag builds 2023-03-14 11:51:14 +00:00
Connel McGovern
9a4ea9c652 INFRA-2038 - Remove Nexus dependency from C4 Community builds 2023-03-14 11:41:20 +00:00
Connel McGovern
5e10aa40c9 INFRA-1957 - [C4 Automation] Enure snyk scans run nightly on C4 projects - Corda OS (Community) 2023-03-14 11:37:44 +00:00
Connel McGovern
fe4e607dfd INFRA-2021: Adding in authenticate Gradle wrapper to Snyk Delta 2023-02-21 11:54:38 +00:00
Connel McGovern
5b4fce52ce INFRA-2021: Adding in authenticate Gradle wrapper to Snyk Delta (seperate agent) 2023-02-21 11:48:37 +00:00
Connel McGovern
835ea723ea Revert "INFRA-2021: Temp fix for Snyk Delta " 
This reverts commit 2ce0409bd2.
 2023-02-21 11:40:39 +00:00
Connel McGovern
2ce0409bd2
INFRA-2021: Temp fix for Snyk Delta 
Moving the position of the Snyk Delta to execute as the first stage as there seems to be issues with running the under the hood 'snykResolvedDepsJson' task after other gradle tasks have been executed. To be investigated further but this should unblock and PR's hitting the Snyk Delta stage.
 2023-02-17 14:58:14 +00:00
Connel McGovern
8debdf9b84 INFRA-1904: Merging forward snyk delta from 4.9 to 4.10 (2022-12-12) 2022-12-12 18:53:52 +00:00
Connel McGovern
cd948b1b5e INFRA-1904: Merging forward snyk delta from 4.8 to 4.9 (2022-12-12) 2022-12-12 16:33:12 +00:00
Connel McGovern
6e569faf8f INFRA-1904: Merging forward snyk delta from 4.7 to 4.8 (2022-12-12) 2022-12-12 14:40:02 +00:00
Connel McGovern
f256040cee INFRA-1904: Merging forward snyk delta from 4.6 to 4.7 (2022-12-12) 2022-12-12 14:04:50 +00:00
Connel McGovern
d12a6ddc55
INFRA-1904: Enable Snyk Delta on C4 ENT/OS shared pipeline (#7282) 2022-12-12 13:57:40 +00:00
Chris Cochrane
e3d22dadbc
ENT-8796 - Fwd-merge from OS 4.9 2022-11-21 10:56:58 +00:00
Connel McGovern
aa72dec0f2
NOTICK: Add CORDA_USE_CACHE environment variable (#7262) 2022-11-07 20:05:01 +00:00
Jan Szkaradek
6f32d3d369
added modules for snyk scanning (#7231) 2022-09-02 14:17:53 +02:00
Jan Szkaradek
19c8dd5cfb
added modules for snyk scanning (#7232) 2022-09-02 14:17:31 +02:00
Jan Szkaradek
cb42ae2980
added modules for snyk scanning (#7233) 2022-09-02 14:17:03 +02:00
Jan Szkaradek
ea9f29e0bd
added modules for snyk scanning (#7234) 2022-09-02 14:16:39 +02:00
Jan Szkaradek
c89ce8e29d
added modules for snyk scanning (#7235) 2022-09-02 14:16:11 +02:00
Jan Szkaradek
eb50c8d22e
added modules for snyk scanning (#7236) 2022-09-02 14:15:36 +02:00
Ronan Browne
8afcf57e38
INFRA-1844: tidy up and expand scanning of projects 2022-08-22 19:28:37 +01:00
Ronan Browne
1e5b18c3b7
NOTICK: scan runtime classpath 2022-08-19 14:22:32 +01:00
JanSzkaradek
293af38e28 changed snyk scan target 2022-08-18 15:58:17 +01:00
ronanbrowne88
212cd2214c CORE-4769 add snyk scan open source 4.4 2022-07-29 09:30:16 +01:00
ronanbrowne88
cc929e3b5b INFRA-1805 add snyk scanning to corda os 4.4 2022-07-29 09:25:32 +01:00
ronanbrowne88
8cf512e6e5 CORE-4769 add snyk scan open source 4.4 2022-07-27 21:41:25 +01:00
ronanbrowne88
8644ab38ff INFRA-1805 add snyk scanning to corda os 4.4 2022-07-27 21:40:44 +01:00
ronanbrowne88
d757682291 CORE-4769 add snyk scan open source 4.4 2022-07-27 12:49:53 +01:00
ronanbrowne88
b1afd88f13 INFRA-1805 add snyk scanning to corda os 4.4 2022-07-27 12:48:39 +01:00
ronanbrowne88
9425bb5c19 INFRA-1697 minor tidy up 2022-07-26 18:15:01 +01:00
ronanbrowne88
e4a19f4622 INFRA-1805 add snyk scanning to corda os 4.4 2022-07-26 18:11:51 +01: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
ronanbrowne88
12bbf98de2 CORE-4769 add snyk scan open source 4.5 2022-07-12 13:06:02 +01:00
ronanbrowne88
e35b755546 CORE-4769 add snyk scan open source 4.4 2022-07-11 22:01:25 +01:00
ronanbrowne88
d669d39e64 INFRA-1805 add snyk scanning to corda os 4.4 2022-07-10 19:33:37 +01:00
Waldemar Zurowski
ac60c66b2f NOTICK: Merging forward updates from OS 4.9 to OS 4.10 (2022-05-31) 2022-05-31 18:07:40 +02:00
Waldemar Zurowski
d149e9792a NOTICK: Merging forward updates from OS 4.8 to OS 4.9 (2022-05-31) 2022-05-31 15:08:42 +02:00
Waldemar Zurowski
f5f49dbf7c NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-31) 2022-05-31 11:54:52 +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 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 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 Zurowski
9d3548d36e NOTICK: Merging forward updates from OS 4.9 to OS 4.10 (2022-05-26) 
Conflicts:
* build.gradle
 2022-05-26 20:21:53 +02:00
Waldemar Zurowski
031eb263e6 NOTICK: Merging forward updates from OS 4.8 to OS 4.9 (2022-05-26) 
Conflicts:
* constants.properties
 2022-05-26 16:38:00 +02:00
Waldemar Żurowski
0c8d685fbd
Merge pull request #7190 from corda/wz/merge-os-47-48-2022-05-26 
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-26)
 2022-05-26 16:33:17 +02:00
Waldemar Zurowski
ec14f9ccba NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-26) 2022-05-26 14:13:33 +02:00
Ronan Browne
ab5f4fe0a4
INFRA-1697 authenticate on agent 2 2022-05-26 12:06:47 +01: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
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 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 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
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
a54682f3d0
Merge pull request #7071 from corda/ronanb/INFRA-1697/remove-credentals 
INFRA-1697: remove authentication details from gradlew wrapper download and add helper to add them in when ran on CI
 2022-05-23 17:29:52 +01:00
Ronan Browne
340b3199b0
Merge branch 'release/os/4.8' into ronanb/INFRA-1697/remove-credentals-4.8 2022-05-23 17:13:23 +01:00
Viktor Kolomeyko
355411b195 Merge remote-tracking branch 'origin/release/os/4.9' into vkolomeyko/cc4.9-cc4.10-merge 
# Conflicts:
#	.ci/dev/regression/Jenkinsfile
#	build.gradle
 2022-05-18 15:27:44 +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
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
Connel McGovern
2f82660cdb
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:22:46 +01:00
Connel McGovern
5e9358c2c0
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:14:28 +01:00
Connel McGovern
8a2f4431df
NOTICK Remove Slack tagging on successful/unstable builds 2022-05-11 14:14:09 +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
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
Connel McGovern
1888ed6ba1
Update Jenkinsfile 2022-05-09 16:16:08 +01:00
Connel McGovern
99e2991bc3
Update Jenkinsfile 2022-05-09 16:15:53 +01:00
Connel McGovern
855a020774
Update Jenkinsfile 2022-05-09 16:15:42 +01:00
Connel McGovern
652d5c1551
Update Jenkinsfile 2022-05-09 16:15:22 +01:00
Connel McGovern
8d83f76cad
Merge branch 'release/os/4.10' into connelm/INFRA-1743/release-email-notification4.10 2022-05-09 13:32:06 +01:00
Connel McGovern
fa634fd158
Update Jenkinsfile 2022-05-09 13:30:25 +01:00
Connel McGovern
7ac3889172
INFRA-1743 E-mail & Slack notifications 2022-05-09 13:22:40 +01:00
Connel McGovern
cd591a50cd
INFRA-1743 E-mail & Slack notifications 2022-05-09 13:22:38 +01:00
Connel McGovern
5b1e1bc8d0
INFRA-1743 E-mail & Slack notifications 2022-05-09 13:22:35 +01:00
Connel McGovern
7a7a8c8e2b
INFRA-1743 E-mail & Slack notifications 2022-05-09 13:22:33 +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