Dominic Fox
62c2e1c892
OS merge 2018-07-19
2018-07-19 16:43:46 +01:00
Dominic Fox
d1455b7a0e
Move hamkrest version number into top-level configuration
2018-07-19 14:21:07 +01:00
Chris Rankin
aa50aaf95d
Merge commit 'e879de7' into chrisr3-os-merge
2018-07-17 22:47:24 +01:00
Chris Rankin
e879de70f3
CORDA-1800: Shrink the Simm Valuation Demo's contract states using ProGuard. ( #3586 )
...
* Shrink the Simm Valuation Demo's contract states CorDapp using ProGuard.
* Remove CordFormation from CorDapp modules, which unbundles Jolokia from the CorDapps.
* Preserve directory structure for CorDapp's own classes.
* Remove unwanted transitive dependencies from Simm Valuation CorDapps.
* Use allprojects {} to set Strata version property.
2018-07-17 12:31:44 +01:00
josecoll
065a494e0d
Allign version identifier with OS and Enterprise 3.0 release. ( #1253 )
...
Was X.Y.Z, now X.Y
2018-07-16 11:37:05 +01:00
rick.parker
4e81d26985
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180713-1
2018-07-13 13:15:53 +01:00
Rick Parker
ed25d8f1be
ENT-1565 Upgrade Artemis version to latest. ( #3557 )
...
* ENT-1565 Upgrade Artemis version to latest.
* Fix compiler errors.
* Add to changelog
* Additional commentary on Proton-J version
2018-07-13 10:10:26 +01:00
Thomas Schroeter
ae7e8a29c7
Don't use grgit to enable git worktree ( #3573 )
...
We might also include a check if the current repo is clean, e.g.
by running `git diff --exit-code` and checking the return value.
2018-07-12 16:20:37 +01:00
Stefano Franz
9503c9684e
CORDA-1747 - Client RPC classloader and Java Generics fixes ( #3553 )
...
* fix for spring boot rpc and it work with deterministic serialization
* really really fix tests
* up log level
* reenable allWarningsAsErrors
2018-07-11 13:28:01 +01:00
Stefano Franz
0d7169407a
Merge remote-tracking branch 'open/master' into my-merge-july-11-11-27
2018-07-11 11:56:41 +01:00
Stefano Franz
7e0ed41bbe
reenable allWarningsAsErrors
2018-07-11 11:54:04 +01:00
Stefano Franz
480698bc46
Merge remote-tracking branch 'open/master' into my-merge-july-11-11-27
...
# Conflicts:
# CONTRIBUTORS.md
2018-07-11 11:37:49 +01:00
Katelyn Baker
fa55221b66
fix for spring boot rpc and it work with deterministic serialization
2018-07-11 10:59:21 +01:00
Anthony Keenan
3203bdae97
Merge from O/S
2018-07-05 19:09:25 +01:00
Shams Asari
300e0573fe
Merge pull request #1205 from corda/os-merge-244167d
...
O/S merge from 244167d
2018-07-05 17:16:52 +01:00
Shams Asari
c4d0a62ceb
Merge branch 'master' into os-merge-244167d
2018-07-05 15:47:09 +01:00
Matthew Nesbit
123a2af5e0
Bridge to Firewall renames
...
More renaming
Update diagrams
Update changelog to point out breaking change fo the rename
Address Richard's PR comments
2018-07-05 15:20:28 +01:00
bpaunescu
578e4a53c2
ENT-2226: bump curator version ( #1201 )
2018-07-05 13:48:54 +01:00
Chris Rankin
35b2170b9c
Upgrade to Kotlin 1.2.51. ( #3509 )
2018-07-05 12:45:16 +01:00
Shams Asari
20a589d66d
Merge remote-tracking branch 'open/master' into os-merge-244167d
...
# Conflicts:
# docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/LaunchSpaceshipFlow.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/tearoffs/TutorialTearOffs.kt
# docs/source/running-a-node.rst
# experimental/behave/build.gradle
# experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Substeps.kt
# experimental/kryo-hook/build.gradle
# experimental/quasar-hook/build.gradle
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
2018-07-04 18:38:34 +01:00
Shams Asari
244167d3e9
Enabled warnings as errors ( #3514 )
2018-07-04 17:17:27 +01:00
Stefano Franz
6c71ba0874
Merge pull request #1179 from roastario/publish_installer
...
ENT-2193 gradle magic to publish installer
2018-07-03 11:17:04 +01:00
Michele Sollecito
6c0ac1217c
Updates to master after GA release ( #1167 )
2018-07-03 10:25:13 +01:00
Viktor Kolomeyko
c4722cc311
Eliminate now redundant AMQP switch ( #1176 )
2018-07-03 09:46:56 +01:00
Stefano Franz
d5ebb6da4f
gradle magic to publish installer
2018-07-02 18:01:08 +01:00
Matthew Nesbit
912be6cf6a
Correction to gradle file
2018-07-02 11:59:04 +01:00
Matthew Nesbit
0f98a1cbcd
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180702
...
# Conflicts:
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
2018-07-02 11:31:18 +01:00
Stefano Franz
b129a44271
Merge pull request #1087 from corda/add_licence_to_installer_2
...
ENT-2098 add license acceptance step to installer
2018-06-29 15:58:08 +01:00
szymonsztuka
470921afb9
ENT-1741 Build standalone shell JAR distribution - subsequent fix ( #3476 )
2018-06-29 12:03:18 +01:00
szymonsztuka
0a700fd3f0
ENT-1741 Build standalone shell JAR distribution - fix ( #3474 )
2018-06-29 10:32:37 +01:00
sollecitom
ec4ec7e8c6
Merge remote-tracking branch 'remotes/open/master' into merges/june-29-10-20
...
# Conflicts:
# docs/source/upgrade-notes.rst
2018-06-29 10:22:16 +01:00
Mike Hearn
33511b40dc
Minor: work around a Kotlin compiler performance regressions
2018-06-28 18:24:50 +02:00
Andrius Dagys
4281061c47
Merge remote-tracking branch 'open/master' into andrius/os-merge-06-27
2018-06-27 10:41:28 +01:00
Stefano Franz
85439aee57
add license acceptance step to installer
2018-06-27 09:55:52 +01:00
Tommy Lillehagen
e3072ad320
Remove old TODO to upgrade Artemis to version 2.4+ ( #3447 )
2018-06-27 09:02:45 +01:00
Tommy Lillehagen
1eedaaa45f
Fix merge - add missing entry in bintrayConfig
2018-06-26 13:36:39 +01:00
Katelyn Baker
7a2c15fc5e
Merge remote-tracking branch 'open/master' into kat-merge-20180626
2018-06-26 12:27:24 +01:00
Chris Rankin
a4d2acbea2
ENT-1467: Make the deterministic JDK image compatible with IntelliJ. ( #3416 )
...
* Expand the deterministic JDK image to make it friendlier to IntelliJ.
* Fix Gradle always to use the latest deterministic rt.jar available.
* Write JDK items directly from Gradle.
2018-06-26 11:53:16 +01:00
Tommy Lillehagen
1d95ffba3a
CORDA-1674 - Publish Node Explorer artefact ( #3437 )
2018-06-26 10:46:04 +01:00
Shams Asari
98cd8be160
Merge remote-tracking branch 'open/master' into os-merge-b97af47
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# docs/source/release-notes.rst
# node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
# tools/bootstrapper/build.gradle
2018-06-25 11:38:30 +01:00
Daniel Cordell
6a51ed1f8d
Merge pull request #951 from corda/colljos-dev-publish-artifactory
...
Fix incorrect repoKey used to publish to Artifactory.
2018-06-25 10:35:57 +01:00
Shams Asari
3046843d40
CORDA-1602: Added cmd line flags to the network bootstrapper ( #3419 )
...
The list of CorDapps jars is no longer passed in via the cmd line but is now expected to be placed in the bootstrapped directory.
Ended up being a bit of a refactor to cater for unit testing, and also tidied up the bootstrapper docs.
2018-06-23 11:36:10 +01:00
Chris Rankin
8b3a5432cb
Merge commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge
2018-06-23 00:06:11 +01:00
Chris Rankin
473d97e6c4
Upgrade to Gradle 4.8.1 ( #3420 )
...
See: https://github.com/gradle/gradle/releases/tag/v4.8.1
2018-06-22 08:36:04 +01:00
Andrius Dagys
a9cdb576e6
Merge remote-tracking branch 'open/master' into andrius/merge-06-21-2
2018-06-21 14:02:37 +01:00
szymonsztuka
3af5412d40
ENT-1741 Build standalone shell JAR distribution ( #3409 )
2018-06-21 10:32:36 +01:00
Florian Friemel
ad76b7821e
Merge remote-tracking branch 'open/master' into os-merge-2018-06-18-17_42
2018-06-18 17:51:41 +01:00
Chris Rankin
6f149a38c9
ENT-1463: Upgrade to Kotlin 1.2.50 ( #3383 )
...
* Upgrade to Kotlin 1.2.50
* Remove methods whose implementations are now inherited.
2018-06-18 15:36:33 +01:00
Chris Rankin
71e7784519
ENT-1467: Document how to configure IntelliJ with a deterministic SDK. ( #3371 )
...
* Allow deterministic modules to use a deterministic IntelliJ SDK.
* Document how to configure IntelliJ with a deterministic SDK.
* Small clarifications to deterministic IntelliJ SDK documentation.
2018-06-18 12:40:35 +01:00
rick.parker
3a390e3643
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-201806-15-1
2018-06-15 17:06:09 +01:00