From d30cc432e10fb0af8f0f60708af94f7468a69ce6 Mon Sep 17 00:00:00 2001
From: Daniel Flower <git@danielflower.com>
Date: Sat, 30 May 2015 23:06:52 +0800
Subject: [PATCH] Bumped minor version and updated changelog.

---
 CONTRIBUTING.md                            | 15 +++++++++++++++
 pom.xml                                    |  2 +-
 src/site/markdown/changelog.md             |  5 +++++
 src/test/java/scaffolding/TestProject.java |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ebd6f71..5b53f758 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,20 @@
+Contributing
+------------
+
+Pull requests are gratefully welcomed. It would be appreciated if the following guidelines are followed:
+
+* Make sure tests cover your change, preferrably with unit tests. There are quite a few slower tests that run the plugin 
+against sample projects in the `test-projects` folder. You amend existing tests or add a new one if necessary.
+* Follow semantic versioning and increment the minor or major version number in `pom.xml` and
+`scaffolding.TestProject.PLUGIN_VERSION_FOR_TESTS`
+* Update the the changelog: `src/site/markdown/changelog.md`
+* Use [.editorconfig](http://editorconfig.org/) to keep formatting consistent
 
 Deploying to Nexus
 ------------------
 
+**This section applies only to project owners**
+
 The JARs must be signed and you must have access to upload to Sonatype, so you need a GPG key and a Sonatype login.
 The passwords for this should be in your Maven `settings.xml` with the following config:
 
@@ -31,6 +44,8 @@ Given everything is set up correctly, the following deploys a snapshot version:
 Performing a release
 --------------------
 
+**This section applies only to project owners**
+
 The plugin uses itself to release itself.
 
     mvn releaser:release
diff --git a/pom.xml b/pom.xml
index 422776d9..4f8b5d3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.danielflower.mavenplugins</groupId>
     <artifactId>multi-module-maven-release-plugin</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version> <!-- When changing also update scaffolding.TestProject.PLUGIN_VERSION_FOR_TESTS and add to src/site/markdown/changelog.md -->
 
     <name>The Multi Module Maven Release Plugin</name>
     <description>A maven release plugin built for multi-maven-module git repositories allowing continuous deployment
diff --git a/src/site/markdown/changelog.md b/src/site/markdown/changelog.md
index b0cc7883..a119af84 100644
--- a/src/site/markdown/changelog.md
+++ b/src/site/markdown/changelog.md
@@ -1,6 +1,11 @@
 Changelog
 ---------
 
+## 1.2.0
+
+* If a parent module changes, then all child modules are updated. This covers cases where upgrading a dependency in a parent
+should force all children to be updated.
+
 ## 1.1.0
 
 * Bug fix: tags are now pushed before building so that in the event of failure, the next build will use an incremented build number. 
diff --git a/src/test/java/scaffolding/TestProject.java b/src/test/java/scaffolding/TestProject.java
index f76c4cb7..db716ea2 100644
--- a/src/test/java/scaffolding/TestProject.java
+++ b/src/test/java/scaffolding/TestProject.java
@@ -19,7 +19,7 @@
 
 public class TestProject {
 
-    public static final String PLUGIN_VERSION_FOR_TESTS = "1.1-SNAPSHOT";
+    public static final String PLUGIN_VERSION_FOR_TESTS = "1.2-SNAPSHOT";
     public final File originDir;
     public final Git origin;