Merge remote-tracking branch 'toma/master'

Author: Per Abich

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,20 @@
+# Issue guidelines
+
+If you're asking a question, rather than reporting a bug or requesting a feature, **please post your question on the [mailing list](https://groups.google.com/forum/#!forum/wiremock-user), and do not open an issue**.
+
+Please do not log bugs regarding classpath issues (typically manifesting as 'NoClassDefFoundException' or 'ClassNotFoundException').
+These are not WireMock bugs, and need to be diagnosed for your project using your build tool. Plenty has already been written in WireMock's issues and mailing list about how to resolve these issues
+so please search these sources before asking for help.
+
+## Bug reports
+
+We're a lot more likely to look at and fix bugs that are clearly described and reproduceable. Please including the following details when reporting a bug:
+
+- [ ] Which version of WireMock you're using
+- [ ] How you're starting and configuring WireMock, including configuration or CLI the command line
+- [ ] A failing test case that demonstrates the problem
+- [ ] Profiler data if the issue is performance related   
+
+## Feature requests
+
+Please include details of the use case and motivation for a feature when suggesting it.

.ruby-version

@@ -0,0 +1 @@
+2.1.10

README.md

@@ -2,7 +2,8 @@ WireMock - a web service test double for all occasions
 ======================================================
 
 [![Build Status](https://travis-ci.org/tomakehurst/wiremock.svg?branch=master)](https://travis-ci.org/tomakehurst/wiremock)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.tomakehurst/wiremock/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.tomakehurst/wiremock)
+[![Maven Central](https://img.shields.io/maven-central/v/com.github.tomakehurst/wiremock.svg)](https://search.maven.org/artifact/com.github.tomakehurst/wiremock)
+
 
 Key Features
 ------------

Vagrantfile

@@ -1,40 +1,43 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
+def windows?
+    (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+end
 
-Vagrant.configure(2) do |config|
-  config.vm.box = "https://cloud-images.ubuntu.com/vagrant/utopic/current/utopic-server-cloudimg-i386-vagrant-disk1.box"
+Vagrant.configure("2") do |config|
+  config.vm.box = "tcthien/java-dev-server"
+  config.vm.box_version = "0.0.7"
   config.vm.box_check_update = false
 
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
+  # config.vm.synced_folder "#{Dir.home}/.m2/repository", "/share/mavenRepo"
+  # config.vm.synced_folder "", "/share/source"
 
-  config.vm.synced_folder ".", "/wiremock"
+  # MySQL Port
+  # config.vm.network "forwarded_port", guest: 3306, host: 3306
+  # Cassandra Port
+  # config.vm.network "forwarded_port", guest: 9042, host: 9042
+  # config.vm.network "forwarded_port", guest: 7000, host: 7000
+  # config.vm.network "forwarded_port", guest: 7001, host: 7001
+  # config.vm.network "forwarded_port", guest: 9160, host: 9160
 
   config.vm.provider "virtualbox" do |vb|
      vb.memory = "2048"
+     vb.name = "codelab-server"
   end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
 
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  config.vm.provision "shell", inline: <<-SHELL
-    sudo apt-get update
-    sudo apt-get install -y openjdk-7-jdk
+  # update node+npm
+  config.vm.provision "shell", privileged: false, inline: <<-SHELL
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
+    export NVM_DIR="\$HOME/.nvm"
+    [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh"
+    [ -s "\$NVM_DIR/bash_completion" ] && \. "\$NVM_DIR/bash_completion"
+    nvm install --lts
   SHELL
-end
+
+  # node/npm has symlink errors on windows hosts, this config disables them
+  if windows?
+    config.vm.provision "shell", privileged: false, inline: <<-SHELL
+      export NVM_DIR="\$HOME/.nvm"
+      [ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh"
+      npm config set bin-links false
+    SHELL
+  end
+end

build.gradle

@@ -29,14 +29,16 @@ apply plugin: 'com.github.johnrengelman.shadow'
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 group = 'com.github.tomakehurst'
-version = '2.10.1'
+version = '2.19.0'
 
 def shouldPublishLocally = System.getProperty('LOCAL_PUBLISH')
 
 def versions = [
-    jackson: '2.8.9',
-    jetty  : '9.2.22.v20170606',
-    xmlUnit: '2.3.0'
+    handlebars: '4.0.7',
+    jackson: '2.8.11',
+    jacksonDatabind: '2.8.11.2',
+    jetty  : '9.2.24.v20180105', // Please don't raise PRs upgrading this to the latest version as it drops Java 7 support. See https://github.com/tomakehurst/wiremock/issues/407 and https://github.com/tomakehurst/wiremock/pull/887 for details
+    xmlUnit: '2.5.1'
 ]
 
 repositories {
@@ -51,8 +53,8 @@ dependencies {
     compile "com.google.guava:guava:20.0"
     compile "com.fasterxml.jackson.core:jackson-core:$versions.jackson",
         "com.fasterxml.jackson.core:jackson-annotations:$versions.jackson",
-        "com.fasterxml.jackson.core:jackson-databind:$versions.jackson"
-    compile "org.apache.httpcomponents:httpclient:4.5.3"
+        "com.fasterxml.jackson.core:jackson-databind:$versions.jacksonDatabind"
+    compile "org.apache.httpcomponents:httpclient:4.5.5"
     compile "org.xmlunit:xmlunit-core:$versions.xmlUnit"
     compile "org.xmlunit:xmlunit-legacy:$versions.xmlUnit"
     compile "com.jayway.jsonpath:json-path:2.4.0"
@@ -61,11 +63,12 @@ dependencies {
     compile("junit:junit:4.12") {
         exclude group: "org.hamcrest", module: "hamcrest-core"
     }
-    compile 'org.apache.commons:commons-lang3:3.6'
-    compile 'com.flipkart.zjsonpatch:zjsonpatch:0.3.0'
-    compile 'com.github.jknack:handlebars:4.0.6', {
+    compile 'org.apache.commons:commons-lang3:3.7'
+    compile 'com.flipkart.zjsonpatch:zjsonpatch:0.4.4'
+    compile "com.github.jknack:handlebars:$versions.handlebars", {
         exclude group: 'org.mozilla', module: 'rhino'
     }
+    compile "com.github.jknack:handlebars-helpers:$versions.handlebars"
 
     testCompile "org.hamcrest:hamcrest-all:1.3"
     testCompile("org.jmock:jmock:2.5.1") {
@@ -79,13 +82,13 @@ dependencies {
         exclude group: "org.hamcrest", module: "hamcrest-library"
     }
     testCompile "org.skyscreamer:jsonassert:1.2.3"
-    testCompile 'com.toomuchcoding.jsonassert:jsonassert:0.4.7'
+    testCompile 'com.toomuchcoding.jsonassert:jsonassert:0.4.12'
     testCompile 'org.awaitility:awaitility:2.0.0'
-
     testCompile "com.googlecode.jarjar:jarjar:1.3"
     testCompile "commons-io:commons-io:2.4"
-    testCompile 'org.scala-lang:scala-library:2.11.8'
+    testCompile 'org.scala-lang:scala-library:2.11.12'
     testCompile 'org.littleshoot:littleproxy:1.1.2'
+    testCompile 'org.apache.httpcomponents:httpmime:4.5'
 
     testRuntime 'org.slf4j:slf4j-log4j12:1.7.12'
     testRuntime files('src/test/resources/classpath file source/classpathfiles.zip', 'src/test/resources/classpath-filesource.jar')
@@ -349,14 +352,23 @@ task signAll {
 
 task npmInstall(type: Exec) {
     workingDir 'docs-v2'
-    commandLine 'npm', 'i'
+	if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {
+		commandLine 'cmd', '/c', 'npm', 'i'
+	} else {
+		commandLine 'npm', 'i'
+	}    
 }
 
 task generateApiDocs(type: Exec) {
     dependsOn npmInstall
     workingDir 'docs-v2'
-    commandLine 'npm', 'run', 'apidocs'
+		if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {
+		commandLine 'cmd', '/c', 'npm', 'run', 'apidocs'
+	} else {
+		commandLine 'npm', 'run', 'apidocs'
+	}
 }
+
 jar.dependsOn generateApiDocs
 processResources.dependsOn generateApiDocs
 

docs-v2/.ruby-version

@@ -0,0 +1 @@
+2.1.10

docs-v2/_config.yml

@@ -58,6 +58,7 @@ analytics:
   provider               : google
   google:
     tracking_id          : 'UA-36386229-2'
+    optimize_id          : 'GTM-WQTGSSM'
 
 # Google AdSense
 google_ad_client         :
@@ -215,4 +216,4 @@ compress_html:
   ignore:
     envs: development
 
-wiremock_version: 2.10.1
+wiremock_version: 2.19.0

docs-v2/_data/navigation.yml

@@ -3,12 +3,6 @@ main:
   - title: "Docs"
     url: /docs/
 
-  # - title: "Blog"
-  #   url: /blog
-
-#  - title: "Support & Training"
-#    url: /support-and-training/
-
   - title: "About"
     url: /about/
 
@@ -23,9 +17,6 @@ main:
   - title: "External Resources"
     url: /external-resources/
 
-  - title: "Support & Consulting"
+  - title: "Pro Support"
     url: http://consulting.wiremock.org
 
-  - title: "MockLab"
-    url: http://get.mocklab.io/?utm_source=wiremock.org&utm_medium=primary-nav&utm_campaign=mocklab
-    new_window: true

docs-v2/_docs/configuration.md

@@ -54,6 +54,12 @@ Typically it is only necessary to tweak these settings if you are doing performa
 
  // Set the size of Jetty's header buffer (to avoid exceptions when very large request headers are sent). Defaults to 8192.
 .jettyHeaderBufferSize(16834)
+
+// Enable asynchronous request processing in Jetty. Recommended when using WireMock for performance testing with delays, as it allows much more efficient use of container threads and therefore higher throughput. Defaults to false. 
+.asynchronousResponseEnabled(true)
+
+// Set the number of asynchronous response threads. Effective only with asynchronousResponseEnabled=true. Defaults to 10.
+.asynchronousResponseThreads(10)
 ```
 
 ## HTTPS configuration

docs-v2/_docs/extending-wiremock.md

@@ -261,7 +261,7 @@ public class BodyLengthMatcher extends RequestMatcherExtension {
 Then define a stub with it:
 
 ```java
-stubFor(requestMatching("body-too-long", Parameters.one("maxLemgth", 2048))
+stubFor(requestMatching("body-too-long", Parameters.one("maxLength", 2048))
         .willReturn(aResponse().withStatus(422)));
 ```
 
@@ -273,7 +273,7 @@ or via JSON:
         "customMatcher" : {
             "name" : "body-too-long",
             "parameters" : {
-                "maxLemgth" : 2048
+                "maxLength" : 2048
             }
         }
     },
@@ -340,4 +340,4 @@ new WireMockServer(wireMockConfig()
 
 If you would like to collect the traffic 
 and for example add it to your acceptance test's output, 
-you can use the ```CollectingNetworkTrafficListener```.
+you can use the ```CollectingNetworkTrafficListener```.