Merge branch '2.1.x'

# Conflicts:
#	README.adoc
This commit is contained in:
Olga Maciaszek-Sharma
2019-03-28 12:13:18 +01:00
63 changed files with 310 additions and 310 deletions

View File

@@ -16,7 +16,7 @@
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>com.example</groupId>

View File

@@ -1,4 +1,4 @@
#WireMock password - http://wiremock.org/docs/running-standalone/
#WireMock password - https://wiremock.org/docs/running-standalone/
server.ssl.key-store-password=password
server.ssl.key-password=password
server.ssl.trust-store-password=password