Commit Graph

7607 Commits

Author SHA1 Message Date
josecoll
c8eb13efe2 Fix JUnit by adjusting assertion to reflect improved uncompressed byte size. 2019-05-20 15:08:27 +01:00
josecoll
41b7916332 Move test Java schemas to Kotlin as they are used only by Kotlin JUnit test (was causing ASM compilation failure). 2019-05-20 15:08:27 +01:00
josecoll
7afd1e8b25 Move test Java schemas to Kotlin as they are used only by Kotlin JUnit test (was causing ASM compilation failure). 2019-05-20 15:08:27 +01:00
josecoll
fa738c1354 Update IDE compiler dependencies to run tests within IntelliJ. 2019-05-20 15:08:27 +01:00
josecoll
8d4816f203 Allow corda gradle plugin snapshot version resolution from artifactory 'corda-dev' 2019-05-20 15:08:27 +01:00
josecoll
6d99e0fec4 Upgrade quasar to JDK11 supported version (0.8.0) - dependent on Corda "quasar-utils" gradle plugin upgrade. 2019-05-20 15:08:27 +01:00
josecoll
8c921cfe71 Upgrade jacoco to JDK11 supported version 2019-05-20 15:08:27 +01:00
josecoll
a56ef580b2 Temp remove usage of java modularity plugin. 2019-05-20 15:08:27 +01:00
josecoll
bce94164a8 Update to use Corda Gradle plugins 5.0.0-SNAPSHOT 2019-05-20 15:08:27 +01:00
josecoll
4bbeb83195 Revert: Add comment to Gradle JPMS plugin version. 2019-05-20 15:08:27 +01:00
josecoll
f6b25246c4 Add comment to Gradle JPMS plugin version. 2019-05-20 15:08:27 +01:00
josecoll
2a2fb6f82a Change checkJavaVersion() startup check to support JDK 11. 2019-05-20 15:08:27 +01:00
josecoll
ac56f302eb TEMP disable use of "sun.security, sun.misc.Unsafe" in serializer lists (re-instate with module add-exports directive) 2019-05-20 15:08:27 +01:00
josecoll
b8fb617ee1 TEMP disable use of "sun.misc.VMSupport" (re-instate with module add-exports directive) 2019-05-20 15:08:27 +01:00
josecoll
579a95b849 Remove illegal imports: sun.security, sun.reflect. 2019-05-20 15:08:27 +01:00
josecoll
c48e72ae66 SIMM valuation sample: do not use shrink custom task by default (and only use for JDK 1.8 due to Proguard version not supporting JDK 11) 2019-05-20 15:08:27 +01:00
josecoll
0244695a9b TEMP exclude *-deterministic modules from build. 2019-05-20 15:08:27 +01:00
josecoll
38e84d46b4 Include JavaFX plugin (specify dependent JavaFX modules) and apply changes to relevant modules (explorer, demobench, client/jfx). 2019-05-20 15:08:27 +01:00
josecoll
594fca9d3f Add explicit reference to JAXB. 2019-05-20 15:08:27 +01:00
josecoll
57fb63940f Include Gradle JPMS plugin (v1.5.0) 2019-05-20 15:08:27 +01:00
josecoll
ba675e73b9
CORDA-2893 Upgrade Corda to use Gradle 5.4.1 (Take 2) (#5137)
Upgrade Corda to use Gradle 5.4.1
2019-05-20 14:26:42 +01:00
Chris Rankin
b9f7c1a08a CORDA-2893, ENT-3422: Tweak JUnit 5 configurations to keep vintage engine off compile classpaths. (#5138)
* Tweak JUnit 5 configurations to keep vintage engine off compile classpaths.

* Configure Gradle tests to use JUnit 5.
2019-05-20 11:57:56 +01:00
Tudor Malene
688c742706 CORDA-2934 disable hibernate validator integration with hibernate (#5130) 2019-05-20 11:45:03 +01:00
Chris Rankin
5ca409d139 ENT-3422: Upgrade DJVM to use JUnit 5. (#5131)
* Switch to JUnit 5's migration support.

* Upgrade to Gradle 5.4.1.

* Upgrade to JUnit 5 Jupiter.
2019-05-20 09:11:21 +01:00
josecoll
0eab42b63e
Revert "CORDA-2893 Upgrade Corda to use Gradle 5.x (#5063)" (#5135)
This reverts commit 88babefd89.
2019-05-17 11:11:05 +01:00
josecoll
88babefd89
CORDA-2893 Upgrade Corda to use Gradle 5.x (#5063)
* Upgrade gradle wrapper to Gradle 5.0

* Upgrade to use locally deployed version of Capsule plugin (using Gradle 5.0)

* Upgrade to use Corda Gradle Plugins 5.x (inclusive of Gradle 5.0 compatibility fixes)

* Fix compile-time problems resolving log4j packages.

* Update to use Artifactory deployed version of Capsule plugin (using Gradle 5.0)

* Upgrade to use Gradle 4.2.1 (excluding default memory setting change: command line client now starts with 64MB of heap instead of 1GB.)

* Added explicit compile-time dependency on 'de.jensd:fontawesomefx-commons:8.13' (compile-time error in tools:explorer without)

* Update "wrapper" gradleVersion to 5.4.1

* Update Capsule plugin version label to reference R3 forked build.

* Commit all gradle upgrade changes following: ./gradlew wrapper --gradle-version 5.4.1

* Increase maximum heap memory for Test tasks to 1GB, and upgrade build-scan plugin to 2.2.1.

* Increase Test tasks' maximum memory to 1.5GB - what could go wrong?

* Up maxHeapSize to 2g for gradle test runner (global setting).

* Added explicit compile-time dependency on 'de.jensd:fontawesomefx-commons:8.13' (compile-time error in tools:demobench without)

* Added forkEvery for node Unit tests.

* Up :node test task 'forkEvery' to 10.

* TC test execution tuning (:core, :node => forkEvery 10, default JVM heap size)

* TC test execution tuning (bump JVM heap size up to 1g for :node)

* TC test execution tuning (bump JVM heap size up to 1.5g for :node)

* TC test execution tuning (re-instate global JVM heap size of 1Gb)

* TC test execution tuning (re-instate JVM heap size of 2Gb for :node)

* Update Corda Gradle plugins to 5.0.0

* Updated plugin resolution order + renamed artifactory URL to use "software.r3.com"

* Reorder plugin resolution such that mavenlocal() is always queried first.
2019-05-17 10:36:21 +01:00
James Brown
c832b4dd6c ENT-3542 remove unused commons-codec dep (#5087) 2019-05-16 15:15:38 +01:00
Dan Newton
cd73161513 CORDA-2870 improve error messages for non composable types (#5120)
* CORDA-2870 Add `reason` and `remedy` to `LocalTypeInformation.NonComposable`

When creating `LocalTypeInformation.NonComposable` pass in the `reason`
a type was not composable and the `remedy` to fix it. This required
changes in `LocalTypeInformationBuilder` to pass in this extra
information so that it can be used later.

The message that the `ObjectSerializer` includes in its
`NotSerializableException` now includes the extra information about the
non composable type.

* CORDA-2870 Include custom serializers in serialization error message

In `ObjectSerializer`, when a serialization exception is thrown,
include the registered custom serializers + their classloaders as part
of the error message.

This required making properties on `CustomSerializerRegistry` and
`LocalSerializerFactory` public.

Tidy up `LocalTypeInformationBuilder` error message text for
transitive non-composable types.

* CORDA-2870 Tidy up error thrown for unserializable objects

Fix `DeserializeSimpleTypesTests` and tidy up the code in
`ObjectSerializer` a bit.

* CORDA-2870 Remove non-composable warning logs in `LocalTypeInformationBuilder`

The flag `warnIfNonComposable` and its corresponding log lines are not
needed now that the non-composable error messages contain a lot of
information in them.

The `warnIfNonComposable` flag is now incorrect and has been renamed to
`validateProperties` and the function `suppressWarningsAnd` has been
changed to `suppressValidation`.

`propertyDescriptors` has also had its input boolean changed to
`validateProperties` to better represent what it is doing.

* CORDA-2870 Remove need for casting by moving variable to interface

Expose `customSerializerNames` in `LocalSerializerFactory` and
`CustomSerializerFactory`.
2019-05-16 10:05:49 +01:00
Dominic Fox
0b63157a4b ENT-3422 Add JUnit 5 dependencies to all projects (#5084)
* ENT-3422 Add JUnit 5 dependencies to all projects

* Remove explicit junit 4 imports where not needed

* Minor PR fixes

* Limit import scope
2019-05-15 16:40:12 +01:00
James Brown
ee3befcc6e ENT-3543 Update okhttp dependency (#5089) 2019-05-15 10:54:44 +01:00
Viktor Kolomeyko
355604457f CORDA-2935: Align timeouts for CRL retrieval and TLS handshake (#5125) 2019-05-15 09:19:51 +01:00
szymonsztuka
2ed877eb2f Database Tables doc fix: Change paragraphs heading, so they don't appear as top level in the side bar; fix a web page link. (#5123) 2019-05-14 14:30:08 +01:00
Dimos Raptis
a468bee0ed [CORDA-2473] - Remove AMQP system property (#5112) 2019-05-14 13:22:22 +01:00
szymonsztuka
ab8d4a312a CORDA-2511 Upgrade notes for C4 need to include required minimum previous Corda version (#5039)
* CORDA-2511 doc fix: upgrade notes for C4 need to include guidance to upgrade from C3.2 (minimum) to C4

* Addressing PR review comments.

* Addressing review comments.
2019-05-13 18:24:53 +01:00
James Brown
f3e06aa623 CORDA-2926 update urllib3 dependency (#5108) 2019-05-13 09:44:02 +01:00
JamesHR3
d8a790b3ce [CORDA-2866] Adjust RPC test case to prevent failures on non-H2 databases (#5114) 2019-05-10 11:13:12 +01:00
rui-r3
9e3a0a64ac CORDA-2491: Ability to specify Java package namespace from Cordform (#5075)
Add entry point with generic extra configuration options. Move configuration verification code to avoid circular dependencies.
2019-05-09 17:25:21 +01:00
Tudor Malene
f0c75448b4 ENT-3161 - Align docs with ENT (#5113) 2019-05-09 17:23:52 +01:00
Matthew Nesbit
7bcff70864
Update the proton-j library to latest version (#5105) 2019-05-08 13:04:49 +01:00
Dan Newton
6769b00ed5 CORDA-2892 Add a TransactionBuilder.addOutputState overload (#5104)
To allow better usage in Java, a new `addOutputState` overload has
been added.
2019-05-08 10:56:05 +01:00
carolynequinn
bfa547c2af Update UAT.md
- all UAT joining steps 
+ link to new UAT microsite where content will be updated from now on (http://uat.network.r3.com/)
2019-05-08 11:51:02 +02:00
ChrissyAtWork
97bf11d607 Applied JD changes 2019-05-08 11:49:23 +02:00
ChrissyAtWork
a2ed8cb374 DEVREL-1287 - Simple prose checking 2019-05-08 11:49:23 +02:00
ChrissyAtWork
33b50836d2 DEVREL-1287 - Minor Typos & Commands info in "Other transaction components" intro 2019-05-08 11:49:23 +02:00
ChrissyAtWork
7e2575ca2a DEVREL-1287 - Minor Typographic Changes 2019-05-08 11:49:23 +02:00
ChrissyAtWork
b3a6d4dd76 DEVREL-1287 - Minor Typographic Changes
Cordapp -> CorDapp
2019-05-08 11:49:23 +02:00
ChrissyAtWork
fc5de7c646 DEVREL-1287 - Minor Typographic Changes
CordApp -> CorDapp
2019-05-08 11:49:23 +02:00
Vardan Nadkarni
5a3073aeb1 Corrected a comment to use SchedulableState instead of QueryableState 2019-05-08 11:48:55 +02:00
grogsaxle
4d082556d9 updated jackson-core api documentation to 2.9 2019-05-08 11:48:09 +02:00
JamesHR3
b4e96778bf [CORDA-2517] Whitelist attachments signed by keys that already sign existing trusted attachments (#5068)
This allows a different signed version of the same CorDapp to be automatically trusted.

This reverts "[CORDA-2575] Allow users to whitelist attachments by public key config (#5035)"
2019-05-07 12:55:27 +01:00