update swagger docs for __admin/request include exclude query strings

.github/workflows/ci.yml

@@ -11,24 +11,24 @@ on:
 jobs:
   # Build job
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           submodules: "true"
       - name: Setup Ruby
-        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+        uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4 # v1.207.0
         with:
-          ruby-version: '2.7.6' # Not needed with a .ruby-version file
+          ruby-version: '2.7.2' # Not needed with a .ruby-version file
           bundler: '2.4.10'
           bundler-cache: false # runs 'bundle install' and caches installed gems automatically
           cache-version: 3 # Increment this number if you need to re-download cached gems
       - name: Setup Pages
         id: pages
         uses: actions/configure-pages@v3
       - name:  Update RubyGems and Co
-        run: gem update --system
+        run: gem update
       - name: Install Ruby Bundles
         run: bundle install
       - name: Build with Jekyll
@@ -54,4 +54,4 @@ jobs:
 #          enforce_https: false
       - name: Upload artifact
         # Automatically uploads an artifact from the './_site' directory by default
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3

.github/workflows/deploy.yaml

@@ -2,8 +2,8 @@ name: Deploy Jekyll site to Pages
 
 on:
   # Runs on pushes targeting the default branch
-  push:
-    branches: ["main"]
+  # push:
+  #   branches: ["main"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -30,7 +30,7 @@ jobs:
         with:
           submodules: "true"
       - name: Setup Ruby
-        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+        uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4 # v1.207.0
         with:
           ruby-version: '2.7.6' # Not needed with a .ruby-version file
           bundler: '2.4.10'
@@ -40,7 +40,7 @@ jobs:
         id: pages
         uses: actions/configure-pages@v3
       - name:  Update RubyGems and Co
-        run: gem update --system
+        run: gem update
       - name: Install Ruby Bundles
         run: bundle install
       - name: Build with Jekyll
@@ -76,7 +76,7 @@ jobs:
 #          enforce_https: false
       - name: Upload artifact
         # Automatically uploads an artifact from the './_site' directory by default
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
 
   # Deployment job
   deploy:
@@ -88,4 +88,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

Gemfile.lock

@@ -108,11 +108,11 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
-    wdm (0.1.1)
     webrick (1.8.1)
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-23
   x64-mingw32
   x86_64-linux
 
@@ -126,7 +126,6 @@ DEPENDENCIES
   jemoji
   json (~> 1.8.6)
   nokogiri (>= 1.7.2)
-  wdm (~> 0.1.0)
   webrick (~> 1.7)
 
 BUNDLED WITH

_config.yml

@@ -234,11 +234,13 @@ compress_html:
     ignore:
         envs: development
 
-wiremock_version: 3.3.1
+wiremock_version: 3.13.1
+wiremock_4_version: 4.0.0-beta.10
 wiremock_baseline: 3.x
 pageEditPrefix: https://github.com/wiremock/wiremock.org/edit/main/
 
-grpc_extension_version: 0.4.0
+grpc_extension_version: 0.11.0
+spring_boot_integration_version: 3.10.0
 
 community_slack:
   join_url: https://slack.wiremock.org/

_data/doc-categories.yml

@@ -22,11 +22,13 @@ java:
   pages:
     - junit-jupiter
     - junit-extensions
-    - spring-boot
+    - spring-boot-integration
     - java-usage
     - configuration
     - running-without-http-server
+    - jetty-12
     - android
+    - pact
 
 stubbing-and-verifying:
   title: Stubbing & Verifying
@@ -40,8 +42,8 @@ stubbing-and-verifying:
     - proxying
     - verifying
 
-templating:
-  title: Templating
+library:
+  title: Mock API Template Library
   link: /docs/mock-api-templates
   pages:
     - mock-api-templates
@@ -59,8 +61,14 @@ protocols:
     - webhooks-and-callbacks
     - grpc
     - solutions/graphql
+    - jwt
     - https
 
+integrations:
+  title: Integrations
+  pages:
+    - spring-boot
+
 configuration:
   title: Advanced use-cases
   pages:
@@ -85,6 +93,10 @@ extensibility:
     - extensibility/adding-mappings-loader
     - stub-metadata
 
+v4:
+  title: WireMock v4
+  link: /docs/v4/
+
 reference:
   title: Reference
   pages:

_docs/configuration.md

@@ -5,6 +5,8 @@ meta_title: Configuring WireMock in Java | WireMock
 description: Configuring WireMock progammatically in Java.
 ---
 
+<div class="cloud-callout"><a href="https://www.wiremock.io?utm_source=oss-docs&utm_medium=oss-docs&utm_campaign=cloud-callouts-configuration&utm_id=cloud-callouts&utm_term=cloud-callouts-configuration" target="_BLANK">Centralize and scale your API mocks with WireMock Cloud.</a></div>
+
 Both `WireMockServer` and the `WireMockRule` take a configuration builder as the parameter to their constructor e.g.
 
 ```java
@@ -98,6 +100,20 @@ WireMock uses the trust store for three purposes:
 3. As a proxy, WireMock will trust a target server if it presents a public
    certificate in this trust store
 
+
+## HTTP/2 configuration
+
+HTTP/2 can be disabled separately for plain text (HTTP) and TLS (HTTPS):
+
+```java
+// Disable HTTP/2 over HTTP
+.http2PlainDisabled(true);
+
+// Disable HTTP/2 over HTTPS
+.http2TlsDisabled(true);
+```
+
+
 ## Proxy settings
 
 ```java
@@ -109,6 +125,9 @@ WireMock uses the trust store for three purposes:
 
 // Send the Host header in the original request onwards to the system being proxied to
 .preserveHostHeader(false)
+
+// As of WireMock `3.7.0`, when in proxy mode, this option will transfer the original `User-Agent` header from the client to the proxied service.
+.preserveUserAgentProxyHeader(true) 
 
  // Override the Host header sent when reverse proxying to another system (this and the previous parameter are mutually exclusive)
 .proxyHostHeader("my.otherdomain.com")
@@ -130,6 +149,11 @@ WireMock uses the trust store for three purposes:
 
 // The type of the CA key store
 .caKeystoreType("JKS")
+
+// Which proxy encodings to proxy through to the target if the request contains an Accept-Encoding header
+// By default this is null, which means the header is sent to the target unchanged
+// If there is an Accept-Encoding header on the request, and it does not contain any of the supported proxy encodings, the header is not sent to the target.
+.withSupportedProxyEncodings("gzip", "deflate")
 ```
 
 ## File locations
@@ -156,6 +180,16 @@ The request journal records requests received by WireMock. It is required by the
 .maxRequestJournalEntries(Optional.of(100))
 ```
 
+## Template Cache
+
+When response templating is enabled, compiled template fragments are cached to improve performance.  This setting allows
+you to configure the maximum number of entries to allow in the cache.  As of WireMock `3.7.0`, this defaults to 1000 
+cache entries.  Before WireMock `3.7.0` the default was unlimited
+
+```java
+.withMaxTemplateCacheEntries(100)
+```
+
 ## Notification (logging)
 
 WireMock wraps all logging in its own `Notifier` interface. It ships with no-op, Slf4j and console (stdout) implementations.
@@ -273,3 +307,26 @@ To output all raw traffic to console use `ConsoleNotifyingWiremockNetworkTraffic
 If you would like to collect the traffic
 and for example add it to your acceptance test's output,
 you can use the `CollectingNetworkTrafficListener`.
+
+## HTTP Client
+If you want to increase the proxying performance of WireMock you can enable connection reuse and increase the maximum number of connections:
+
+```java
+// Maximum connections for Http Client
+.maxHttpClientConnections(1000);
+//Disable http connection reuse, `false` to enable
+.disableConnectionReuse(true)
+```
+
+## Webhook configuration
+
+The default webhook thread pool size is 10.  This is more than enough for normal mocking with callbacks but if you are
+running performance tests using WireMock with callbacks, you might need to tweak the size of the threadpool used to 
+process webhook requests. This option is available as of WireMock version `3.13.0`
+
+```java
+// The number of threads created for processing webhook requests. Defaults to 10
+.withWebhookThreadPoolSize(100)
+
+```
+