diff --git a/compiler/base/parser/pom.xml b/compiler/base/parser/pom.xml
index c6359ff..95451d9 100644
--- a/compiler/base/parser/pom.xml
+++ b/compiler/base/parser/pom.xml
@@ -108,6 +108,18 @@
                     <verbose>false</verbose>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <sourceDirectories>
+                        <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                    </sourceDirectories>
+                     <excludes>**/generated-sources/**/*</excludes>
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
 </project>
diff --git a/compiler/plugin/buck/pom.xml b/compiler/plugin/buck/pom.xml
index 25383c4..833fee4 100644
--- a/compiler/plugin/buck/pom.xml
+++ b/compiler/plugin/buck/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-yang-compiler-plugin-utils</artifactId>
-            <version>2.5-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/compiler/plugin/maven/pom.xml b/compiler/plugin/maven/pom.xml
index fb7d62e..a7bbdd8 100644
--- a/compiler/plugin/maven/pom.xml
+++ b/compiler/plugin/maven/pom.xml
@@ -95,7 +95,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/compiler/plugin/utils/pom.xml b/compiler/plugin/utils/pom.xml
index 3d694c2..7f825db 100644
--- a/compiler/plugin/utils/pom.xml
+++ b/compiler/plugin/utils/pom.xml
@@ -17,14 +17,6 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-        </dependency>
-    </dependencies>
-
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-yang-compiler-plugin</artifactId>
@@ -33,4 +25,12 @@
 
     <artifactId>onos-yang-compiler-plugin-utils</artifactId>
     <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+    </dependencies>
+
 </project>
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 15b9e86..db22c85 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -47,7 +47,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.21</version>
         </dependency>
     </dependencies>
 
diff --git a/model/pom.xml b/model/pom.xml
index b18c264..b2317f3 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -37,12 +37,10 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.21</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index cbd1f97..a8f1571 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,11 @@
     <version>2.5-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <prerequisites>
+        <maven>3.0.5</maven>
+    </prerequisites>
+
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <onos-build-conf.version>1.12.0</onos-build-conf.version>
@@ -83,10 +88,40 @@
             <artifactId>org.eclipse.jdt.core</artifactId>
             <version>3.10.0</version>
         </dependency-->
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>1.7.21</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
         <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>3.0.5</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -158,6 +193,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
+                <!-- 3.0.0 has issue excluding generated code -->
                 <version>2.17</version>
                 <dependencies>
                     <dependency>
@@ -167,12 +203,12 @@
                     </dependency>
                 </dependencies>
                 <configuration>
-                    <!-- begin: workaround for unexpected NullPointerException on Eclipse -->
-                    <sourceDirectory>${project.build.sourceDirectory}
-                    </sourceDirectory>
-                    <testSourceDirectory>${project.build.testSourceDirectory}
-                    </testSourceDirectory>
-                    <!-- end: workaround for unexpected NullPointerException on Eclipse -->
+                    <sourceDirectories>
+                        <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                    </sourceDirectories>
+                    <testSourceDirectories>
+                        <testSourceDirectory>${project.build.testSourceDirectory}</testSourceDirectory>
+                    </testSourceDirectories>
                     <configLocation>onos/checkstyle-mvn.xml</configLocation>
                     <suppressionsLocation>onos/suppressions.xml
                     </suppressionsLocation>
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 5e77fdf..116b64b 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -41,12 +41,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-yang-model</artifactId>
-            <version>2.5-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-yang-compiler-tool</artifactId>
-            <version>2.5-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/serializers/json/pom.xml b/serializers/json/pom.xml
index 19c9326..162acae 100644
--- a/serializers/json/pom.xml
+++ b/serializers/json/pom.xml
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.21</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -53,7 +52,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-yang-serializers-utils</artifactId>
-            <version>2.5-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/serializers/pom.xml b/serializers/pom.xml
index 8afe305..7b18c01 100644
--- a/serializers/pom.xml
+++ b/serializers/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-yang-runtime</artifactId>
-            <version>2.5-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/serializers/xml/pom.xml b/serializers/xml/pom.xml
index a433a29..ed399a9 100644
--- a/serializers/xml/pom.xml
+++ b/serializers/xml/pom.xml
@@ -32,12 +32,11 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.21</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-yang-serializers-utils</artifactId>
-            <version>2.5-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/tools/onos-yang-tools-build-release b/tools/onos-yang-tools-build-release
index 8df7d68..1feb92a 100755
--- a/tools/onos-yang-tools-build-release
+++ b/tools/onos-yang-tools-build-release
@@ -26,7 +26,7 @@
 trap cleanup EXIT
 
 mvn versions:set -DnewVersion=$OYT_VERSION versions:commit
-mvn -Prelease clean deploy
+mvn -Prelease clean deploy -DdeployAtEnd=true
 git commit -am"Releasing $OYT_VERSION"
 git tag -sm"Tagging $OYT_VERSION" $OYT_VERSION