nikinagy
301fc9f928
Merge branch 'release/os/4.5' into nnagy-os-4.5-os-4.6-20200520
2020-05-20 10:38:45 +01:00
Razvan Codreanu
5d481523bf
INFRA-350 add suffix to the jdk 11 image to avoid overwrite ( #6269 )
2020-05-19 18:47:54 +01:00
Ramzi El-Yafi
d65568db86
[NOTICK] Remove obsolete on-demand smoke test Jenkins configuration ( #6265 )
2020-05-19 18:46:23 +01:00
Razvan Codreanu
ed9b0ff228
INFRA-350 add suffix to the jdk 11 image to avoid overwrite ( #6268 )
2020-05-19 18:33:54 +01:00
nikinagy
938d038c97
ENT-5278 - add missed checks for empty lists ( #6261 )
...
* add missed checks for empty lists
* adding missing brackets
* adding missing timeout
2020-05-19 16:55:09 +01:00
Dan Newton
36a11e868a
NOTICK Fix timing issue in FlowIsKilledTest
( #6264 )
...
Also remove `Configurator` that seems to fail on some agents.
2020-05-19 16:54:34 +01:00
James Higgs
fc2bb2ed4e
EG-2116 - Add aliases for version attribute errors ( #6260 )
2020-05-19 11:53:29 +01:00
Razvan Codreanu
862de46c5b
INFRA-331 Improving Jenkins PR build performance ( #6252 )
...
* INFRA-331 increasing shard number and reintroducing pre allocation
* INFRA-331 removing preallocation
* INFRA-331 reintroducing preallocation as it cuts 10 mins from the build
* INFRA-331 test performance with 20 pods
* INFRA-331 test performance with 10 pods and preallocation
* INFRA-331 more tests on 15 pods + prealloc
2020-05-19 09:57:20 +01:00
Rick Parker
ac03ba63e8
Merge pull request #6254 from corda/adel/merge-from-4.5
...
Adel/merge from 4.5
2020-05-15 15:38:46 +01:00
Adel El-Beik
b9b0ca58e3
Merge remote-tracking branch 'origin/release/os/4.5' into adel/merge-from-4.5
2020-05-15 10:23:17 +01:00
Ryan Fowler
6dd72ac079
ENT-5275: Replace hardcoded platform versions with descriptive values ( #6236 )
...
* ENT-5275: Replace hardcoded platform versions with descriptive values
* PR updates
* missed versions
* missed versions
* fix
* add FIRST_VERSION
2020-05-14 14:43:52 +01:00
James Higgs
06467d04b1
EG-1980 - Remove stale docs links from OS ( #6251 )
...
Remove hardcoded docs references, push docs link to gradle
2020-05-14 12:57:59 +01:00
Denis Rekalov
8387e99535
[NOTICK]: Do not use Security.addProvider(BouncyCastleProvider()) in tests to avoid disruptions of other tests ( #6250 )
2020-05-14 10:53:54 +01:00
Waldemar Żurowski
5db44790d7
disableConcurrentBuilds
2020-05-13 17:10:46 +01:00
Stefano Franz
4edf618442
remove throttling
2020-05-13 16:39:55 +01:00
Ivan Schasny
bd657fad65
Merge pull request #6245 from corda/EG-1991-ConfigHelper-update
...
EG-1991 Ignore warning for CORDA environment variables in all caps
2020-05-13 15:37:42 +01:00
Dan Newton
c2ac22a41f
NOTICK Non-database error handling in withEntityManager
( #6239 )
...
When a non-database exception is thrown out of a `withEntityManager`
block, always check if the session needs to be rolled back.
This means if a database error is caught and a new non-database error is
thrown out of the `withEntityManager` block, the transaction is still
rolled back. The flow can then continue progressing as normal.
2020-05-13 15:17:51 +01:00
Adel El-Beik
74080e7cb6
CORDA-3772: Now specify source and target of 8 when compiling contract classes. ( #6249 )
2020-05-13 15:11:25 +01:00
john.buckle@r3.com
febb5a44b7
Added comment
2020-05-13 21:55:04 +08:00
Matthew Nesbit
fd272125cf
Merge pull request #6235 from corda/nnagy-os-4.5-os-4.6-20200512
...
Nnagy os 4.5 os 4.6 20200512
2020-05-13 13:48:11 +01:00
Ryan Fowler
9caf6538ce
ENT-5298: Increase timeout by two minutes because the test occasionally takes longer than five minutes ( #6246 )
2020-05-13 13:15:05 +01:00
john.buckle@r3.com
c3ea2c1470
Ignore warning for CORDA environment variables in all caps
2020-05-13 09:51:35 +08:00
jakubbielawa
fbf0bd9bd9
Upgrade ClassGraph to 4.8.78 ( #6237 )
2020-05-12 13:23:38 +01:00
Viktor Kolomeyko
c5950d6a3a
ENT-5277: Reflect node-api
changes in OS ( #6238 )
2020-05-12 13:22:30 +01:00
nikinagy
52e3030d60
Merge branch 'release/os/4.5' into nnagy-os-4.5-os-4.6-20200512
2020-05-12 10:26:43 +01:00
Adel El-Beik
3ced611031
CORDA-3730: Remove unused feature. ( #6234 )
2020-05-12 09:52:32 +01:00
Adel El-Beik
1547efb093
CORDA-3755: Switched attachments map to a WeakHashMap ( #6214 )
...
* Bump OS release version 4.6
* CORDA-3755: Switched attachments map to a WeakHashMap
* CORDA-3755: Added explicit strong references to map key.
* CORDA-3755: Keeping detekt happy.
* CORDA-3755: Test a gc in verify.
* CORDA-3755: Making detekt happy.
* CORDA-3755: Suppress warnings for weak reference test.
* CORDA-3755: Fixing build failure with attachments.
* CORDA-3755: Rewrite based on Ricks input - now handles attachment already existing in map!
* CORDA-3755: Refactor WeakReference behaviour into AttachmentsHolderImpl and provide alternate version of this class for core-deterministic.
* CORDA-3755: Added more tests for WeakHashMap.
* CORDA-3755: Ignore the tests using System.gc keep for local testing only
* CORDA-3755: Adding comment to explain the ignored tests.
* Make AttachmentsHolderImpl package-private inside core-deterministic, just like it is inside core.
* CORDA-3755: Update assertions following review comments.
* CORDA-3755: Removing import
* CORDA-3755: Removed unused var.
* CORDA-3755: Reverting files that somehow got changed in rebase.
Co-authored-by: nargas-ritu <ritu.gupta@r3.com>
Co-authored-by: Chris Rankin <chris.rankin@r3.com>
2020-05-12 09:51:12 +01:00
Rick Parker
308b31c3fe
Merge pull request #6233 from corda/nnagy-os-4.4-os-4.5-20200511
...
Nnagy os 4.4 os 4.5 20200511
2020-05-11 17:52:02 +01:00
Rick Parker
d4cb0e2d87
Merge pull request #6232 from corda/rfowler-os-4.5-os-4.6-20200511
...
Rfowler os 4.5 os 4.6 20200511
2020-05-11 17:51:21 +01:00
nikinagy
e0b5319515
Merge branch 'release/os/4.4' into nnagy-os-4.4-os-4.5-20200511
2020-05-11 16:32:53 +01:00
James Higgs
ddc49babed
EG-441 - Update properties files after docs review ( #6223 )
...
* Update properties files after docs review
* Cosmetic changes to properties files
2020-05-11 16:10:38 +01:00
Ryan Fowler
c8d3d22841
Merge branch 'release/os/4.5' into rfowler-os-4.5-os-4.6-20200511
2020-05-11 15:42:46 +01:00
nikinagy
350066d386
fix for handling empty lists in vault query ( #6231 )
2020-05-11 15:41:50 +01:00
Chris Rankin
6f6081615a
CORDA-3768: Upgrade to Corda Gradle Plugins 5.0.9. ( #6222 )
2020-05-11 15:41:11 +01:00
Ryan Fowler
b43e781f27
ENT-5285, ENT-5296 Ignore ForkJoinPool.commonPool threads in RPCStabilityTests
( #6205 )
...
* NOTICK Ignore JUnit time threads in `RPCStabilityTests`
* NOTICK - Ignore ForkJoinPool.commonPool as it's not related to our test
Co-authored-by: LankyDan <danknewton@hotmail.com>
2020-05-11 15:38:23 +01:00
Ryan Fowler
bb2aef554e
Merge branch 'release/os/4.5' into rfowler-os-4.5-os-4.6-20200511
2020-05-11 15:02:20 +01:00
Matthew Nesbit
6afd443e3a
Merge pull request #6230 from corda/rfowler-os-4.4-os-4.5-20200511
...
Rfowler os 4.4 os 4.5 20200511
2020-05-11 14:51:08 +01:00
Ryan Fowler
5f8cceae45
Merge branch 'release/os/4.4' into rfowler-os-4.4-os-4.5-20200511
2020-05-11 11:40:09 +01:00
pnemeth
753a2af556
EG-465 hashLookup returns "No matching transaction found" for any transaction hash - Updated command to support transaction id-s as well (not just hashes of transactions) ( #6224 )
...
* fixed EG-465+tests+manual
* Revert "fixed EG-465+tests+manual"
This reverts commit 39899378
* reverted Constants.kt
* fixed EG-465+tests+manual""
This reverts commit c96acf31e4
.
* unused import
2020-05-08 10:55:36 +01:00
Matthew Nesbit
6400fd51a5
Merge pull request #6221 from corda/chrisr3-45-merge
...
Merge from OS 4.5 up to 9a5be9e
2020-05-06 14:37:38 +01:00
Chris Rankin
123c081f5a
Merge commit '9a5be9e47d6e13f7ca7759c70e740382f18d3bc4' into chrisr3-45-merge
2020-05-06 11:01:00 +01:00
Chris Rankin
9a5be9e47d
CORDA-3738: Upgrade to DJVM 1.1-RC03. ( #6219 )
2020-05-05 17:32:39 +01:00
Ryan Fowler
b6dc1d8c4a
NOTICK - Reduce flow count for test to improve run time ( #6213 )
2020-05-05 09:38:55 +01:00
nargas-ritu
54e4503866
Merge pull request #6212 from corda/dan/update-byteman-dependency
...
NOTICK Update byteman dependencies
2020-05-04 16:29:29 +01:00
Rick Parker
cfb985244a
Merge pull request #6211 from corda/CORDA-3662-backport-from-4.5
...
ENT-5263: Backport CORDA-3662: Use an INNER JOIN for network map cache queries
2020-05-04 16:15:14 +01:00
Ryan Fowler
55797612b2
ENT-5237: Remove DISTINCT (backport)
2020-05-04 15:02:33 +01:00
LankyDan
96c1120194
NOTICK Update byteman dependencies
...
Tests that were using byteman when running on Java 11 were failing.
Updating the byteman version fixed the issue while still working on Java
8.
2020-05-04 14:08:38 +01:00
Denis Rekalov
32407b2c46
CORDA-3753: Increase Artemis security-invalidation-interval to avoid frequent CRL checks ( #6207 )
2020-05-04 13:00:22 +01:00
nargas-ritu
ba69ab6842
Bump OS release version 4.6
2020-05-04 12:07:27 +01:00
Chris Rankin
8dccd4231d
CORDA-3750: Delete unwanted methods from the deterministic artifacts. ( #6208 )
2020-05-04 11:33:06 +01:00