Fixed commit message of realease preparation build (it showed the "ol…

…d" version number) and androidManifests.

nusic-apk/AndroidManifest.xml

@@ -21,7 +21,7 @@
     You should have received a copy of the GNU General Public License
     along with nusic-apk.  If not, see <http://www.gnu.org/licenses/>.
 
---><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="14" android:versionName="2.0.0" package="info.schnatterer.nusic">
+--><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="14" android:versionName="@string/versionName" package="info.schnatterer.nusic">
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
 

nusic-ui-android/AndroidManifest.xml

@@ -21,7 +21,7 @@
     You should have received a copy of the GNU General Public License
     along with nusic-ui-android.  If not, see <http://www.gnu.org/licenses/>.
 
---><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="14" android:versionName="2.0.0" package="info.schnatterer.nusic.ui">
+--><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="14" android:versionName="@string/versionName" package="info.schnatterer.nusic.ui">
   <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
   <application/>
 </manifest>

pom.xml

@@ -229,14 +229,12 @@
 					<tagNameFormat>v.@{project.version}</tagNameFormat>
 					<!-- Same version to all submodules -->
 					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<!-- Update version name in android manifest and commit all changes, 
-						i.e. not only the changes to POMs made by release plugin -->
-					<preparationGoals>com.jayway.maven.plugins.android.generation2:android-maven-plugin:3.8.2:manifest-update
-						scm:checkin -Dmessage="[maven-release-plugin] prepare release
-						${project.version}" -DworkingDirectory=.</preparationGoals>
+					<!-- Update version name in android manifest. A explicit commit is not necessary, because the android manifests should not change! -->
+					<preparationGoals>com.jayway.maven.plugins.android.generation2:android-maven-plugin:3.8.2:manifest-update -DworkingDirectory=.
+						-Dandroid.manifest.versionName="@string/versionName"</preparationGoals>
 					<!-- Increase version code and update version name in android manifest 
 						and commit all changes, i.e. not only the changes to POMs made by release 
-						plugin -->
+						plugin but also the androidManifest.xml -->
 					<completionGoals>com.jayway.maven.plugins.android.generation2:android-maven-plugin:3.8.2:manifest-update
 						scm:checkin -Dmessage="[maven-release-plugin] prepare for next
 						development iteration" -DworkingDirectory=.