Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

@@ -112,28 +112,6 @@
                 <artifactId>maven-scr-plugin</artifactId>
                 <artifactId>maven-scr-plugin</artifactId>
             </plugin>
             </plugin>
 
 
-            <plugin>
-                <!-- Using groovy script to set maven property ${hostname}.
-                     This is a workaround to get hostname as a property inside pom file,
-                     which current Maven does not provide. -->
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
-                <version>2.0</version>
-                <executions>
-                    <execution>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                                project.properties["hostname"] =
-                                InetAddress.getLocalHost().getHostName()
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>