ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-08 20:10:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,556 Commits 95 Branches 407 Tags
Commit Graph

9556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Viktor Kolomeyko
d6fc10e632
ENT-6784: Change special provisions for Artemis Server logging (#7174) 
As a side effect of enabling warnings for Artemis was the following messages to be produced in the Node's log:
```
[WARN ] 2022-05-16T14:53:01,203Z [main] core.server. - AMQ222165: No Dead Letter Address configured for queue rpc.server in AddressSettings
[WARN ] 2022-05-16T14:53:01,203Z [main] core.server. - AMQ222166: No Expiry Address configured for queue rpc.server in AddressSettings
...
[WARN ] 2022-05-16T14:53:01,885Z [Thread-1 (ActiveMQ-server-org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl$6@70eb0c59)] core.server. - AMQ222165: No Dead Letter Address configured for queue p2p.inbound.DL5WQBEduTfiTzdLkg7iXcz5vY4oaJNdJr7Y4xaLvYszPj in AddressSettings
[WARN ] 2022-05-16T14:53:01,885Z [Thread-1 (ActiveMQ-server-org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl$6@70eb0c59)] core.server. - AMQ222166: No Expiry Address configured for queue p2p.inbound.DL5WQBEduTfiTzdLkg7iXcz5vY4oaJNdJr7Y4xaLvYszPj in AddressSettings
```

To suppress them a dedicated filter been added.
The change to logging configuration been tested locally using out-of-process integration tests.
 2022-05-18 15:15:06 +01:00
Adel El-Beik
a062a97386
Merge pull request #7165 from corda/adel/ENT-6636 
ENT-6636: Removing commons-codec - not used.
 2022-05-17 10:08:38 +01:00
Adel El-Beik
2aca5605f9
Merge pull request #7175 from corda/adel/ENT-6480 
ENT-6480: Upgraded caffeine to 2.9.3.
 2022-05-17 10:08:03 +01:00
Adel El-Beik
9259522a14 ENT-6480: Upgraded caffeine to 2.9.3. 2022-05-16 18:16:54 +01:00
Ronan Browne
13134af5f3
Merge pull request #7129 from corda/connelm/INFRA-1743/release-email-notification4.10 
INFRA-1743 Activate C4 email notifications Open source and Ent
 2022-05-11 15:53:25 +01:00
Ronan Browne
f23d324f44
Merge pull request #7130 from corda/connelm/INFRA-1743/release-email-notification4.9 
INFRA-1743 Activate C4 email notifications Open source and Ent
 2022-05-11 15:50:23 +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
Adel El-Beik
b7145d43f3
Merge pull request #7154 from corda/ENT-6579-upgrade-netty 
ENT-6579 - Upgrade netty
 2022-05-11 12:58:18 +01:00
Adel El-Beik
ad5193f135 ENT-6636: Removing commons-codec - not used, at least not as a compile time dep. 2022-05-10 13:46:48 +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
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
Adel El-Beik
bc6a6ee2ae
Merge pull request #7155 from corda/adel/ENT-6743 
ENT-6743: SuspensionMeta in FlowInfo is null when a runnable flow has previously been hospitalized
 2022-04-26 17:21:30 +01:00
Adel El-Beik
c1002697c7 ENT-6743: Reverted RetryFlowMockTest as the retry op only available on ENT. 2022-04-25 11:30:24 +01:00
Adel El-Beik
fa607024c2 ENT-6743: Contains method of flow hospital now correctly returns if flow is in hospital. Historic patient records not used. 2022-04-25 11:24:21 +01:00
Viktor Kolomeyko
05be5d6c42
ENT-6627: Update version of Shiro to 1.8.0 (#7153) 2022-04-25 09:53:06 +01:00
Dimos Raptis
b331a421b2 ENT-6579 - Upgrade netty 2022-04-22 15:40:28 +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
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
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
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
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
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
ConnelMcGovern
ae0bf74505 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:50:37 +00:00