Cleaned-up samples so that they have no red and work out-of-the-box

Change-Id: I91b60ae5a3c9072a489681a92d8c95754d7c8167
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/samples/yang-module1/.classpath b/samples/yang-module1/.classpath
index c663eb3254c9bf2a81e3c52993372dc33e69ff3d..f1789f8789ab299fc35d3ec5d695e2a8c2b803f0 100644 (file)
--- a/samples/yang-module1/.classpath
+++ b/samples/yang-module1/.classpath
@@ -18,10 +18,24 @@
                </attributes>
        </classpathentry>
        <classpathentry combineaccessrules="false" kind="src" path="/yang-module2"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
                <attributes>
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
+       <classpathentry kind="src" output="target/classes" path="src/main/yang">
+               <attributes>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+                       <attribute name="ignore_optional_problems" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" output="target/classes" path="target/generated-sources/sal">
+               <attributes>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+                       <attribute name="ignore_optional_problems" value="true"/>
+               </attributes>
+       </classpathentry>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/samples/yang-module1/pom.xml b/samples/yang-module1/pom.xml
index f26076f5de049aed6e45e0b742e9ac6e65b3a0bd..196fdb5d64210aa05845bf86f1f940d06150e210 100644 (file)
--- a/samples/yang-module1/pom.xml
+++ b/samples/yang-module1/pom.xml
@@ -1,27 +1,31 @@
 <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>
+
        <groupId>yang-test</groupId>
        <artifactId>yang-module1</artifactId>
        <version>0.0.1-SNAPSHOT</version>
-<!-- 
+
        <properties>
-               <maven.compiler.source>1.7</maven.compiler.source>
-               <maven.compiler.target>1.7</maven.compiler.target>
+               <maven.compiler.source>1.8</maven.compiler.source>
+               <maven.compiler.target>1.8</maven.compiler.target>
+               <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
+               <mdsal.version>0.9.0-SNAPSHOT</mdsal.version>
        </properties>
-        -->
+       
        <dependencies>
                <dependency>
                        <groupId>org.opendaylight.mdsal</groupId>
                        <artifactId>yang-binding</artifactId>
-                       <version>0.8.0-Beryllium</version>
+                       <version>${mdsal.version}</version>
                </dependency>
                <dependency>
                        <groupId>yang-test</groupId>
                        <artifactId>yang-module2</artifactId>
-                       <version>0.0.1-SNAPSHOT</version>
+                       <version>${project.version}</version>
                </dependency>
        </dependencies>
+
        <repositories>
                <repository>
                        <id>opendaylight-release</id>
@@ -34,6 +38,7 @@
                        <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
                </repository>
        </repositories>
+
        <pluginRepositories>
                <pluginRepository>
                        <id>opendaylight-release</id>
@@ -46,12 +51,13 @@
                        <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
                </pluginRepository>
        </pluginRepositories>
+       
        <build>
                <plugins>
                        <plugin>
                                <groupId>org.opendaylight.yangtools</groupId>
                                <artifactId>yang-maven-plugin</artifactId>
-                               <version>0.8.0-Beryllium</version>
+                               <version>${yangtools.version}</version>
                                <executions>
                                        <execution>
                                                <id>generate-sources</id>
@@ -74,7 +80,7 @@
                                        <dependency>
                                                <groupId>org.opendaylight.mdsal</groupId>
                                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                               <version>0.8.0-Beryllium</version>
+                                               <version>${mdsal.version}</version>
                                        </dependency>
                                </dependencies>
                        </plugin>

diff --git a/samples/yang-module2/.classpath b/samples/yang-module2/.classpath
index 9959c4b81276923dbbaffc08e1d790b4e536ed04..13a16d526fded7ef93d139e333b5d59c616f3ed1 100644 (file)
--- a/samples/yang-module2/.classpath
+++ b/samples/yang-module2/.classpath
@@ -17,11 +17,24 @@
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+       <classpathentry kind="src" output="target/classes" path="src/main/yang">
+               <attributes>
+                       <attribute name="ignore_optional_problems" value="true"/>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" output="target/classes" path="target/generated-sources/sal">
+               <attributes>
+                       <attribute name="ignore_optional_problems" value="true"/>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
                <attributes>
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/samples/yang-module2/pom.xml b/samples/yang-module2/pom.xml
index a3595b1eb20a403a860d083269de58c86caa81fc..1fcc08a4e237b1a8a6c71c7f2f939ab626d26286 100644 (file)
--- a/samples/yang-module2/pom.xml
+++ b/samples/yang-module2/pom.xml
@@ -1,19 +1,25 @@
 <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>
+
   <groupId>yang-test</groupId>
   <artifactId>yang-module2</artifactId>
   <version>0.0.1-SNAPSHOT</version>
+
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
+    <mdsal.version>0.9.0-SNAPSHOT</mdsal.version>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
-      <version>0.8.0-Beryllium</version>
+      <version>${mdsal.version}</version>
     </dependency>
   </dependencies>
+
   <repositories>
     <repository>
       <id>opendaylight-release</id>
@@ -26,6 +32,7 @@
       <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
     </repository>
   </repositories>
+
   <pluginRepositories>
     <pluginRepository>
       <id>opendaylight-release</id>
@@ -38,12 +45,13 @@
       <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
     </pluginRepository>
   </pluginRepositories>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-maven-plugin</artifactId>
-        <version>0.8.0-Beryllium</version>
+        <version>${yangtools.version}</version>
         <executions>
           <execution>
             <id>generate-sources</id>
@@ -66,7 +74,7 @@
           <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>maven-sal-api-gen-plugin</artifactId>
-            <version>0.8.0-Beryllium</version>
+            <version>${mdsal.version}</version>
           </dependency>
         </dependencies>
       </plugin>