Merge remote-tracking branch 'origin/master'

jmock-developers · Apr 5, 2019 · 89b0980 · 89b0980
2 parents 8e98d57 + 50c9893
commit 89b0980
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -4,25 +4,18 @@
 
 # Maven
 ```xml
-  <dependency>
-    <groupId>org.jmock</groupId>
-    <artifactId>jmock-imposters</artifactId>
-    <version>2.10.0-RC3</version>
-    <scope>test</scope>
-  </dependency>
   <dependency>
     <groupId>org.jmock</groupId>
     <artifactId>jmock-junit5</artifactId>
-    <version>2.10.0-RC3</version>
+    <version>2.11.0</version>
     <scope>test</scope>
   </dependency>
 ```
 # Gradle
 ```
 testCompile(
-    "junit:junit5:2.10.0",
-    "org.jmock:jmock-imposters:2.10.0-RC3"
-    "org.jmock:jmock-junit5:2.10.0-RC3"
+    "junit:junit5:5.3.1",
+    "org.jmock:jmock-junit5:2.11.0"
 )
 ```
 # Recent Changes

diff --git a/jmock-example/pom.xml b/jmock-example/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.10.0-RC3</version>
+        <version>2.11.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -47,12 +47,12 @@
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-junit3</artifactId>
-            <version>2.10.0-RC3</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-junit4</artifactId>
-            <version>2.10.0-RC3</version>
+            <version>2.11.0</version>
         </dependency>
     </dependencies>
 

diff --git a/jmock-imposters-tests/pom.xml b/jmock-imposters-tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.10.0-RC3</version>
+        <version>2.11.0</version>
     </parent>
     <artifactId>jmock-imposters-tests</artifactId>
 
@@ -15,23 +15,23 @@
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock</artifactId>
-            <version>2.10.0-RC3</version>
+            <version>2.11.0</version>
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-junit4</artifactId>
-            <version>2.10.0-RC3</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-junit5</artifactId>
-            <version>2.10.0-RC3</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-testjar</artifactId>
-            <version>2.10.0-RC3</version>
+            <version>2.11.0</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/jmock-imposters/pom.xml b/jmock-imposters/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.10.0-RC3</version>
+        <version>2.11.0</version>
     </parent>
     <artifactId>jmock-imposters</artifactId>
     <description>Class mocks are more numerous than interface mocks, so drop the legacy name</description>

diff --git a/jmock-junit3/pom.xml b/jmock-junit3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.10.0-RC3</version>
+        <version>2.11.0</version>
     </parent>
 
     <artifactId>jmock-junit3</artifactId>

diff --git a/jmock-junit4/pom.xml b/jmock-junit4/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.10.0-RC3</version>
+        <version>2.11.0</version>
     </parent>
 
     <properties>

diff --git a/jmock-junit5/pom.xml b/jmock-junit5/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.10.0-RC3</version>
+        <version>2.11.0</version>
     </parent>
 
     <properties>

diff --git a/...junit5/src/test/java/org/jmock/junit5/testdata/JUnit5TestThatDoesSatisfyExpectations.java b/...junit5/src/test/java/org/jmock/junit5/testdata/JUnit5TestThatDoesSatisfyExpectations.java
@@ -10,10 +10,10 @@ public class JUnit5TestThatDoesSatisfyExpectations {
 
     @RegisterExtension
     JUnit5Mockery context = new JUnit5Mockery();
-    
+
     @Mock
     private Runnable runnable;
-    
+
     @Test
     public void doesSatisfyExpectations() {
         context.checking(new Expectations() {{

diff --git a/jmock-legacy/pom.xml b/jmock-legacy/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.10.0-RC3</version>
+        <version>2.11.0</version>
     </parent>
 
     <properties>

diff --git a/jmock/pom.xml b/jmock/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.10.0-RC3</version>
+        <version>2.11.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>org.jmock</groupId>
     <artifactId>jmock-parent</artifactId>
-    <version>2.10.0-RC3</version>
+    <version>2.11.0</version>
     <packaging>pom</packaging>
     <name>jMock 2 Parent</name>
 

diff --git a/testjar/pom.xml b/testjar/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-parent</artifactId>
-        <version>2.10.0-RC3</version>
+        <version>2.11.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>