adding maven-plugin to onos-change-version

Change-Id: I0e568213f5752174df0610426c38aa88e0d6bbd3

@@ -39,7 +39,6 @@
     <description>Open Network Operating System root project</description>
 
     <modules>
-        <module>tools/package/maven-plugin</module>
         <module>utils</module>
         <module>core</module>
         <module>web</module>

@@ -34,3 +34,6 @@ for atype in api bundle cli; do
     sed -i "" -E "1,/<onos.version>/s/<onos.version>[^<]*</<onos.version>$NEW_VERSION</g" $pom
 done
 
+pushd tools/package/maven-plugin
+mvn versions:set -DnewVersion=$NEW_VERSION versions:commit
+popd

@@ -20,6 +20,11 @@ cd $ONOS_ROOT
 onos-change-version $NEW_VERSION
 export ONOS_VERSION=$NEW_VERSION
 
+# Build the maven-plugin
+pushd tools/package/maven-plugin
+mvn clean install && mvn -Prelease clean deploy
+popd
+
 # Build ONOS & deploy to staging repo using the release profile.
 onos-build && onos-package && mvn -Prelease clean deploy -DskipTests
 
@@ -28,8 +33,9 @@ onos-build-docs
 
 # Build ONOS archetypes & deploy to staging repo using the release profile.
 # Note that release of the staging repository is a separate manual step.
-cd tools/package/archetypes/
+pushd tools/package/archetypes/
 mvn clean install && onos-archetypes-test && mvn -Prelease clean deploy
+popd
 
 # Commit newly versioned artifacts and issue a tag.
 git commit -a -m"Tagging $NEW_VERSION"