Updated release script

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.zalando</groupId>
     <artifactId>faux-pas</artifactId>
-    <version>${revision}</version>
+    <version>0.8.0-SNAPSHOT</version>
 
     <name>Faux Pas</name>
     <description>Error handling in Functional Programming</description>
@@ -48,7 +48,6 @@
     </scm>
 
     <properties>
-        <revision>0-SNAPSHOT</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -144,7 +143,7 @@
                         <configuration>
                             <rules>
                                 <requireMavenVersion>
-                                    <version>3.0.4</version>
+                                    <version>3.5.0</version>
                                 </requireMavenVersion>
                             </rules>
                         </configuration>
@@ -167,9 +166,9 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>com.ning.maven.plugins</groupId>
-                <artifactId>maven-duplicate-finder-plugin</artifactId>
-                <version>1.0.9</version>
+                <groupId>org.basepom.maven</groupId>
+                <artifactId>duplicate-finder-maven-plugin</artifactId>
+                <version>1.3.0</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -179,9 +178,9 @@
                         <configuration>
                             <failBuildInCaseOfDifferentContentConflict>true</failBuildInCaseOfDifferentContentConflict>
                             <failBuildInCaseOfEqualContentConflict>false</failBuildInCaseOfEqualContentConflict>
-                            <ignoredResources>
-                                <ignoredResource>.*</ignoredResource>
-                            </ignoredResources>
+                            <ignoredResourcePatterns>
+                                <ignoredResourcePattern>.*</ignoredResourcePattern>
+                            </ignoredResourcePatterns>
                         </configuration>
                     </execution>
                 </executions>

release.sh

@@ -1,8 +1,19 @@
 #!/bin/sh -ex
 
-: ${1?"Usage: $0 <major|minor|patch>"}
+: ${1?"Usage: $0 <[pre]major|[pre]minor|[pre]patch|prerelease>"}
 
-latest=$(git describe --abbrev=0 || echo 0.0.0)
-release=$(semver ${latest} -i $1 --preid RC)
+./mvnw scm:check-local-modification
 
-./mvnw scm:check-local-modification clean deploy scm:tag -P release -D revision=${release} -D tag=${release}
+current=$(git describe --abbrev=0 || echo 0.0.0)
+release=$(semver ${current} -i $1 --preid RC)
+next=$(semver ${release} -i minor)
+
+./mvnw versions:set -D newVersion=${release}
+git commit -am "Release ${release}"
+./mvnw clean deploy scm:tag -P release -D tag=${release} -D pushChanges=false
+
+./mvnw versions:set -D newVersion=${next}-SNAPSHOT
+git commit -am "Development ${next}-SNAPSHOT"
+
+git push
+git push --tags