Merge pull request #150 from oleg-nenashev/wiremock-3-migration-part3

Wiremock 3 migration part3

_data/baselines.yml

@@ -1,11 +1,11 @@
 # Current GA Version of WireMock
 current:
-  id: 2.x
+  id: 3.x
   absoluteUrl: https://wiremock.org
 # List of preview versions
 preview: 
-  id: 3.x
-  absoluteUrl: https://wiremock.org/3.x
-  scopeUrl: https://github.com/orgs/wiremock/projects/5
 # List of old versions documentation for which is served on the website
-archive:
+archive:
+  id: 2.x
+  absoluteUrl: https://wiremock.org/2.x
+  branch: 2.x

_data/navigation.yml

@@ -15,6 +15,9 @@ main:
         - name: "External Resources"
           subnavLink: "/external-resources"
         - name: "WireMock 2.x (Archive)"
+          subnavLink: "/2.x/docs/"
+          wiremock_baseline: 2.x
+        - name: "WireMock 3.x"
           subnavLink: "/2.x/docs/"
           wiremock_baseline: 3.x
 

_docs/download-and-installation.md

@@ -25,58 +25,35 @@ conflicting versions of its dependencies. The standalone JAR is also runnable (s
 
 ## Standalone Service
 
-### WireMock 3.x Beta (recommended)
-
-#### Maven
-
-```xml
-<dependency>
-    <groupId>org.wiremock</groupId>
-    <artifactId>wiremock-standalone</artifactId>
-    <version>{{ site.wiremock_beta_version }}</version>
-    <scope>test</scope>
-</dependency>
-```
-
-#### Gradle
-
-```groovy
-testImplementation "org.wiremock:wiremock-standalone:{{ site.wiremock_beta_version }}"
-```
-
-### WireMock 2.x Stable
-
-#### Docker
+### Docker
 
 Run the following in a terminal:
 
 ```bash
-docker run -it --rm \
-  -p 8080:8080 \
-  --name wiremock \
+docker run -it --rm -p 8080:8080 --name wiremock \
   wiremock/wiremock:{{ site.wiremock_version }}
 ```
 
-Learn more in the [Docker guide](../docker).
-
-#### Maven - stable
+### Maven
 
 ```xml
 <dependency>
-    <groupId>com.github.tomakehurst</groupId>
-    <artifactId>wiremock-jre8-standalone</artifactId>
-    <version>{{ site.wiremock_version }}</version>
+    <groupId>org.wiremock</groupId>
+    <artifactId>wiremock-standalone</artifactId>
+    <version>{{ site.wiremock_beta_version }}</version>
     <scope>test</scope>
 </dependency>
 ```
 
-#### Gradle - stable
+### Gradle
 
 ```groovy
-testImplementation "com.github.tomakehurst:wiremock-jre8-standalone:{{ site.wiremock_version }}"
+testImplementation "org.wiremock:wiremock-standalone:{{ site.wiremock_beta_version }}"
 ```
 
-## Direct download
+Learn more in the [Docker guide](../docker).
+
+### Direct download
 
 If you want to run WireMock as a standalone process you can
 <a id="wiremock-standalone-download" href="https://repo1.maven.org/maven2/org/wiremock/wiremock-standalone/{{ site.wiremock_beta_version }}/wiremock-standalone-{{ site.wiremock_beta_version }}.jar">download the standalone JAR from

_layouts/docs.html

@@ -50,11 +50,13 @@
       </header>
 
       {% if site.wiremock_baseline == site.data.baselines.current.id %} 
-      <div style="background-color: #f2f2f2;border: #c8c8c8 1px solid;padding: 8px;margin-bottom:32px;">
-        This document is for the WireMock {{ site.data.baselines.current.id }} baseline.
-        See the documentation for WireMock {{ site.data.baselines.preview.id }} preview 
-        <a href="{{  page.url | prepend: site.data.baselines.preview.absoluteUrl }}">here</a>
-      </div>
+        {% if site.data.baselines.preview.id %}
+        <div style="background-color: #f2f2f2;border: #c8c8c8 1px solid;padding: 8px;margin-bottom:32px;">
+          This document is for the WireMock {{ site.data.baselines.current.id }} baseline.
+          See the documentation for WireMock {{ site.data.baselines.preview.id }} preview 
+          <a href="{{  page.url | prepend: site.data.baselines.preview.absoluteUrl }}">here</a>
+        </div>
+        {% endif %}
       {% else %}
         {% if site.wiremock_baseline == site.data.baselines.preview.id %} 
         <div style="background-color: #f2f2f2;border: #c8c8c8 1px solid;padding: 8px;margin-bottom:32px;">