ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-14 08:49:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Viktor Kolomeyko 2018-04-23 14:21:10 +01:00
parent f1fd1cefd8
commit 071be31916
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docs/source/changelog.rst
View File

@ -68,26 +68,7 @@ than 2.12.3 (including 2.12.4) exhibit a different issue.
* java.math.BigInteger serialization support added. * java.math.BigInteger serialization support added.
* Fix CORDA-1355: Reduce amount of classpath scanning during integration tests execution.
* java.security.cert.CRLReason added to the default Whitelist. * java.security.cert.CRLReason added to the default Whitelist.
* Fix CORDA-1355: Reduce amount of classpath scanning during integration tests execution.
.. _changelog_v3.1:
Version 3.1
-----------
* Update the fast-classpath-scanner dependent library version from 2.0.21 to 2.12.3
.. note:: Whilst this is not the latest version of this library, that being 2.18.1 at time of writing, versions later
than 2.12.3 (including 2.12.4) exhibit a different issue.
* Updated the api scanner gradle plugin to work the same way as the version in master. These changes make the api scanner more
accurate and fix a couple of bugs, and change the format of the api-current.txt file slightly. Backporting these changes
to the v3 branch will make it easier for us to ensure that apis are stable for future versions. These changes are
released in gradle plugins version 3.0.10. For more information on the api scanner see
the `documentation <https://github.com/corda/corda-gradle-plugins/tree/master/api-scanner>`_.
* java.security.cert.X509CRL serialization support added. * java.security.cert.X509CRL serialization support added.

3
samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
View File

@ -57,8 +57,9 @@ class SimmValuationTest : IntegrationTest() {
} }
@After @After
fun tearDown() { override fun tearDown() {
System.clearProperty(AbstractAMQPSerializationScheme.SCAN_SPEC_PROP_NAME) System.clearProperty(AbstractAMQPSerializationScheme.SCAN_SPEC_PROP_NAME)
super.tearDown()
} }
@Test @Test