Commit Graph

9969 Commits

Author SHA1 Message Date
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
Waldemar Żurowski
d6eceed2df
Merge pull request #7188 from corda/wz/merge-os-46-47-2022-05-25
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-25)
2022-05-26 14:10:24 +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
Ronan Browne
686cb1f497
Merge pull request #7116 from corda/ronanb/INFRA-1697/remove-credentals-4.8
INFRA-1697 use gradle proxy for CI , public gradle server for local
2022-05-26 10:29:26 +01:00
Viktor Kolomeyko
c7eab9980b
NOTICK: Update Docker ReadMe.md (#7176) 2022-05-26 09:35:27 +01: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
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
Adel El-Beik
e151c490c4
Merge pull request #7183 from corda/adel/ENT-6802
ENT-6802: Upgrade Jackson to 2.13.3
2022-05-25 17:58:00 +01: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
Adel El-Beik
81348de000 ENT-6802: Upgrade Jackson to 2.13.3 2022-05-24 20:02:15 +01: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
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
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
0bf29d238c
Merge pull request #7117 from corda/ronanb/INFRA-1699/tidy-up-wrapper-4.7
INFRA-1699: Update Gradle wrapper URL
2022-05-23 17:11:34 +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
a09e9b6be2
Merge pull request #7180 from corda/chrisr3-os-4.9-merge
NOTICK: Merge from OS 4.9 up to 167328f
2022-05-23 16:44:33 +01:00
Katelyn Baker
853c95b880
NOTICK - Cross link Arch V1 to the Arch V2 repo (#7178)
Co-authored-by: Ben Pester <61828828+benpesterr3@users.noreply.github.com>
2022-05-23 15:32:06 +01:00
Chris Rankin
a0fae54682 Merge commit '167328fb1eee2994f1ba5c637e99c0044c264644' into chrisr3-os-4.9-merge 2022-05-23 14:27:46 +01:00
Viktor Kolomeyko
167328fb1e
Merge pull request #7179 from corda/chrisr3-os-4.8-merge
NOTICK: Merge from OS 4.8 up to 91ef44d
2022-05-23 14:26:26 +01:00
Chris Rankin
47ec57186e Merge commit '91ef44dc12b8cc921b9ec0a37b44de75c256d92d' into chrisr3-os-4.8-merge 2022-05-23 12:27:49 +01:00
Adel El-Beik
91ef44dc12
Merge pull request #7172 from corda/chrisr3-urlconnection-caches
ENT-6532: Close AttachmentsClassLoader on eviction to avoid leaking file descriptors.
2022-05-23 10:10:44 +01:00
Adel El-Beik
bd120028ce
Merge pull request #7156 from ulrikrasmussen/squelch-spurious-warning
CORDA-4257: Do not emit warning when StatePointer.isResolved = false
2022-05-20 13:10:09 +01:00
Chris Rankin
57ddafa148 ENT-6532: Close any deserialization classloader that is evicted from the cache.
Also revert disabling caches when reading URLs.
2022-05-20 11:51:01 +01:00
Viktor Kolomeyko
0d96691258
NOTICK: CC4.9->CC4.10 merge #7177 2022-05-19 13:37:47 +01:00
Dimos Raptis
12f339a343 Port netty upgrade to constants.properties 2022-05-18 16:55:06 +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
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
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
fc4f546f6c
Merge pull request #7166 from corda/connelm/INFRA-1743/release-email-notification4.8
NOTICK Remove Slack tagging on successful/unstable builds
2022-05-11 18:15:55 +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
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
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