Prerelease fix

Author: tommysitu

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'net.researchgate.release' version '2.6.0'
+    id 'net.researchgate.release' version '2.8.1'
     id "de.undercouch.download" version "3.4.2"
     id "com.github.hierynomus.license" version "0.14.0"
     id 'com.github.ben-manes.versions' version '0.14.0'

docs/conf.py

@@ -19,7 +19,7 @@
 author = u'SpectoLabs'
 
 
-version = '0.12.3'
+version = '0.13.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 

docs/pages/corefunctionality/configuration.rst

@@ -117,19 +117,45 @@ SSL
 ---
 
 When requests pass through Hoverfly, it needs to decrypt them in order for it to persist them to a database, or to perform matching.  So you end up with SSL between Hoverfly and
-the external service, and then SSL again between your client and Hoverfly.  To get this to work, Hoverfly comes with it's own self-signed certificate which has to be trusted by
-your client.  To avoid the pain of configuring your keystore, Hoverfly's certificate is trusted automatically when you instantiate it.
+the external service, and then SSL again between your client and Hoverfly.  To get this to work, Hoverfly comes with it's own CA certificate which has to be trusted by
+your client. To avoid the pain of configuring your keystore, Hoverfly's certificate is trusted automatically when you instantiate it.
 
-Alternatively, you can override the default SSL certificate by providing your own certificate and key files via the ``HoverflyConfig`` object, for example:
+Alternatively, you can override the default CA certificate by providing your own certificate and key files via the ``HoverflyConfig`` object, for example:
 
 .. code-block:: java
 
     localConfigs()
-        .sslCertificatePath("ssl/ca.crt")
-        .sslKeyPath("ssl/ca.key");
+        .overrideDefaultCaCert("ssl/ca.crt", "ssl/ca.key");
 
 The input to these config options should be the file path relative to the classpath. Any PEM encoded certificate and key files are supported.
 
+Mutual TLS authentication
+-------------------------
+
+For two-way or mutual SSL authentication, you can provide Hoverfly with a client certificate and a certificate key that you use to authenticate with the remote server.
+
+.. code-block:: java
+
+    localConfigs()
+        .enableClientAuth("ssl/client-auth.crt", "ssl/client-auth.key");
+
+The input to these config options should be the file path relative to the classpath. Any PEM encoded certificate and key files are supported.
+
+You can enable Mutual TLS for specific hosts, for example:
+
+.. code-block:: java
+
+    localConfigs()
+        .enableClientAuth("ssl/client-auth.crt", "ssl/client-auth.key", "foo.com", "bar.com");
+
+You can also provide a client CA cert:
+
+.. code-block:: java
+
+    localConfigs()
+        .enableClientAuth("ssl/client-auth.crt", "ssl/client-auth.key")
+        .clientAuthCaCertPath("ssl/client-ca.crt");
+
 
 Simulation Preprocessor
 -----------------------

junit5/gradle.properties

@@ -1,2 +1,3 @@
+version=0.12.4-SNAPSHOT
 title=Hoverfly Java JUnit5
 description=JUnit 5 extension for Hoverfly-Java

maven-release.sh

@@ -17,7 +17,7 @@ if [[ "${PROJECT_VERSION[0]}" == *"SNAPSHOT" ]]; then
 
     if [ "${IS_RELEASE}" = true ]; then
         echo "Performing a release"
-        ./gradlew :release -Prelease.releaseVersion=${RELEASE_VERSION} -Prelease.newVersion=${NEXT_DEV_VERSION} -x :junit5:createReleaseTag
+        ./gradlew :release -Prelease.releaseVersion=${RELEASE_VERSION} -Prelease.newVersion=${NEXT_DEV_VERSION} -x :junit5:createReleaseTag -x :testng:createReleaseTag
     else
         echo "Deploying snapshot version"
         ./gradlew uploadArchives

testng/gradle.properties

@@ -1,2 +1,3 @@
+version=0.12.4-SNAPSHOT
 title=Hoverfly Java TestNg
 description=TestNg extension for Hoverfly-Java