ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-09 06:23:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,532 Commits 92 Branches 405 Tags 354 MiB
652d5c1551
Commit Graph

9532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ronan Browne
00ff06c625
Merge pull request #7158 from corda/ronanb/INFRA-1746/c4-slack-notifications-4.10 
INFRA-1746: add C4 slack notifications and clean up MS teams code.
 2022-05-05 13:00:47 +01:00
Ronan Browne
7a9deb02ef
Merge pull request #7157 from corda/ronanb/notick/fix-merge 
NOTICK: fix build issue post merge and remove some redundant code post slack migration
 2022-05-03 18:28:01 +01:00
Ronan Browne
444a1b8fd5
NOTICK: add shared library call 2022-05-02 11:40:59 +01:00
ronanbrowne88
7ce0ab2789 INFRA-1746 tidy up 2022-05-01 11:35:50 +01:00
Ronan Browne
5d28856dc0
NOTICK: fix build issue post merge and remove some redundant code post slack migration 
noticed 4.10 release branch CI is broken due to duplicate entries in options block , I've removed both of these plus accompanying logic as there is no need for MSTeams notifications goign forward
 2022-05-01 11:32:33 +01:00
ronanbrowne88
9bda96ff0a INFRA-1746 add slack notifications 2022-05-01 11:27:44 +01:00
Viktor Kolomeyko
05be5d6c42
ENT-6627: Update version of Shiro to 1.8.0 (#7153) 2022-04-25 09:53:06 +01:00
Adel El-Beik
0ee1211aab
Merge pull request #7146 from corda/chrisr3-snapshot-dependencies 
NOTICK: Force Gradle to use the most recent SNAPSHOTs.
 2022-04-13 14:45:00 +01:00
Adel El-Beik
41f1f3068a
Merge pull request #7145 from corda/adel/ENT-6607-updatehibernate 
ENT-6607: Update hibernate to 5.4.32.Final
 2022-04-05 17:44:40 +01:00
Adel El-Beik
1262379447 ENT-6607: Update hibernate to 5.4.32.Final 2022-04-05 10:18:19 +01:00
Chris Rankin
c25e0f1c73 NOTICK: Force Gradle to use the most recent SNAPSHOTs. 2022-04-04 15:16:34 +01:00
Adel El-Beik
e2fc6884c2
Merge pull request #7142 from corda/adel/merge-from-4.9-1stApr 
NOTICK: Merge from OS 4.9
 2022-04-04 13:53:24 +01:00
Adel El-Beik
cb4c7a80ca Merge remote-tracking branch 'origin/release/os/4.9' into adel/merge-from-4.9-1stApr 2022-04-01 16:58:08 +01:00
Adel El-Beik
84f4979306
Merge pull request #7141 from corda/adel/merge-from-4.8-1stApr 
NOTICK: Merge from OS 4.8.
 2022-04-01 13:58:04 +01:00
Adel El-Beik
5a41348679 Merge branch 'release/os/4.8' into adel/merge-from-4.8-1stApr 2022-04-01 11:10:58 +01:00
Adel El-Beik
43acf7bf55
Merge pull request #7140 from corda/adel/merge-from-4.7-31March 
NOTICK: Merge from OS 4.7
 2022-04-01 10:22:43 +01:00
Adel El-Beik
05eb510353 NOTICK: Fixed merge change. 2022-03-31 16:27:52 +01:00
Adel El-Beik
b22f6339f7 NOTICK: Fixed merge typo. 2022-03-31 16:21:23 +01:00
Adel El-Beik
20f3b25d4d Merge remote-tracking branch 'origin/release/os/4.7' into adel/merge-from-4.7-31March 2022-03-31 16:19:54 +01:00
Adel El-Beik
579c66dd7e
Merge pull request #7138 from corda/adel/CORDA-4239 
CORDA-4239: Regenerate test certificates with 10yr validity.
 2022-03-31 12:45:26 +01:00
Adel El-Beik
6c11184eae CORDA-4239: Regenerate test certificates with 10yr validity. 2022-03-30 16:35:40 +01:00
Ronan Browne
909b7643ca
Merge pull request #7127 from corda/connelm/ENT-6716/disable-publish-dockerhub-patch4.7 
ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below
 2022-03-23 17:13:14 +00:00
ConnelMcGovern
c624bb0cc0 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 13:09:00 +00:00
Connel McGovern
7de81c5cd7
Merge branch 'release/os/4.10' into connelm/INFRA-1743/release-email-notification4.10 2022-03-23 13:08:22 +00:00
ConnelMcGovern
55973ab7f7 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 12:23:11 +00:00
Ronan Browne
35986f7ad5
Merge pull request #7123 from corda/connelm/ENT-6716/disable-publish-dockerhub-patch 
ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below
 2022-03-23 09:42:51 +00:00
ConnelMcGovern
84c2cb5882 ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below 2022-03-22 15:44:24 +00:00
ConnelMcGovern
d1adf3643d ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below 2022-03-22 15:15:05 +00:00
Ronan Browne
86ce5cf40a
Merge pull request #7115 from corda/ronanb/ENT-6699/update-java-version 
ENT-6699 Ensure correct java version in base image
 2022-03-16 15:10:10 +00:00
Ronan Browne
89da70a205 Merge branch 'release/os/4.8' into ronanb/ENT-6699/update-java-version 2022-03-16 12:52:00 +00:00
Ronan Browne
95726b5d58 ENT-6699 update java version 2022-03-16 12:43:48 +00:00
Adel El-Beik
44c3ab169f
Merge pull request #7114 from corda/adel/ENT-6728 
ENT-6728: Archiving of a legal identity now done in its own txn
 2022-03-15 14:36:42 +00:00
Adel El-Beik
54a131313d ENT-6728: Archiving of a legal identity now done in its own txn, to cope with clustered notary nodes that have common legal identities between nodes (the service name one is common) 2022-03-15 12:25:39 +00:00
Connel McGovern
8dce286a2f
INFRA-1735 Teams notification's for C4 (#7107) 
* INFRA-1728 set correct java version for JDK 11 base image
 2022-03-15 08:58:58 +01:00
Connel McGovern
8da0e718a5
INFRA-1735 Teams notification's for C4 (#7108) 
* INFRA-1728 set correct java version for JDK 11 base image
 2022-03-15 08:58:36 +01:00
Connel McGovern
4844614314
INFRA-1735 Teams notification's for C4 (#7106) 2022-03-15 08:57:41 +01:00
Connel McGovern
4ca2927dd3
INFRA-1735 Teams notification's for C4 (#7105) 
* INFRA-1728 set correct java version for JDK 11 base image
 2022-03-15 08:57:04 +01:00
Ronan Browne
f933d23d26
INFRA-1728 set correct java version for JDK 11 base image (#7101) 
Use Specific JDK version not the latest Java 11 base image
 2022-03-10 17:59:25 +00:00
Adel El-Beik
40a72a4837
ENT-6687: Added the corda-releases repo, so that deployNodes in the s… (#7113) 
* ENT-6687: Added the corda-releases repo, so that deployNodes in the samples can find the corda shell.
 2022-03-10 17:56:09 +00:00
Ronan Browne
787d0cde99
INFRA-1728 set correct java version for JDK 11 base image (#7102) 
Use Specific JDK version not the latest Java 11 base image
 2022-03-10 15:38:41 +00:00
Chris Rankin
4fe68c93f4
NOTICK: Replace global dependency exclusions with dependency substitution. (#7099) 2022-03-08 12:04:26 +00:00
nargas-ritu
495d65df22
Merge pull request #7104 from corda/ronanb/NOTICK/release-support 
NOTICK: release support activity
 2022-03-08 11:15:48 +00:00
Ronan Browne
ee8eac4516 NOTICK: release support optionally exclude shell dependency 2022-03-08 10:50:59 +00:00
Ronan Browne
3c2d6555cc Merge branch 'release/os/4.9' of https://github.com/corda/corda into release/os/4.9 2022-03-08 09:21:07 +00:00
Ronan Browne
e1746e068c
NOTICK: add flag to ensure API docs are published as part of release process (#7103) 2022-03-07 18:00:10 +01:00
Rick Parker
1e227fdfc4
ENT-6711 - Fix for upgrade to Jackson 2.12 and beyond (actual upgrade to 2.13.1) (#7096) 
* NOTICK - Don't know what the JIRA is but wanted to share.

* Updates to resolve bukld issues

* NOTICK: Fixed JDK11 version to prevent capsule version error

* ENT-6711: Added comment for use of jackson_kotlin_version.

* ENT-6711: Avoid deprecation warning, switched to the default method.

Co-authored-by: Chris Cochrane <chris.cochrane@r3.com>
Co-authored-by: Adel El-Beik <adel.el-beik@r3.com>
 2022-03-07 11:08:06 +00:00