Merge "Samples/maven-code-gen-sample pom.xml updated after recent changes."

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml
index 896827ee45414e0d0b2d0dd8b621f296ac583444..8d846a13e60f3efa658eb56a08590c264edc5ed3 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml
@@ -17,4 +17,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTest.java b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
similarity index 96%
rename from opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTest.java
rename to opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
index e77ec6c46b87b2a04bd61a46d036079f3ce4870c..9535468ed52fefedaa58fb0aca0860337aa9d74e 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTest.java
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
@@ -16,7 +16,7 @@ import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.Verifier;
 import org.junit.Test;
 
-public class YangToSourcesPluginTest {
+public class YangToSourcesPluginTestIT {
 
     // TODO Test yang files in transitive dependencies
 
@@ -112,7 +112,7 @@ public class YangToSourcesPluginTest {
 
     @Test
     public void testNoOutputDir() throws VerificationException {
-        Verifier v = YangToSourcesPluginTest.setUp("NoOutputDir/", false);
+        Verifier v = YangToSourcesPluginTestIT.setUp("NoOutputDir/", false);
         verifyCorrectLog(v);
     }
 
@@ -126,7 +126,7 @@ public class YangToSourcesPluginTest {
         v1.assertFilePresent("target/classes/META-INF/yang/testfile2.yang");
         v1.assertFilePresent("target/classes/META-INF/yang/testfile3.yang");
 
-        Verifier v2 = YangToSourcesPluginTest.setUp("GenerateTest2/", false);
+        Verifier v2 = YangToSourcesPluginTestIT.setUp("GenerateTest2/", false);
         v2.executeGoal("clean");
         v2.executeGoal("package");
         v2.assertFilePresent("target/classes/META-INF/yang/private.yang");

diff --git a/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml b/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml
index 03a2e8588e6d5e908b7bf32286d38614b5e0838a..b1bcb062b81632ec4c9a101c9783bf17ba664b54 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml
@@ -31,8 +31,7 @@
                                     </outputBaseDir>
                                 </generator>
                             </codeGenerators>
-                            <resourceProviders>
-                            </resourceProviders>
+                            <inspectDependencies>false</inspectDependencies>
                         </configuration>
                     </execution>
                 </executions>