e35b755546
CORE-4769 add snyk scan open source 4.4
2022-07-11 22:01:25 +01:00
d669d39e64
INFRA-1805 add snyk scanning to corda os 4.4
2022-07-10 19:33:37 +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
0d98426310
Merge pull request #7211 from corda/adel/ENT-6865
...
ENT-6865: Bumped quasar version for compatibility with ENT.
2022-06-28 18:00:06 +01:00
000019b65c
ENT-6865: Bumped quasar version for compatibility with ENT.
2022-06-28 10:48:27 +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
a78ad86c61
Merge pull request #7206 from corda/adel/ENT-6858-com
...
ENT-6858: Updated bouncy castle to 1.68 to match 4.5.
2022-06-23 11:00:35 +01:00
872a81617a
ENT-6858: Updated bouncy castle to 1.68 to match 4.5.
2022-06-22 14:35:54 +01:00
b56be89fb1
Merge pull request #7205 from corda/adel/ENT-6858
...
ENT-6858: In our Corda BC provider add support for Signature.Ed25519
2022-06-17 14:02:03 +01:00
aa0963bc76
ENT-6858: In our Corda BC provider add support for Signature.Ed25519 using our own X509EdDSAEngine. Needed so that we can upgrade BC in ENT.
2022-06-16 18:01:32 +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
81348de000
ENT-6802: Upgrade Jackson to 2.13.3
2022-05-24 20:02:15 +01:00
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
bb54f77e09
Merge branch 'release/os/4.4' into wz/merge-os-44-45-2022-05-24
2022-05-24 16:48:08 +02:00
589c714cba
CORE-4784: Generate license and wiki reports ( #7181 )
2022-05-24 16:45:09 +02:00
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
340b3199b0
Merge branch 'release/os/4.8' into ronanb/INFRA-1697/remove-credentals-4.8
2022-05-23 17:13:23 +01:00
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
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
