Remove trailing whitespace

[openflowjava.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index da66cf0c5f7a53fa23fa522ec0e7ff60593d0adc..67148ce6b609735784b50fda4ee55f12e63bda7a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflow-protocol-parent</artifactId>
     <version>0.6.0-SNAPSHOT</version>
@@ -14,7 +21,7 @@
         <module>openflow-protocol-it</module>
         <module>features</module>
         <module>simple-client</module>
-  </modules>
+    </modules>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</developerConnection>
@@ -45,7 +52,7 @@
         <ietf.model.version>2010.09.24.7-SNAPSHOT</ietf.model.version>
         <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
         <maven.bundle.version>2.4.0</maven.bundle.version>
-        <guava.version>14.0.1</guava.version> 
+        <guava.version>14.0.1</guava.version>
         <netty.version>4.0.23.Final</netty.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
         <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
@@ -212,7 +219,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.10</version>
+                <version>${junit.version}</version>
                 <scope>test</scope>
                 <optional>true</optional>
             </dependency>
@@ -245,7 +252,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler.version}</version>
                 <inherited>true</inherited>
                 <configuration>
                     <source>1.7</source>
@@ -260,7 +266,7 @@
                         <phase>deploy</phase>
                         <goals>
                             <goal>jar-no-fork</goal>
-                        </goals> 
+                        </goals>
                     </execution>
                 </executions>
             </plugin>
@@ -277,7 +283,7 @@
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-checkstyle-plugin</artifactId>
+             <artifactId>maven-checkstyle-plugin</artifactId>
               <version>2.12</version>
               <configuration>
                 <failOnViolation>false</failOnViolation>
@@ -629,4 +635,4 @@
             </build>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>