From febe737a7a7b23b27d71fab4f485c8b4016ca44a Mon Sep 17 00:00:00 2001 From: Joel Dudley Date: Thu, 4 Oct 2018 10:45:55 +0100 Subject: [PATCH 1/3] Updates homepage link. (#4027) --- docs/source/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index ac64315eb6..9aaaeaaf73 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -14,7 +14,7 @@ follow our :doc:`quickstart guide `. If you want to start coding on Corda, then familiarise yourself with the :doc:`key concepts `, then read our :doc:`Hello, World! tutorial `. For the background behind Corda, read the non-technical -`introductory white paper`_ or for more detail, the `technical white paper`_. +`platform white paper`_ or for more detail, the `technical white paper`_. If you have questions or comments, then get in touch on `Slack `_ or ask a question on `Stack Overflow `_ . @@ -24,7 +24,7 @@ We look forward to seeing what you can do with Corda! .. note:: You can read this site offline. Either `download the PDF`_ or download the Corda source code, run ``gradle buildDocs`` and you will have a copy of this site in the ``docs/build/html`` directory. -.. _`introductory white paper`: _static/corda-introductory-whitepaper.pdf +.. _`platform white paper`: _static/corda-platform-whitepaper.pdf .. _`technical white paper`: _static/corda-technical-whitepaper.pdf .. _`download the PDF`: _static/corda-developer-site.pdf From 5d03a03ec44f3160881b2ba104e9b16f69e0edff Mon Sep 17 00:00:00 2001 From: josecoll Date: Thu, 4 Oct 2018 11:48:24 +0100 Subject: [PATCH 2/3] CORDA-2030 - ensure the correct kotlin runtime library is used to resolve `AutoCloseable` (#4028) Fixes compatibility issue surfaced as "java.lang.NoClassDefFoundError: kotlin/jdk7/AutoCloseableKt" --- node/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/node/build.gradle b/node/build.gradle index 3a344867a3..ff7be256dc 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -79,6 +79,7 @@ dependencies { compile "org.slf4j:jul-to-slf4j:$slf4j_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + runtime "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" From 064c72dfb14f9559eec5e91bbe5edf32a7c47e30 Mon Sep 17 00:00:00 2001 From: cburlinchon Date: Thu, 4 Oct 2018 11:55:18 +0100 Subject: [PATCH 3/3] ENT-2554: Add back hibernate dependency as required by explorer runDemoNodes (#4029) --- tools/explorer/build.gradle | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/explorer/build.gradle b/tools/explorer/build.gradle index fe52056591..e16e786058 100644 --- a/tools/explorer/build.gradle +++ b/tools/explorer/build.gradle @@ -11,13 +11,6 @@ processResources { from file("$rootDir/config/dev/log4j2.xml") } -configurations { - compile { - // We don't need Hibernate just for its @Type annotation. - exclude group: 'org.hibernate', module: 'hibernate-core' - } -} - dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"