X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=plugin%2Fyang-maven-plugin-it%2Fpom.xml;h=7f301c8b2262c62783ce0929a267af513d337d82;hb=529a0a9abcfd24d53a2e06f198b85b3fa06389ff;hp=ea45b46fff27702d739e5b8a497f972243ac4ae3;hpb=0763aa40fdea0d675bd1e7f7ae5f4d4b368e513e;p=yangtools.git

diff --git a/plugin/yang-maven-plugin-it/pom.xml b/plugin/yang-maven-plugin-it/pom.xml
index ea45b46fff..7f301c8b22 100644
--- a/plugin/yang-maven-plugin-it/pom.xml
+++ b/plugin/yang-maven-plugin-it/pom.xml
@@ -12,70 +12,63 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>9.0.2</version>
+        <version>9.0.11</version>
         <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>yang-maven-plugin-it</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
+
+    <properties>
+        <!-- We are doing abhorrent things here unpacking our dependencies, which confuses analysis, just skip it -->
+        <odlparent.dependency.skip>true</odlparent.dependency.skip>
+    </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-verifier</artifactId>
-            <version>1.6</version>
+            <version>1.7.2</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <!-- Use com.google.code.findbugs:annotations instead of jsr305 -->
-                    <artifactId>jsr305</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-maven-plugin</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
-      <testResources>
-        <testResource>
-          <directory>${basedir}/src/test/resources</directory>
-          <filtering>true</filtering>
-        </testResource>
-      </testResources>
+        <testResources>
+            <testResource>
+                <directory>${basedir}/src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
         <plugins>
-          <plugin>
-            <artifactId>maven-resources-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>default-testResources</id>
-                <phase>process-test-resources</phase>
-                <goals>
-                  <goal>testResources</goal>
-                </goals>
-                <configuration>
-                  <useDefaultDelimiters>false</useDefaultDelimiters>
-                  <delimiters>
-                    <delimiter>@</delimiter>
-                  </delimiters>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
             <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
+                <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>default-testResources</id>
+                        <phase>process-test-resources</phase>
                         <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
+                            <goal>testResources</goal>
                         </goals>
+                        <configuration>
+                            <useDefaultDelimiters>false</useDefaultDelimiters>
+                            <delimiters>
+                                <delimiter>@</delimiter>
+                            </delimiters>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -101,14 +94,71 @@
                 </configuration>
                 <executions>
                     <execution>
-                      <phase>pre-integration-test</phase>
-                      <goals>
-                          <goal>effective-settings</goal>
-                      </goals>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>effective-settings</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <!-- We want to pass argLine down to maven invocations, not to failsafe -->
+                            <argLine>-DitArgPath='@{argLine}'</argLine>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>merge-reports</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>merge</goal>
+                        </goals>
+                        <configuration>
+                            <fileSets>
+                                <fileSet>
+                                    <directory>${project.build.directory}/test-classes/test-parent</directory>
+                                    <includes>
+                                        <include>*.exec</include>
+                                    </includes>
+                                </fileSet>
+                            </fileSets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Okay, this is rather ugly, but is needed to fool JaCoCo to generate an XML report -->
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>fake-classes</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeGroupIds>org.opendaylight.yangtools</includeGroupIds>
+                            <includes>**/*.class</includes>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-
 </project>