Merge changes Id14ebb05,I2a431693

* changes:
  Add copyright header and fix whitespace
  Fix lifecycle mapping errors in eclipse

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 0e444405b5ff1e69e702145db0c1f6d3e40c8ee5..a7e7e4ef713b4ce7902dd3830d12a86dc1bfa64b 100644 (file)
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -1,82 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
 <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">
-  <parent>
+    <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
         <relativePath>../common/parent</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.opendaylight.yangtools</groupId>
-  <artifactId>benchmarks</artifactId>
+    <groupId>org.opendaylight.yangtools</groupId>
+    <artifactId>benchmarks</artifactId>
 
-  <properties>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    <yang.maven.plugin.version>0.7.0-SNAPSHOT</yang.maven.plugin.version>
-    <java.source.version>1.7</java.source.version>
-    <java.target.version>1.7</java.target.version>
-    <jmh.version>0.9.7</jmh.version>
-  </properties>
+    <properties>
+        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+        <yang.maven.plugin.version>0.7.0-SNAPSHOT</yang.maven.plugin.version>
+        <java.source.version>1.7</java.source.version>
+        <java.target.version>1.7</java.target.version>
+        <jmh.version>0.9.7</jmh.version>
+    </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>yang-data-impl</artifactId>
-      <version>${yangtools.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>yang-parser-impl</artifactId>
-      <version>${yangtools.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.openjdk.jmh</groupId>
-      <artifactId>jmh-core</artifactId>
-      <version>${jmh.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.openjdk.jmh</groupId>
-      <artifactId>jmh-generator-annprocess</artifactId>
-      <version>${jmh.version}</version>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>yang-data-impl</artifactId>
+            <version>${yangtools.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>yang-parser-impl</artifactId>
+            <version>${yangtools.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh.version}</version>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>${java.source.version}</source>
-          <target>${java.source.version}</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <configuration>
-          <classpathScope>test</classpathScope>
-          <executable>java</executable>
-          <arguments>
-            <argument>-classpath</argument>
-            <classpath/>
-            <argument>org.openjdk.jmh.Main</argument>
-            <argument>.*</argument>
-          </arguments>
-        </configuration>
-        <executions>
-          <execution>
-            <id>run-benchmarks</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.source.version}</source>
+                    <target>${java.source.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <configuration>
+                    <classpathScope>test</classpathScope>
+                    <executable>java</executable>
+                    <arguments>
+                        <argument>-classpath</argument>
+                        <classpath/>
+                        <argument>org.openjdk.jmh.Main</argument>
+                        <argument>.*</argument>
+                    </arguments>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>run-benchmarks</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index a5b37272aca40df9a2d384f917a80fe7f478a0d2..812b59665b6bc28d03f66b6973ab993aaf55e7f9 100644 (file)
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -290,6 +290,19 @@
                                          <ignore/>
                                      </action>
                                  </pluginExecution>
+                                 <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.maven.plugins</groupId>
+                                        <artifactId>maven-checkstyle-plugin</artifactId>
+                                        <versionRange>[2.12,)</versionRange>
+                                        <goals>
+                                            <goal>check</goal>
+                                        </goals>
+                                     </pluginExecutionFilter>
+                                     <action>
+                                         <execute/>
+                                     </action>
+                                 </pluginExecution>
                             </pluginExecutions>
                         </lifecycleMappingMetadata>
                     </configuration>

diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 1f81d960545412b6c752a705d9b8c66d25cb66de..7837b5210c227ae25d30b0202bc7efbb4ff427e4 100644 (file)
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -8,10 +8,10 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yangtools-parent</artifactId>
-      <version>0.7.0-SNAPSHOT</version>
-      <relativePath>../common/parent</relativePath>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-parent</artifactId>
+        <version>0.7.0-SNAPSHOT</version>
+        <relativePath>../common/parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
index e53e27146f3e6697a52fad57aaa73e2abf3d693b..faa849b89020ac81451ed49dbcd478d922030906 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,6 @@
                 <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-checkstyle-plugin</artifactId>
-                 <version>2.12</version>
                  <configuration>
                    <failOnViolation>false</failOnViolation>
                    <configLocation>checkstyle-logging.xml</configLocation>