Skip to content

Commit

Permalink
Bumped minor version and updated changelog.
Browse files Browse the repository at this point in the history
  • Loading branch information
danielflower committed May 30, 2015
1 parent 8a185c1 commit d30cc43
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 2 deletions.
15 changes: 15 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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:

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions src/site/markdown/changelog.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/scaffolding/TestProject.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit d30cc43

Please sign in to comment.