Enabled feature-test for features-yangtools.

Note: We were randomly getting surefire version
2.12.4 because no surefire version was specified.
${maven.surefire.version} is set in odlparent
but we need to apply it in the yang parent pom
because 'dependenciesToScan' is only available
starting in 2.15.

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

diff --git a/common/features/pom.xml b/common/features/pom.xml
index ea54b1d7208254d03cf177b0bbdcc3cb1490af84..8ce171760d818c55898b2492338a0c2702d95247 100644 (file)
--- a/common/features/pom.xml
+++ b/common/features/pom.xml
@@ -17,7 +17,7 @@
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <artifactId>features-yangtools</artifactId>
-   <packaging>pom</packaging>
+   <packaging>jar</packaging>
    <properties>
       <features.file>features.xml</features.file>
    </properties>
@@ -82,6 +82,15 @@
                </execution>
             </executions>
          </plugin>
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-surefire-plugin</artifactId>
+           <configuration>
+            <dependenciesToScan>
+              <dependency>org.opendaylight.yangtools:features-test</dependency>
+            </dependenciesToScan>
+           </configuration>
+         </plugin>
       </plugins>
    </build>
    <dependencies>
@@ -101,9 +110,14 @@
        <groupId>org.opendaylight.yangtools.model</groupId>
        <artifactId>opendaylight-l2-types</artifactId>
      </dependency>
+     <dependency>
+       <groupId>org.opendaylight.yangtools.model</groupId>
+       <artifactId>ietf-topology</artifactId>
+     </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools.thirdparty</groupId>
        <artifactId>antlr4-runtime-osgi-nohead</artifactId>
+       <scope>compile</scope>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
@@ -221,5 +235,15 @@
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>restconf-common</artifactId>
      </dependency>
+     <dependency>
+       <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+       <artifactId>xtend-lib-osgi</artifactId>
+     </dependency>
+     <!-- test the features.xml -->
+     <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>features-test</artifactId>
+       <scope>test</scope>
+     </dependency>
    </dependencies>
 </project>

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index 4e9fa2caef5f1254f8bb7ee69cc2107eb5e5035c..ec653a59b435d40429c99f1a847300f729591919 100644 (file)
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -502,6 +502,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven.surefire.version}</version>
                     <configuration>
                         <!-- Specific to generate mapping between tests and covered code -->
                         <argLine>${jacoco.agent.ut.arg}</argLine>