Commit Graph

9509 Commits

Author SHA1 Message Date
Dimos Raptis
b331a421b2 ENT-6579 - Upgrade netty 2022-04-22 15:40:28 +01:00
Adel El-Beik
d2f7a3467c
Merge pull request #7152 from corda/feature/ENT-6753/update-image-4.9-os
ENT-6753 Bump base image to ensure latest JDK8 in use
2022-04-13 14:42:44 +01:00
Ronan Browne
415c068616
ENT-6753 update base images 2022-04-12 13:56:06 +01:00
Adel El-Beik
3f2168b562
Merge pull request #7151 from corda/adel/ENT-6748-11Apr
ENT-6748: Make sure correct artemis is picked up
2022-04-11 15:56:02 +01:00
Adel El-Beik
c53b0af997 ENT-6748: Make sure correct artemis is picked up, and don't rely on cache. 2022-04-11 12:21:49 +01:00
Adel El-Beik
8355366119
Merge pull request #7144 from corda/adel/ENT-6629
ENT-6629: Update hibernate version to match ent.
2022-04-04 10:09:17 +01:00
Adel El-Beik
f89cb76309 ENT-6629: Update hibernate version to match ent. 2022-04-01 16:40:19 +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
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
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
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
Ronan Browne
97c8aacf57 Merge remote-tracking branch 'origin/release/os/4.9' into release/os/4.9 2022-03-06 11:21:03 +00:00
Adel El-Beik
328f53e33a
Merge pull request #7098 from corda/adel/ENT-6637-v2
ENT-6637: Targeted exclude of the jgroups dependency.
2022-03-04 16:21:58 +00:00
Adel El-Beik
4594c76259 ENT-6637: Targeted exclude of the jgroups dependency. 2022-03-04 11:52:14 +00:00
Adel El-Beik
aa9d9288bd
Merge pull request #7095 from corda/adel/ENT-6637
ENT-6637 & ENT-6618: Removed jgroups and dbcp from artemis dependencies.
2022-03-04 10:51:45 +00:00
Adel El-Beik
4203a56c3a ENT-6637 & ENT-6618: Removed jgroups and dbcp from artemis dependencies. 2022-03-03 16:40:18 +00:00
Adel El-Beik
730a533dd3
Merge pull request #7094 from corda/adel/ENT-6687
ENT-6687: Updated build.gradle so corda-shell is copied into drivers directory
2022-03-03 09:42:05 +00:00
Ronan Browne
75ada6fd3d Merge branch 'release/os/4.9' of https://github.com/corda/corda into release/os/4.9 2022-03-02 14:49:38 +00:00
Adel El-Beik
96576a7278 ENT-6687: Updated build.gradle so corda-shell is copied into drivers directory. 2022-03-01 12:35:46 +00:00
Conal Smith
5f1e86c17c
ENT-6508 - Prevent directory traversal from zip file names (#7085) 2022-02-25 15:51:49 +00:00
Dan Newton
4b29ad337b
ENT-6710 Corda shell ssh logging again (#7093)
Correct SSH logging again, by pulling the logging of SSH ports to a
singular location.
2022-02-25 15:47:31 +00:00
Adel El-Beik
70294a9699
Merge pull request #7091 from corda/ccochrane/ENT-6631
ENT-6631 - upgrade jackson version to get rid of databind vulnerabili…
2022-02-25 09:42:06 +00:00
Viktor Kolomeyko
162f76f710
ENT-6693: Change the way how message sizes are determined (#7090)
Especially relevant for `AMQPLargeMessage`.
2022-02-24 13:54:27 +00:00
Chris Cochrane
9dfdd71c22
ENT-6631 - upgrade jackson version to get rid of databind vulnerability, keeping jackson-module-kotlin the same 2022-02-24 13:26:37 +00:00
Ronan Browne
387cb30e2e
ENT-6609 update docker images so repo for community edition is corda/community (#7088) 2022-02-24 11:36:40 +01:00
Ronan Browne
db817ef621
ENT-6609 update docker images (#7087) 2022-02-24 10:36:00 +01:00
Adel El-Beik
5ad2486041
Merge pull request #7082 from corda/vkolomeyko/ENT-6286-official-artemis-switch
ENT-6286: Switch to official version of Artemis library
2022-02-23 10:15:59 +00:00