Removed carriage returns

Change-Id: Ic1e8d09c1e83ede82553aae45605eeb8893025c6
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/consumer/pom.xml b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/consumer/pom.xml
index 0c49fe017b6c3bf4e72664ffdfb54f8dc679d04d..6aef10fb9dbb0c7119647eed618d4a62db8a31ec 100644 (file)
--- a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/consumer/pom.xml
+++ b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/consumer/pom.xml
@@ -1,109 +1,109 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<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">\r
-    <modelVersion>4.0.0</modelVersion>\r
-    <parent>\r
-        <artifactId>${rootArtifactId}</artifactId>\r
-        <groupId>${groupId}</groupId>\r
-        <version>${version}</version>\r
-    </parent>\r
-    <artifactId>${rootArtifactId}-consumer</artifactId>\r
-    <packaging>bundle</packaging>\r
-    <scm>\r
-      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
-      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
-      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>\r
-      <tag>HEAD</tag>\r
-  </scm>\r
-\r
-    <build>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.felix</groupId>\r
-                <artifactId>maven-bundle-plugin</artifactId>\r
-                <version>${bundle.plugin.version}</version>\r
-                <extensions>true</extensions>\r
-                <configuration>\r
-                    <instructions>\r
-                        <Export-Package>org.opendaylight.controller.config.yang.config.${appName}_consumer.impl</Export-Package>\r
-                        <Import-Package>*</Import-Package>\r
-                    </instructions>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.opendaylight.yangtools</groupId>\r
-                <artifactId>yang-maven-plugin</artifactId>\r
-                <version>${yangtools.version}</version>\r
-                <executions>\r
-                    <execution>\r
-                        <id>config</id>\r
-                        <goals>\r
-                            <goal>generate-sources</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <codeGenerators>\r
-                                <generator>\r
-                                    <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>\r
-                                    <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>\r
-                                    <additionalConfiguration>\r
-                                        <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>\r
-                                    </additionalConfiguration>\r
-                                </generator>\r
-                                <generator>\r
-                                    <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>\r
-                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>\r
-                                </generator>\r
-                            </codeGenerators>\r
-                            <inspectDependencies>true</inspectDependencies>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-                <dependencies>\r
-                    <dependency>\r
-                        <groupId>org.opendaylight.yangtools</groupId>\r
-                        <artifactId>maven-sal-api-gen-plugin</artifactId>\r
-                        <version>${yangtools.version}</version>\r
-                        <type>jar</type>\r
-                    </dependency>\r
-                    <dependency>\r
-                        <groupId>org.opendaylight.controller</groupId>\r
-                        <artifactId>yang-jmx-generator-plugin</artifactId>\r
-                        <version>0.2.5-SNAPSHOT</version>\r
-                    </dependency>\r
-                </dependencies>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
-\r
-    <dependencies>\r
-        <dependency>\r
-            <groupId>${groupId}</groupId>\r
-            <artifactId>${rootArtifactId}-model</artifactId>\r
-            <version>${version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
-            <artifactId>config-api</artifactId>\r
-            <version>${config.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
-            <artifactId>sal-binding-config</artifactId>\r
-            <version>${mdsal.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
-            <artifactId>sal-binding-api</artifactId>\r
-            <version>${mdsal.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
-            <artifactId>sal-common-util</artifactId>\r
-            <version>${mdsal.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-      <groupId>equinoxSDK381</groupId>\r
-      <artifactId>org.eclipse.osgi</artifactId>\r
-      <version>${equinox.osgi.version}</version>\r
-    </dependency>\r
-    </dependencies>\r
-</project>\r
+<?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>
+        <artifactId>${rootArtifactId}</artifactId>
+        <groupId>${groupId}</groupId>
+        <version>${version}</version>
+    </parent>
+    <artifactId>${rootArtifactId}-consumer</artifactId>
+    <packaging>bundle</packaging>
+    <scm>
+      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+      <tag>HEAD</tag>
+  </scm>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>${bundle.plugin.version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.opendaylight.controller.config.yang.config.${appName}_consumer.impl</Export-Package>
+                        <Import-Package>*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+                <version>${yangtools.version}</version>
+                <executions>
+                    <execution>
+                        <id>config</id>
+                        <goals>
+                            <goal>generate-sources</goal>
+                        </goals>
+                        <configuration>
+                            <codeGenerators>
+                                <generator>
+                                    <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
+                                    <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
+                                    <additionalConfiguration>
+                                        <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
+                                    </additionalConfiguration>
+                                </generator>
+                                <generator>
+                                    <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                                </generator>
+                            </codeGenerators>
+                            <inspectDependencies>true</inspectDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.yangtools</groupId>
+                        <artifactId>maven-sal-api-gen-plugin</artifactId>
+                        <version>${yangtools.version}</version>
+                        <type>jar</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.opendaylight.controller</groupId>
+                        <artifactId>yang-jmx-generator-plugin</artifactId>
+                        <version>0.2.5-SNAPSHOT</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-model</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+            <version>${config.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-config</artifactId>
+            <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-api</artifactId>
+            <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-common-util</artifactId>
+            <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+      <version>${equinox.osgi.version}</version>
+    </dependency>
+    </dependencies>
+</project>

diff --git a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/pom.xml b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/pom.xml
index 726e1ac6dbf4525563c7732430de3ad1e796b4a4..5ff9fac720a47f0edaab290871a0bd7feddb0382 100644 (file)
--- a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/pom.xml
+++ b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/generate/pom.xml
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-    <modelVersion>4.0.0</modelVersion>\r
-    <parent>\r
-        <artifactId>${rootArtifactId}</artifactId>\r
-        <groupId>${groupId}</groupId>\r
-        <version>${version}</version>\r
-    </parent>\r
-    <artifactId>${rootArtifactId}-generate</artifactId>\r
-    <packaging>jar</packaging>\r
-    <scm>\r
-        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
-        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>\r
-        <tag>HEAD</tag>\r
-    </scm>\r
-    <profiles>\r
-        <profile>\r
-            <id>generateCode</id>\r
-            <activation>\r
-                <property>\r
-                    <name>gen</name>\r
-                </property>\r
-            </activation>\r
-            <build>\r
-                <plugins>\r
-                    <!-- Move your template files under classes folder, so code generator can use them -->\r
-                    <plugin>\r
-                        <artifactId>maven-resources-plugin</artifactId>\r
-                        <version>2.6</version>\r
-                        <executions>\r
-                            <execution>\r
-                                <id>copy-resources</id>\r
-                                <phase>process-classes</phase>\r
-                                <goals>\r
-                                    <goal>copy-resources</goal>\r
-                                </goals>\r
-                                <configuration>\r
-                                    <outputDirectory>${basedir}/target/classes</outputDirectory>\r
-                                    <resources>\r
-                                        <resource>\r
-                                            <directory>src/main/template</directory>\r
-                                            <filtering>true</filtering>\r
-                                        </resource>\r
-                                    </resources>\r
-                                </configuration>\r
-                            </execution>\r
-                        </executions>\r
-                    </plugin>\r
-                    <!-- run your code generator only once-->\r
-                    <plugin>\r
-                        <groupId>org.codehaus.mojo</groupId>\r
-                        <artifactId>exec-maven-plugin</artifactId>\r
-                        <version>1.2.1</version>\r
-                        <executions>\r
-                            <execution>\r
-                                <phase>process-classes</phase>\r
-                                <goals>\r
-                                    <goal>java</goal>\r
-                                </goals>\r
-                                <configuration>\r
-                                    <mainClass>${package}.generate.CodeGenerator</mainClass>\r
-                                    <arguments>\r
-                                        <argument>${appName}</argument>\r
-                                        <argument>${modelFields}</argument>\r
-                                    </arguments>\r
-                                </configuration>\r
-                            </execution>\r
-                        </executions>\r
-                    </plugin>\r
-                </plugins>\r
-            </build>\r
-        </profile>\r
-    </profiles>\r
-    <dependencies>\r
-        <dependency>\r
-            <groupId>org.apache.velocity</groupId>\r
-            <artifactId>velocity</artifactId>\r
-            <version>1.6.4</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>com.googlecode.json-simple</groupId>\r
-            <artifactId>json-simple</artifactId>\r
-            <version>1.1</version>\r
-        </dependency>\r
-    </dependencies>\r
-</project>\r
+<?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>
+        <artifactId>${rootArtifactId}</artifactId>
+        <groupId>${groupId}</groupId>
+        <version>${version}</version>
+    </parent>
+    <artifactId>${rootArtifactId}-generate</artifactId>
+    <packaging>jar</packaging>
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+        <tag>HEAD</tag>
+    </scm>
+    <profiles>
+        <profile>
+            <id>generateCode</id>
+            <activation>
+                <property>
+                    <name>gen</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Move your template files under classes folder, so code generator can use them -->
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>2.6</version>
+                        <executions>
+                            <execution>
+                                <id>copy-resources</id>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${basedir}/target/classes</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>src/main/template</directory>
+                                            <filtering>true</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- run your code generator only once-->
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.2.1</version>
+                        <executions>
+                            <execution>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>${package}.generate.CodeGenerator</mainClass>
+                                    <arguments>
+                                        <argument>${appName}</argument>
+                                        <argument>${modelFields}</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.6.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1</version>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/model/pom.xml b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/model/pom.xml
index 139abcf4a5e8a49375912e2c2eca2872ea88869a..8e4fe70f72975d05ea3c44c3c75d3afffc85c594 100644 (file)
--- a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/model/pom.xml
+++ b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/model/pom.xml
@@ -1,116 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<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">\r
-    <modelVersion>4.0.0</modelVersion>\r
-    <parent>\r
-        <artifactId>${rootArtifactId}</artifactId>\r
-        <groupId>${groupId}</groupId>\r
-        <version>${version}</version>\r
-    </parent>\r
-    <artifactId>${rootArtifactId}-model</artifactId>\r
-    <packaging>bundle</packaging>\r
-    <scm>\r
-      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
-      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
-      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>\r
-      <tag>HEAD</tag>\r
-  </scm>\r
-\r
-    <build>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.felix</groupId>\r
-                <artifactId>maven-bundle-plugin</artifactId>\r
-                <version>${bundle.plugin.version}</version>\r
-                <extensions>true</extensions>\r
-                <configuration>\r
-                    <instructions>\r
-                        <Bundle-Name>${groupId}.${rootArtifactId}-model</Bundle-Name>\r
-                        <Import-Package>org.opendaylight.yangtools.yang.binding.annotations, *</Import-Package>\r
-                    </instructions>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.opendaylight.yangtools</groupId>\r
-                <artifactId>yang-maven-plugin</artifactId>\r
-                <version>${yangtools.version}</version>\r
-                <executions>\r
-                    <execution>\r
-                        <goals>\r
-                            <goal>generate-sources</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <yangFilesRootDir>src/main/yang</yangFilesRootDir>\r
-                            <codeGenerators>\r
-                                <generator>\r
-                                    <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>\r
-                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>\r
-                                </generator>\r
-                            </codeGenerators>\r
-                            <inspectDependencies>true</inspectDependencies>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-                <dependencies>\r
-                    <dependency>\r
-                        <groupId>org.opendaylight.yangtools</groupId>\r
-                        <artifactId>maven-sal-api-gen-plugin</artifactId>\r
-                        <version>${yangtools.version}</version>\r
-                        <type>jar</type>\r
-                    </dependency>\r
-                </dependencies>\r
-            </plugin>\r
-        </plugins>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <!--This plugin's configuration is used to store Eclipse \r
-                    m2e settings only. It has no influence on the Maven build itself. -->\r
-                <plugin>\r
-                    <groupId>org.eclipse.m2e</groupId>\r
-                    <artifactId>lifecycle-mapping</artifactId>\r
-                    <version>1.0.0</version>\r
-                    <configuration>\r
-                        <lifecycleMappingMetadata>\r
-                            <pluginExecutions>\r
-                                <pluginExecution>\r
-                                    <pluginExecutionFilter>\r
-                                        <groupId>org.opendaylight.yangtools</groupId>\r
-                                        <artifactId>yang-maven-plugin</artifactId>\r
-                                        <versionRange>[0.5,)</versionRange>\r
-                                        <goals>\r
-                                            <goal>generate-sources</goal>\r
-                                        </goals>\r
-                                    </pluginExecutionFilter>\r
-                                    <action>\r
-                                        <ignore />\r
-                                    </action>\r
-                                </pluginExecution>\r
-                            </pluginExecutions>\r
-                        </lifecycleMappingMetadata>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
-    </build>\r
-    <dependencies>\r
-        <dependency>\r
-            <groupId>org.opendaylight.yangtools</groupId>\r
-            <artifactId>yang-binding</artifactId>\r
-            <version>${yangtools.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.yangtools</groupId>\r
-            <artifactId>yang-common</artifactId>\r
-            <version>${yangtools.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-       <groupId>org.opendaylight.yangtools.model</groupId>\r
-       <artifactId>ietf-inet-types</artifactId>\r
-       <version>${ietf-inet-types.version}</version>\r
-      </dependency>\r
-      <dependency>\r
-       <groupId>org.opendaylight.yangtools.model</groupId>\r
-       <artifactId>ietf-yang-types</artifactId>\r
-       <version>${ietf-yang-types.version}</version>\r
-      </dependency>\r
-    </dependencies>\r
-</project>\r
+<?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>
+        <artifactId>${rootArtifactId}</artifactId>
+        <groupId>${groupId}</groupId>
+        <version>${version}</version>
+    </parent>
+    <artifactId>${rootArtifactId}-model</artifactId>
+    <packaging>bundle</packaging>
+    <scm>
+      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+      <tag>HEAD</tag>
+  </scm>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>${bundle.plugin.version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${groupId}.${rootArtifactId}-model</Bundle-Name>
+                        <Import-Package>org.opendaylight.yangtools.yang.binding.annotations, *</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+                <version>${yangtools.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate-sources</goal>
+                        </goals>
+                        <configuration>
+                            <yangFilesRootDir>src/main/yang</yangFilesRootDir>
+                            <codeGenerators>
+                                <generator>
+                                    <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                                </generator>
+                            </codeGenerators>
+                            <inspectDependencies>true</inspectDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.yangtools</groupId>
+                        <artifactId>maven-sal-api-gen-plugin</artifactId>
+                        <version>${yangtools.version}</version>
+                        <type>jar</type>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse 
+                    m2e settings only. It has no influence on the Maven build itself. -->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.opendaylight.yangtools</groupId>
+                                        <artifactId>yang-maven-plugin</artifactId>
+                                        <versionRange>[0.5,)</versionRange>
+                                        <goals>
+                                            <goal>generate-sources</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-binding</artifactId>
+            <version>${yangtools.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+            <version>${yangtools.version}</version>
+        </dependency>
+        <dependency>
+       <groupId>org.opendaylight.yangtools.model</groupId>
+       <artifactId>ietf-inet-types</artifactId>
+       <version>${ietf-inet-types.version}</version>
+      </dependency>
+      <dependency>
+       <groupId>org.opendaylight.yangtools.model</groupId>
+       <artifactId>ietf-yang-types</artifactId>
+       <version>${ietf-yang-types.version}</version>
+      </dependency>
+    </dependencies>
+</project>

diff --git a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/provider/pom.xml b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/provider/pom.xml
index c09d8cef34bf1422cd303a7faaf061116b613a76..0ade94aeec9ed1dbf21f013e894f8aebc10caf97 100644 (file)
--- a/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/provider/pom.xml
+++ b/main/archetypes/archetype-md-sal-app-simple/src/main/resources/archetype-resources/provider/pom.xml
@@ -1,110 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<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">\r
-    <modelVersion>4.0.0</modelVersion>\r
-    <parent>\r
-        <artifactId>${rootArtifactId}</artifactId>\r
-        <groupId>${groupId}</groupId>\r
-        <version>${version}</version>\r
-    </parent>\r
-    <artifactId>${rootArtifactId}-provider</artifactId>\r
-    <packaging>bundle</packaging>\r
-    <scm>\r
-        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
-        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>\r
-      <tag>HEAD</tag>\r
-  </scm>\r
-\r
-\r
-    <build>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.felix</groupId>\r
-                <artifactId>maven-bundle-plugin</artifactId>\r
-                <version>${bundle.plugin.version}</version>\r
-                <extensions>true</extensions>\r
-                <configuration>\r
-                    <instructions>\r
-                        <Export-Package>org.opendaylight.controller.config.yang.config.${appName}_provider.impl</Export-Package>\r
-                        <Import-Package>*</Import-Package>\r
-                    </instructions>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.opendaylight.yangtools</groupId>\r
-                <artifactId>yang-maven-plugin</artifactId>\r
-                <version>${yangtools.version}</version>\r
-                <executions>\r
-                    <execution>\r
-                        <id>config</id>\r
-                        <goals>\r
-                            <goal>generate-sources</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <codeGenerators>\r
-                                <generator>\r
-                                    <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>\r
-                                    <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>\r
-                                    <additionalConfiguration>\r
-                                        <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>\r
-                                    </additionalConfiguration>\r
-                                </generator>\r
-                                <generator>\r
-                                    <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>\r
-                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>\r
-                                </generator>\r
-                            </codeGenerators>\r
-                            <inspectDependencies>true</inspectDependencies>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-                <dependencies>\r
-                    <dependency>\r
-                        <groupId>org.opendaylight.yangtools</groupId>\r
-                        <artifactId>maven-sal-api-gen-plugin</artifactId>\r
-                        <version>${yangtools.version}</version>\r
-                        <type>jar</type>\r
-                    </dependency>\r
-                    <dependency>\r
-                        <groupId>org.opendaylight.controller</groupId>\r
-                        <artifactId>yang-jmx-generator-plugin</artifactId>\r
-                        <version>0.2.5-SNAPSHOT</version>\r
-                    </dependency>\r
-                </dependencies>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
-\r
-    <dependencies>\r
-        <dependency>\r
-            <groupId>${groupId}</groupId>\r
-            <artifactId>${rootArtifactId}-model</artifactId>\r
-            <version>${version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
-            <artifactId>config-api</artifactId>\r
-            <version>${config.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
-            <artifactId>sal-binding-config</artifactId>\r
-            <version>${mdsal.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
-            <artifactId>sal-binding-api</artifactId>\r
-            <version>${mdsal.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
-            <artifactId>sal-common-util</artifactId>\r
-            <version>${mdsal.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-      <groupId>equinoxSDK381</groupId>\r
-      <artifactId>org.eclipse.osgi</artifactId>\r
-      <version>${equinox.osgi.version}</version>\r
-    </dependency>\r
-    </dependencies>\r
-</project>\r
+<?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>
+        <artifactId>${rootArtifactId}</artifactId>
+        <groupId>${groupId}</groupId>
+        <version>${version}</version>
+    </parent>
+    <artifactId>${rootArtifactId}-provider</artifactId>
+    <packaging>bundle</packaging>
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+      <tag>HEAD</tag>
+  </scm>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>${bundle.plugin.version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.opendaylight.controller.config.yang.config.${appName}_provider.impl</Export-Package>
+                        <Import-Package>*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+                <version>${yangtools.version}</version>
+                <executions>
+                    <execution>
+                        <id>config</id>
+                        <goals>
+                            <goal>generate-sources</goal>
+                        </goals>
+                        <configuration>
+                            <codeGenerators>
+                                <generator>
+                                    <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
+                                    <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
+                                    <additionalConfiguration>
+                                        <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
+                                    </additionalConfiguration>
+                                </generator>
+                                <generator>
+                                    <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                                </generator>
+                            </codeGenerators>
+                            <inspectDependencies>true</inspectDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.yangtools</groupId>
+                        <artifactId>maven-sal-api-gen-plugin</artifactId>
+                        <version>${yangtools.version}</version>
+                        <type>jar</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.opendaylight.controller</groupId>
+                        <artifactId>yang-jmx-generator-plugin</artifactId>
+                        <version>0.2.5-SNAPSHOT</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-model</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+            <version>${config.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-config</artifactId>
+            <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-api</artifactId>
+            <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-common-util</artifactId>
+            <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+      <version>${equinox.osgi.version}</version>
+    </dependency>
+    </dependencies>
+</project>