Permalink
Browse files

updating version after release

  • Loading branch information...
1 parent 2920257 commit daf5be4ef0e730144aefdbc4e6e0e38126598b66 @jamesdbloom committed Mar 6, 2016
View
@@ -14,7 +14,7 @@ MAINTAINER James Bloom "jamesdbloom@gmail.com"
# download MockServer
RUN \
mkdir -p /opt/mockserver && \
- wget -O /opt/mockserver/mockserver-netty-jar-with-dependencies.jar https://oss.sonatype.org/content/repositories/releases/org/mock-server/mockserver-netty/3.10.3/mockserver-netty-3.10.3-jar-with-dependencies.jar && \
+ wget -O /opt/mockserver/mockserver-netty-jar-with-dependencies.jar https://oss.sonatype.org/content/repositories/releases/org/mock-server/mockserver-netty/3.10.4/mockserver-netty-3.10.4-jar-with-dependencies.jar && \
wget -O /opt/mockserver/run_mockserver.sh https://raw.github.com/jamesdbloom/mockserver/master/docker/run_mockserver.sh && \
wget -O /opt/mockserver/libtcnative-1.so.0.1.27 https://raw.github.com/jamesdbloom/mockserver/master/docker/libtcnative-1.so.0.1.27 && \
wget -O /opt/mockserver/tomcat-native-1.1.27.jar https://raw.github.com/jamesdbloom/mockserver/master/docker/tomcat-native-1.1.27.jar && \
@@ -7,7 +7,7 @@
<pre><code class="code xml">&lt;<span class="element">plugin</span>&gt;
&lt;<span class="element">groupId</span>&gt;<span class="element_value">org.mock-server</span>&lt;/<span class="element">groupId</span>&gt;
&lt;<span class="element">artifactId</span>&gt;<span class="element_value">mockserver-maven-plugin</span>&lt;/<span class="element">artifactId</span>&gt;
- &lt;<span class="element">version</span>&gt;<span class="element_value">3.10.3</span>&lt;/<span class="element">version</span>&gt;
+ &lt;<span class="element">version</span>&gt;<span class="element_value">3.10.4</span>&lt;/<span class="element">version</span>&gt;
&lt;<span class="element">configuration</span>&gt;
&lt;<span class="element">serverPort</span>&gt;<span class="element_value">1080</span>&lt;/<span class="element">serverPort</span>&gt;
&lt;<span class="element">proxyPort</span>&gt;<span class="element_value">1090</span>&lt;/<span class="element">proxyPort</span>&gt;
@@ -42,7 +42,7 @@
<pre><code class="code xml"> &lt;<span class="element">plugin</span>&gt;
&lt;<span class="element">groupId</span>&gt;<span class="element_value">org.mock-server</span>&lt;/<span class="element">groupId</span>&gt;
&lt;<span class="element">artifactId</span>&gt;<span class="element_value">mockserver-maven-plugin</span>&lt;/<span class="element">artifactId</span>&gt;
- &lt;<span class="element">version</span>&gt;<span class="element_value">3.10.3</span>&lt;/<span class="element">version</span>&gt;
+ &lt;<span class="element">version</span>&gt;<span class="element_value">3.10.4</span>&lt;/<span class="element">version</span>&gt;
&lt;<span class="element">configuration</span>&gt;
&lt;<span class="element">serverPort</span>&gt;<span class="element_value">1080</span>&lt;/<span class="element">serverPort</span>&gt;
&lt;<span class="element">proxyPort</span>&gt;<span class="element_value">1090</span>&lt;/<span class="element">proxyPort</span>&gt;
@@ -164,7 +164,7 @@
&lt;<span class="element">dependency</span>&gt;
&lt;<span class="element">groupId</span>&gt;<span class="element_value">org.mock-server</span>&lt;<span class="element">/groupId</span>&gt;
&lt;<span class="element">artifactId</span>&gt;<span class="element_value">mockserver-netty</span>&lt;<span class="element">/artifactId</span>&gt;
- &lt;<span class="element">version</span>&gt;<span class="element_value">3.10.3</span>&lt;<span class="element">/version</span>&gt;
+ &lt;<span class="element">version</span>&gt;<span class="element_value">3.10.4</span>&lt;<span class="element">/version</span>&gt;
&lt;<span class="element">/dependency</span>&gt;</code></pre>
<p>To start the server and create a client the simplest way is to the start factory methods <span class="inline_code">ClientAndServer.startClientAndServer</span> or <span class="inline_code">ClientAndProxy.startClientAndProxy</span> as follows:</p>
@@ -314,8 +314,8 @@
<ul>
<li><a href="#running_from_command_line_using_homebrew">using homebrew</a> i.e. <strong>brew install mockserver && mockserver</strong></li>
- <li><a href="#running_from_command_line_using_java">using java directly</a> i.e. <strong>java -jar mockserver-netty-3.10.3-jar-with-dependencies.jar</strong></li>
- <li><a href="#running_from_command_line_using_maven_plugin">using maven plugin</a> i.e. <strong>mvn org.mock-server:mockserver-maven-plugin:3.10.3:runForked</strong></li>
+ <li><a href="#running_from_command_line_using_java">using java directly</a> i.e. <strong>java -jar mockserver-netty-3.10.4-jar-with-dependencies.jar</strong></li>
+ <li><a href="#running_from_command_line_using_maven_plugin">using maven plugin</a> i.e. <strong>mvn org.mock-server:mockserver-maven-plugin:3.10.4:runForked</strong></li>
<li><a href="#docker_container">using docker</a> i.e. <strong>docker run -d -P jamesdbloom/mockserver</strong></li>
</ul>
@@ -393,9 +393,9 @@
<p>MockServer can be run directly from the command line using java directly as follow:</p>
<ol>
- <li><p>download <a href="http://search.maven.org/remotecontent?filepath=org/mock-server/mockserver-netty/3.10.3/mockserver-netty-3.10.3-jar-with-dependencies.jar">mockserver-netty-3.10.3-jar-with-dependencies.jar</a> from Maven Central</p></li>
+ <li><p>download <a href="http://search.maven.org/remotecontent?filepath=org/mock-server/mockserver-netty/3.10.4/mockserver-netty-3.10.4-jar-with-dependencies.jar">mockserver-netty-3.10.4-jar-with-dependencies.jar</a> from Maven Central</p></li>
<li>
- <code class="code inline">java -jar <span class="command_line_argument_placeholder">&lt;path to mockserver-netty-3.10.3-jar-with-dependencies.jar&gt;</span> -serverPort <span class="command_line_argument_placeholder">&lt;port&gt;</span></code>
+ <code class="code inline">java -jar <span class="command_line_argument_placeholder">&lt;path to mockserver-netty-3.10.4-jar-with-dependencies.jar&gt;</span> -serverPort <span class="command_line_argument_placeholder">&lt;port&gt;</span></code>
</li>
</ol>
@@ -434,7 +434,7 @@
<p>For example:</p>
-<pre><code class="code">java -Dmockserver.logLevel=INFO -jar ~/Downloads/mockserver-netty-3.10.3-jar-with-dependencies.jar -serverPort <span class="numeric_literal">1080</span> -proxyPort <span class="numeric_literal">1090</span></code></pre>
+<pre><code class="code">java -Dmockserver.logLevel=INFO -jar ~/Downloads/mockserver-netty-3.10.4-jar-with-dependencies.jar -serverPort <span class="numeric_literal">1080</span> -proxyPort <span class="numeric_literal">1090</span></code></pre>
<p>All interactions with the MockServer are logged including setting up expectations, matching expectations, clearing expectations and verifying requests. The when running from the command line, Maven plugin, Grunt plugin or npm module the log is written to a file called <strong>mockserver.log</strong> in the current working directory where the MockServer is running. This log can be particularly helpful when trying to debug why a test is failing or expectations are not being matched.</p>
@@ -444,7 +444,7 @@
<p>A custom <a href="http://logback.qos.ch">logback</a> configuration file can be specified using the <span class="inline_code">logback.configurationFile</span> system property with an absolute or relative file path or a classpath, as follows:</p>
-<pre><code class="code">java -Droot.logLevel=WARN -Dmockserver.logLevel=INFO -Dlogback.configurationFile=example_logback.xml -jar ~/Downloads/mockserver-netty-3.10.3-jar-with-dependencies.jar -serverPort <span class="numeric_literal">1080</span> -proxyPort <span class="numeric_literal">1090</span></code></pre>
+<pre><code class="code">java -Droot.logLevel=WARN -Dmockserver.logLevel=INFO -Dlogback.configurationFile=example_logback.xml -jar ~/Downloads/mockserver-netty-3.10.4-jar-with-dependencies.jar -serverPort <span class="numeric_literal">1080</span> -proxyPort <span class="numeric_literal">1090</span></code></pre>
<p>A custom <a href="http://logback.qos.ch">logback</a> configuration file will also be automatically picked up if it is called <strong>logback.xml</strong> and is in the root of the classpath, however, the jar-with-dependencies already contains a <strong>logback.xml</strong> file, so to override this, the overriding <strong>logback.xml</strong> file must be higher (i.e. earlier) in the classpath.</p>
@@ -465,7 +465,7 @@
<p>MockServer can be run directly from the command line and using the <strong>mockserver-maven-plugin</strong> as follow:</p>
-<pre><code class="code">mvn -Dmockserver.serverPort=<span class="numeric_literal">1080</span> -Dmockserver.proxyPort=<span class="numeric_literal">1090</span> -Dmockserver.logLevel=INFO org.mock-server:mockserver-maven-plugin:3.10.3:runForked</code></pre>
+<pre><code class="code">mvn -Dmockserver.serverPort=<span class="numeric_literal">1080</span> -Dmockserver.proxyPort=<span class="numeric_literal">1090</span> -Dmockserver.logLevel=INFO org.mock-server:mockserver-maven-plugin:3.10.4:runForked</code></pre>
<p>When run from the command line the Maven plugin can be configured with the following properties:</p>
@@ -483,7 +483,7 @@
<p>The <span class="annotation">runForked</span> goal of the <strong>mockserver-maven-plugin</strong> will fork a JVM process containing the Netty based MockServer. To stop the forked JVM process use the <span class="annotation">stopForked</span> goal, as follows:</p>
-<pre><code class="code">mvn -Dmockserver.serverPort=<span class="numeric_literal">1080</span> -Dmockserver.proxyPort=<span class="numeric_literal">1090</span> org.mock-server:mockserver-maven-plugin:3.10.3:stopForked</code></pre>
+<pre><code class="code">mvn -Dmockserver.serverPort=<span class="numeric_literal">1080</span> -Dmockserver.proxyPort=<span class="numeric_literal">1090</span> org.mock-server:mockserver-maven-plugin:3.10.4:stopForked</code></pre>
<p>For more information on the <strong>mockserver-maven-plugin</strong> see the section on <a href="#maven_plugin">MockServer Maven Plugin</a></p>
@@ -494,8 +494,8 @@
<p>To run as a WAR deployed on any JEE web server:</p>
<ol>
- <li>download <a href="http://search.maven.org/remotecontent?filepath=org/mock-server/mockserver-war/3.10.3/mockserver-war-3.10.3.war">mockserver-war-3.10.3.war</a> from Maven Central</li>
- <li>deploy <strong>mockserver-war-3.10.3.war</strong> to any JEE web server</li>
+ <li>download <a href="http://search.maven.org/remotecontent?filepath=org/mock-server/mockserver-war/3.10.4/mockserver-war-3.10.4.war">mockserver-war-3.10.4.war</a> from Maven Central</li>
+ <li>deploy <strong>mockserver-war-3.10.4.war</strong> to any JEE web server</li>
</ol>
<p><strong>WAR Context Path</strong></p>
@@ -541,7 +541,7 @@
<p>This will produce a jar file under the target directory called, as follows:</p>
-<pre><code class="code">mockserver-netty/target/mockserver-netty-3.10.3-jar-with-dependencies.jar</code></pre>
+<pre><code class="code">mockserver-netty/target/mockserver-netty-3.10.4-jar-with-dependencies.jar</code></pre>
<p>Run MockServer then using the executable jar as per the instruction above in <a href="#running_from_command_line">Running From The Command Line</a></p>
@@ -14,8 +14,8 @@
<h3>MockServer and MockServer Proxy is available as:</h3>
<ul>
- <li>a stand alone <a href="http://search.maven.org/remotecontent?filepath=org/mock-server/mockserver-netty/3.10.3/mockserver-netty-3.10.3-jar-with-dependencies.jar">Netty web server</a> that is fully self contained</li>
- <li>a <a href="http://search.maven.org/remotecontent?filepath=org/mock-server/mockserver-war/3.10.3/mockserver-war-3.10.3.war">deployable WAR</a> that runs on any JEE web server</li>
+ <li>a stand alone <a href="http://search.maven.org/remotecontent?filepath=org/mock-server/mockserver-netty/3.10.4/mockserver-netty-3.10.4-jar-with-dependencies.jar">Netty web server</a> that is fully self contained</li>
+ <li>a <a href="http://search.maven.org/remotecontent?filepath=org/mock-server/mockserver-war/3.10.4/mockserver-war-3.10.4.war">deployable WAR</a> that runs on any JEE web server</li>
<li>a <a href="#maven_plugin">maven plugin</a></li>
<li>a <a href="https://www.npmjs.org/package/mockserver-grunt">Grunt plugin</a></li>
<li>an <a href="https://www.npmjs.org/package/mockserver-grunt">npm plugin</a></li>
@@ -38,7 +38,7 @@
<pre><code class="code xml"> &lt;<span class="element">plugin</span>&gt;
&lt;<span class="element">groupId</span>&gt;<span class="element_value">org.mock-server</span>&lt;/<span class="element">groupId</span>&gt;
&lt;<span class="element">artifactId</span>&gt;<span class="element_value">mockserver-maven-plugin</span>&lt;/<span class="element">artifactId</span>&gt;
- &lt;<span class="element">version</span>&gt;<span class="element_value">3.10.3</span>&lt;/<span class="element">version</span>&gt;
+ &lt;<span class="element">version</span>&gt;<span class="element_value">3.10.4</span>&lt;/<span class="element">version</span>&gt;
&lt;<span class="element">configuration</span>&gt;
&lt;<span class="element">serverPort</span>&gt;<span class="element_value">1080</span>&lt;/<span class="element">serverPort</span>&gt;
&lt;<span class="element">logLevel</span>&gt;<span class="element_value">DEBUG</span>&lt;/<span class="element">logLevel</span>&gt;
@@ -70,9 +70,9 @@
&lt;/<span class="element">plugin</span>&gt;</code></pre>
<p>If MockServer is started using the command line then the callback classes must be added to the JVM using the classpath command line switch (<strong>cp</strong> or <strong>classpath</strong>). The <strong>classpath</strong> switch is ignored by the JVM if the
- <strong>jar</strong> switch is used. So to run the MockServer from the command line directly (with mockserver-netty-3.10.3-jar-with-dependencies.jar) you must specify the <strong>org.mockserver.cli.Main</strong> main class specifically and not use the <strong>jar</strong> switch as follows.</p>
+ <strong>jar</strong> switch is used. So to run the MockServer from the command line directly (with mockserver-netty-3.10.4-jar-with-dependencies.jar) you must specify the <strong>org.mockserver.cli.Main</strong> main class specifically and not use the <strong>jar</strong> switch as follows.</p>
-<pre><code class="code">java -Dfile.encoding=UTF-8 -cp mockserver-netty-3.10.3-jar-with-dependencies.jar:my-callback-dependency.jar org.mockserver.cli.Main -serverPort 1080</code></pre>
+<pre><code class="code">java -Dfile.encoding=UTF-8 -cp mockserver-netty-3.10.4-jar-with-dependencies.jar:my-callback-dependency.jar org.mockserver.cli.Main -serverPort 1080</code></pre>
<h4>Java</h4>
@@ -57,13 +57,13 @@
<p>When running MockServer directly from <a href="/mock_server/running_mock_server.html#running_from_command_line">the command line</a> the system property <span class="inline_code">mockserver.logLevel</span> can be used to set the log level, as follows:</p>
-<pre><code class="code">java -Dmockserver.logLevel=INFO -jar ~/Downloads/mockserver-netty-3.10.3-jar-with-dependencies.jar -serverPort <span class="numeric_literal">1080</span> -proxyPort <span class="numeric_literal">1090</span></code></pre>
+<pre><code class="code">java -Dmockserver.logLevel=INFO -jar ~/Downloads/mockserver-netty-3.10.4-jar-with-dependencies.jar -serverPort <span class="numeric_literal">1080</span> -proxyPort <span class="numeric_literal">1090</span></code></pre>
<p>It is also possible to specify a custom <a href="http://logback.qos.ch">logback</a> configuration file to override the default MockServer or MockServer Proxy logging settings. An example <a href="https://github.com/jamesdbloom/mockserver/blob/master/mockserver-netty/src/main/resources/example_logback.xml">logback configuration file</a> is available in github.</p>
<p>A custom <a href="http://logback.qos.ch">logback</a> configuration file can be specified using the <span class="inline_code">logback.configurationFile</span> system property with an absolute or relative file path or a classpath, as follows:</p>
-<pre><code class="code">java -Droot.logLevel=WARN -Dmockserver.logLevel=INFO -Dlogback.configurationFile=example_logback.xml -jar ~/Downloads/mockserver-netty-3.10.3-jar-with-dependencies.jar -serverPort <span class="numeric_literal">1080</span> -proxyPort <span class="numeric_literal">1090</span></code></pre>
+<pre><code class="code">java -Droot.logLevel=WARN -Dmockserver.logLevel=INFO -Dlogback.configurationFile=example_logback.xml -jar ~/Downloads/mockserver-netty-3.10.4-jar-with-dependencies.jar -serverPort <span class="numeric_literal">1080</span> -proxyPort <span class="numeric_literal">1090</span></code></pre>
<p>A custom <a href="http://logback.qos.ch">logback</a> configuration file will also be automatically picked up if it is called <strong>logback.xml</strong> and is in the root of the classpath, however, the jar-with-dependencies already contains a <strong>logback.xml</strong> file, so to override this, the overriding <strong>logback.xml</strong> file must be higher (i.e. earlier) in the classpath.</p>
@@ -76,7 +76,7 @@
<pre><code class="code xml"> &lt;<span class="element">plugin</span>&gt;
&lt;<span class="element">groupId</span>&gt;<span class="element_value">org.mock-server</span>&lt;/<span class="element">groupId</span>&gt;
&lt;<span class="element">artifactId</span>&gt;<span class="element_value">mockserver-maven-plugin</span>&lt;/<span class="element">artifactId</span>&gt;
- &lt;<span class="element">version</span>&gt;<span class="element_value">3.10.3</span>&lt;/<span class="element">version</span>&gt;
+ &lt;<span class="element">version</span>&gt;<span class="element_value">3.10.4</span>&lt;/<span class="element">version</span>&gt;
&lt;<span class="element">configuration</span>&gt;
&lt;<span class="element">serverPort</span>&gt;<span class="element_value">1080</span>&lt;/<span class="element">serverPort</span>&gt;
&lt;<span class="element">proxyPort</span>&gt;<span class="element_value">1090</span>&lt;/<span class="element">proxyPort</span>&gt;
@@ -185,7 +185,7 @@
<p>Debugging a remote JVM (i.e. when running MockServer from the command line) typically requires providing the <span class="inline_code">-agentlib:jdwp</span> command line switch, as follows:</p>
-<pre><code class="code">java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=<span class="numeric_literal">5005</span> -jar ~/Downloads/mockserver-netty-3.10.3-jar-with-dependencies.jar -serverPort <span class="numeric_literal">1080</span> -proxyPort <span class="numeric_literal">1090</span></code></pre>
+<pre><code class="code">java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=<span class="numeric_literal">5005</span> -jar ~/Downloads/mockserver-netty-3.10.4-jar-with-dependencies.jar -serverPort <span class="numeric_literal">1080</span> -proxyPort <span class="numeric_literal">1090</span></code></pre>
<a name="debugging-with-maven-plugin" class="anchor" href="#debugging-with-maven-plugin">&nbsp;</a>
@@ -13,9 +13,9 @@
<p>The simplest way to run and download MockServer is by using the fully stand alone web server embedded with all dependencies that mocks HTTP and HTTPS requests, as follows:</p>
<ol>
- <li><p>download <a href="http://search.maven.org/remotecontent?filepath=org/mock-server/mockserver-netty/3.10.3/mockserver-netty-3.10.3-jar-with-dependencies.jar">mockserver-netty-3.10.3-jar-with-dependencies.jar</a> from Maven Central</p></li>
+ <li><p>download <a href="http://search.maven.org/remotecontent?filepath=org/mock-server/mockserver-netty/3.10.4/mockserver-netty-3.10.4-jar-with-dependencies.jar">mockserver-netty-3.10.4-jar-with-dependencies.jar</a> from Maven Central</p></li>
<li>
- <code class="code inline">java -jar &lt;path to mockserver-netty-3.10.3-jar-with-dependencies.jar&gt; -serverPort &lt;port&gt;</code>
+ <code class="code inline">java -jar &lt;path to mockserver-netty-3.10.4-jar-with-dependencies.jar&gt; -serverPort &lt;port&gt;</code>
</li>
</ol>
Oops, something went wrong.

0 comments on commit daf5be4

Please sign in to comment.