Merge "Rename initial config files from *.xml.conf to *.xml"

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 5acdec834da3f56d66c9954e5bd4c47deb83fedf..a8dd607f44240d17203e782a57d8a9179e53d5f0 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -1462,6 +1462,16 @@
           </execution>
         </executions>
       </plugin>
+
+        <!--Make checkstyle ignore initial xml configuration files by overriding its configuration from parent-->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>${checkstyle.version}</version>
+        <configuration>
+            <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/</excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.xml.conf b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.xml
similarity index 100%
rename from opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.xml.conf
rename to opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.xml

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml.conf b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml
similarity index 100%
rename from opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml.conf
rename to opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml