f8f374ec8c
Merge pull request #7268 from corda/cc/merge/os-4.8/os-4.9/16-Nov-2022
...
ENT-8794 - cc/merge/os 4.8/os 4.9/16 nov 2022
2022-11-17 14:21:58 +00:00
0c4c5bd138
Merge branch 'release/os/4.8' into cc/merge/os-4.8/os-4.9/16-Nov-2022
...
Fwd-merge from OS 4.8.
2022-11-16 17:35:33 +00:00
43168387b4
ENT-8794 Delay closing of attachment class loaders ( #7267 )
...
* Delay closing of attachment class loaders until all SerializationContext that refer to them (from BasicVerifier) have gone out of scope.
More comments
* Avoid any concurrency issues with queue processing
* Better concurrency behaviour
* Stop re-using attachment URLs as it turns out we can't close the URLClassLoaders when URLs are shared
* Refactor to use a ReferenceQueue.
Co-authored-by: Chris Rankin <chris.rankin@r3.com >
2022-11-15 09:25:54 +00:00
3fd3baa507
Merge pull request #7253 from corda/cc/os/4.9/ent-7034/upgrade_commons_text
...
ENT-7034 - Upgraded shiro and commons-text to address security issues
2022-10-19 12:48:11 +01:00
0997b49b24
Upgraded shiro and commons-text to address security issues
2022-10-19 10:48:27 +01:00
ea9f29e0bd
added modules for snyk scanning ( #7234 )
2022-09-02 14:16:39 +02:00
c89ce8e29d
added modules for snyk scanning ( #7235 )
2022-09-02 14:16:11 +02:00
878f0bba8b
ENT-6885: Added build option to specify the version of Apache commons-configuration2 ( #7224 )
...
Added a build.gradle option to specify the version of Apache commons-configuration2 to build with, overriding whatever version is pulled in by Artemis Server.
This is to address Nexus security vulnerability reported for Apache commons-configuration2 v2.7.
This change was previously applied in Ent-4.9 and was shown to remove the critical security issues reported by Nexus. See [PR-4652](https://github.com/corda/enterprise/pull/4562 ) for more info about that.
The Corda jar was built locally and then scrutinised, revealing that it had Apache commons-configuration2 v2.8.0 included within.
2022-07-29 17:33:13 +01:00
24c3e53435
Merge pull request #7222 from corda/add-snyk-scan-4.9
...
INFRA-1820: add snyk scanning to 4.9
2022-07-28 09:25:09 +02:00
8cf512e6e5
CORE-4769 add snyk scan open source 4.4
2022-07-27 21:41:25 +01:00
8644ab38ff
INFRA-1805 add snyk scanning to corda os 4.4
2022-07-27 21:40:44 +01:00
aff501fadb
Merge pull request #7221 from corda/add-snyk-scan-4.8
...
INFRA-1820 Add snyk scan 4.8
2022-07-27 18:41:36 +02:00
d757682291
CORE-4769 add snyk scan open source 4.4
2022-07-27 12:49:53 +01:00
b1afd88f13
INFRA-1805 add snyk scanning to corda os 4.4
2022-07-27 12:48:39 +01:00
ffc843b64d
ENT-6882: Upgraded shiro-core to 1.9.1. ( #7217 )
2022-07-13 14:40:55 +01:00
c6197bbfaf
ENT-6784: Change Artemis Server logging to WARN ( #7215 )
2022-07-12 15:06:55 +01:00
05c817177a
Merge pull request #7212 from corda/adel/ENT-6847
...
ENT-6847: Updated shiro and netty version.
2022-06-30 16:31:16 +01:00
c23e8b49d4
ENT-6847: Updated shiro and netty version.
2022-06-30 12:15:31 +01:00
774be6234d
Merge pull request #7208 from corda/hjkim/ent-6714/corda-logs-db-password
...
ENT-6714: Bugfix - Corda logs database password which controls RPC access
2022-06-24 11:36:24 +01:00
8d34be5129
ENT-6714: Fix Corda logging database password
...
This commit ports the previously implemented fix from Corda ENT. Due to
the unrelated changes and merge conflict, the fix has been manually
copied rather than cherry-picked.
2022-06-23 23:03:10 +01:00
851bc5506a
Merge pull request #7199 from corda/wz/merge-os-48-49-2022-05-31
...
NOTICK: Merging forward updates from OS 4.8 to OS 4.9 (2022-05-31)
2022-05-31 18:06:29 +02:00
d149e9792a
NOTICK: Merging forward updates from OS 4.8 to OS 4.9 (2022-05-31)
2022-05-31 15:08:42 +02:00
2da94dd92e
Merge pull request #7198 from corda/wz/merge-os-47-48-2022-05-31
...
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-31)
2022-05-31 14:33:03 +02:00
f5f49dbf7c
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-31)
2022-05-31 11:54:52 +02:00
3042136743
Merge pull request #7197 from corda/wz/merge-os-46-47-2022-05-31
...
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-31)
2022-05-31 11:52:29 +02:00
bc9f7e6513
NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-31)
2022-05-31 09:21:29 +02:00
1baedbeb7c
Merge pull request #7196 from corda/wz/merge-os-45-46-2022-05-30
...
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-30)
2022-05-31 09:18:57 +02:00
911f033e42
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-30)
2022-05-30 18:08:16 +02:00
8d110c1691
Merge pull request #7195 from corda/wz/merge-os-44-45-2022-05-30
...
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-05-30)
2022-05-30 18:07:38 +02:00
142b7d3fd0
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-05-30)
2022-05-30 14:49:32 +02:00
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
11113d262c
Merge pull request #7191 from corda/wz/merge-os-48-49-2022-05-26
...
NOTICK: Merging forward updates from OS 4.8 to OS 4.9 (2022-05-26)
2022-05-26 20:15:57 +02:00
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
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
a830b3707c
Merge pull request #7189 from corda/ronanb/INFRA-1697/remove-credentals-4.8
...
INFRA-1697 ensure we authenticate gradle creds on agent 2
2022-05-26 14:16:55 +01:00
ec14f9ccba
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-26)
2022-05-26 14:13:33 +02:00
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
ab5f4fe0a4
INFRA-1697 authenticate on agent 2
2022-05-26 12:06:47 +01:00
63008c12db
Removed obsolete MS Teams hooks from nightly builds
2022-05-26 11:39:41 +02:00
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
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
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
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
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
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
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
494079b2f2
NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2022-05-25)
2022-05-25 14:50:19 +02:00
cb2c54e2b7
NOTICK: added missing backslash ( #7185 )
2022-05-25 14:38:29 +02:00
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
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
