Merge branch 'release/0.0.18'

skuzzle · Oct 15, 2021 · 22358d2 · 22358d2
2 parents 06be46b + 2a864f1
commit 22358d2
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 65 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <!-- This file is auto generated during release from readme/README.md -->
 
-[![Maven Central](https://img.shields.io/static/v1?label=MavenCentral&message=0.0.17&color=blue)](https://search.maven.org/artifact/de.skuzzle.springboot.test/spring-boot-wiremock-parent/0.0.17/jar)
-[![JavaDoc](https://img.shields.io/static/v1?label=JavaDoc&message=0.0.17&color=orange)](http://www.javadoc.io/doc/de.skuzzle.springboot.test/spring-boot-wiremock-parent/0.0.17)
+[![Maven Central](https://img.shields.io/static/v1?label=MavenCentral&message=0.0.18&color=blue)](https://search.maven.org/artifact/de.skuzzle.springboot.test/spring-boot-wiremock/0.0.18/jar)
+[![JavaDoc](https://img.shields.io/static/v1?label=JavaDoc&message=0.0.18&color=orange)](http://www.javadoc.io/doc/de.skuzzle.springboot.test/spring-boot-wiremock/0.0.18)
 [![Coverage Status](https://coveralls.io/repos/github/skuzzle/spring-boot-wiremock/badge.svg?branch=main)](https://coveralls.io/github/skuzzle/spring-boot-wiremock?branch=main)
 [![Twitter Follow](https://img.shields.io/twitter/follow/skuzzleOSS.svg?style=social)](https://twitter.com/skuzzleOSS)
 
@@ -19,14 +19,14 @@ _The easiest way to setup a [WireMock](http://wiremock.org/)  server in your Spr
 ```xml
 <dependency>
     <groupId>de.skuzzle.springboot.test</groupId>
-    <artifactId>spring-boot-wiremock-parent</artifactId>
-    <version>0.0.17</version>
+    <artifactId>spring-boot-wiremock</artifactId>
+    <version>0.0.18</version>
     <scope>test</scope>
 </dependency>
 ```
 
 ```
-testImplementation 'de.skuzzle.springboot.test:spring-boot-wiremock-parent:0.0.17'
+testImplementation 'de.skuzzle.springboot.test:spring-boot-wiremock:0.0.18'
 ```
 
 ## Quick start

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,30 +1,23 @@
-[![Maven Central](https://img.shields.io/static/v1?label=MavenCentral&message=0.0.17&color=blue)](https://search.maven.org/artifact/de.skuzzle.springboot.test/spring-boot-wiremock-parent/0.0.17/jar) [![JavaDoc](https://img.shields.io/static/v1?label=JavaDoc&message=0.0.17&color=orange)](http://www.javadoc.io/doc/de.skuzzle.springboot.test/spring-boot-wiremock-parent/0.0.17)
-
-### Features:
-* Add `@Response.withJsonBody` which allows to specify a json response body and automatically sets the `Content-Type` to `application/json` 
+[![Maven Central](https://img.shields.io/static/v1?label=MavenCentral&message=0.0.18&color=blue)](https://search.maven.org/artifact/de.skuzzle.springboot.test/spring-boot-wiremock/0.0.18/jar) [![JavaDoc](https://img.shields.io/static/v1?label=JavaDoc&message=0.0.18&color=orange)](http://www.javadoc.io/doc/de.skuzzle.springboot.test/spring-boot-wiremock/0.0.18)
 
 ### Bug Fixes:
-* [#10](https://github.com/skuzzle/spring-boot-wiremock/issues/10) Remove `DirtiesContext` annotation
-* [#11](https://github.com/skuzzle/spring-boot-wiremock/issues/11) Replaced `TestExecutionListener` with `ContextCustomizer`
+* Fixed release process
+TEst
 
-### Changes:
-* [#6](https://github.com/skuzzle/spring-boot-wiremock/issues/6) Remove deprecated attribute `HttpStub.wrapAround` (Deprecated since `0.0.12`). Use `HttpStub.onLastResponse` instead.
-* [#6](https://github.com/skuzzle/spring-boot-wiremock/issues/6) Remove deprecated attribute `WithWiremock.httpPort` (Deprecated since `0.0.15`). Use `WithWiremock.fixedHttpPort` or `WithWiremock.randomHttpPort` instead.
-* [#6](https://github.com/skuzzle/spring-boot-wiremock/issues/6) Remove deprecated attribute `WithWiremock.httpsPort` (Deprecated since `0.0.15`). Use `WithWiremock.fixedHttpsPort` or `WithWiremock.randomHttpsPort` instead.
 
 ### Maven Central coordinates for this release
 
 ```xml
 <dependency>
     <groupId>de.skuzzle.springboot.test</groupId>
-    <artifactId>spring-boot-wiremock-parent</artifactId>
-    <version>0.0.17</version>
+    <artifactId>spring-boot-wiremock</artifactId>
+    <version>0.0.18</version>
     <scope>test</scope>
 </dependency>
 ```
 
 ### Gradle coordinates for this release
 
 ```
-testImplementation 'de.skuzzle.springboot.test:spring-boot-wiremock-parent:0.0.17'
+testImplementation 'de.skuzzle.springboot.test:spring-boot-wiremock:0.0.18'
 ```
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -4,14 +4,10 @@
     <parent>
         <groupId>de.skuzzle.springboot.test</groupId>
         <artifactId>spring-boot-wiremock-parent</artifactId>
-        <version>0.0.17</version>
+        <version>0.0.18</version>
     </parent>
 
     <artifactId>spring-boot-wiremock-examples</artifactId>
-
-    <properties>
-        <skipDeploy>true</skipDeploy>
-    </properties>
 
     <dependencies>
         <dependency>
@@ -59,7 +55,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -76,4 +71,17 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <usedDependencies>
+                        <usedDependency>org.springframework.boot:spring-boot-starter</usedDependency>
+                    </usedDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>de.skuzzle.springboot.test</groupId>
     <artifactId>spring-boot-wiremock-parent</artifactId>
-    <version>0.0.17</version>
+    <version>0.0.18</version>
     <url>https://github.com/skuzzle/spring-boot-wiremock</url>
     <packaging>pom</packaging>
 
@@ -76,39 +76,10 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <phase>validate</phase>
-                        <configuration>
-                            <outputDirectory>${basedir}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>readme/</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <configuration>
-                    <usedDependencies>
-                        <usedDependency>org.springframework.boot:spring-boot-starter</usedDependency>
-                    </usedDependencies>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>com.amashchenko.maven.plugin</groupId>
                 <artifactId>gitflow-maven-plugin</artifactId>
+                <inherited>false</inherited>
                 <configuration>
                     <postReleaseGoals>deploy</postReleaseGoals>
                     <detail>true</detail>
@@ -124,6 +95,7 @@
                 <groupId>com.ragedunicorn.tools.maven</groupId>
                 <artifactId>github-release-maven-plugin</artifactId>
                 <version>1.0.2</version>
+                <inherited>false</inherited>
                 <configuration>
                     <owner>skuzzle</owner>
                     <repository>${github.name}</repository>

diff --git a/readme/RELEASE_NOTES.md b/readme/RELEASE_NOTES.md
@@ -1,16 +1,9 @@
 [![Maven Central](https://img.shields.io/static/v1?label=MavenCentral&message=${project.version}&color=blue)](https://search.maven.org/artifact/${project.groupId}/${project.artifactId}/${project.version}/jar) [![JavaDoc](https://img.shields.io/static/v1?label=JavaDoc&message=${project.version}&color=orange)](http://www.javadoc.io/doc/${project.groupId}/${project.artifactId}/${project.version})
 
-### Features:
-* Add `@Response.withJsonBody` which allows to specify a json response body and automatically sets the `Content-Type` to `application/json` 
-
 ### Bug Fixes:
-* [#10](https://github.com/skuzzle/spring-boot-wiremock/issues/10) Remove `DirtiesContext` annotation
-* [#11](https://github.com/skuzzle/spring-boot-wiremock/issues/11) Replaced `TestExecutionListener` with `ContextCustomizer`
+* Fixed release process
+TEst
 
-### Changes:
-* [#6](https://github.com/skuzzle/spring-boot-wiremock/issues/6) Remove deprecated attribute `HttpStub.wrapAround` (Deprecated since `0.0.12`). Use `HttpStub.onLastResponse` instead.
-* [#6](https://github.com/skuzzle/spring-boot-wiremock/issues/6) Remove deprecated attribute `WithWiremock.httpPort` (Deprecated since `0.0.15`). Use `WithWiremock.fixedHttpPort` or `WithWiremock.randomHttpPort` instead.
-* [#6](https://github.com/skuzzle/spring-boot-wiremock/issues/6) Remove deprecated attribute `WithWiremock.httpsPort` (Deprecated since `0.0.15`). Use `WithWiremock.fixedHttpsPort` or `WithWiremock.randomHttpsPort` instead.
 
 ### Maven Central coordinates for this release
 

diff --git a/spring-boot-wiremock/pom.xml b/spring-boot-wiremock/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.skuzzle.springboot.test</groupId>
         <artifactId>spring-boot-wiremock-parent</artifactId>
-        <version>0.0.17</version>
+        <version>0.0.18</version>
     </parent>
 
     <artifactId>spring-boot-wiremock</artifactId>
@@ -114,6 +114,28 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/..</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/../readme/</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -125,6 +147,14 @@
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <usedDependencies>
+                        <usedDependency>org.springframework.boot:spring-boot-starter</usedDependency>
+                    </usedDependencies>
+                </configuration>
+            </plugin>
         </plugins>
     </build>