Bump jacoco to 0.8.4

[odlparent.git] / single-feature-parent / pom.xml

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index ec56980780af3239f307789cbcec4f77cca20d71..a9ee940f3e18f6d5634ea2b7d8192e77a7874764 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -34,7 +34,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>untested-single-feature-parent</artifactId>
-        <version>1.9.1-SNAPSHOT</version>
+        <version>5.0.1-SNAPSHOT</version>
         <relativePath>../untested-single-feature-parent</relativePath>
     </parent>
 
@@ -43,7 +43,6 @@
     <name>ODL :: odlparent :: ${project.artifactId}</name>
 
     <properties>
-        <karaf.version>${karaf4.version}</karaf.version>
         <jacoco.skip>true</jacoco.skip>
         <skip.karaf.featureTest>false</skip.karaf.featureTest>
     </properties>
@@ -52,20 +51,20 @@
         <!-- Test the generated features.xml -->
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features4-test</artifactId>
-            <version>1.9.1-SNAPSHOT</version>
+            <artifactId>features-test</artifactId>
+            <version>5.0.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>bundles-test-lib</artifactId>
-            <version>1.9.1-SNAPSHOT</version>
+            <version>5.0.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.bundle</groupId>
             <artifactId>org.apache.karaf.bundle.core</artifactId>
-            <version>${karaf4.version}</version>
+            <version>${karaf.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- Force SLF4J to test scope -->
@@ -74,21 +73,30 @@
             <artifactId>slf4j-api</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <!-- required due to https://jira.opendaylight.org/browse/ODLPARENT-136 -->
+            <artifactId>osgi.cmpn</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.surefire.version}</version>
                 <configuration>
                     <dependenciesToScan>
-                        <dependency>org.opendaylight.odlparent:features4-test</dependency>
+                        <dependency>org.opendaylight.odlparent:features-test</dependency>
                     </dependenciesToScan>
                     <additionalClasspathElements>
                         <additionalClasspathElement>${project.build.directory}/feature</additionalClasspathElement>
                     </additionalClasspathElements>
                     <skip>${skip.karaf.featureTest}</skip>
+                    <systemPropertyVariables>
+                      <!-- Use the same repository for Pax Exam as is used for Maven -->
+                      <org.ops4j.pax.url.mvn.localRepository>${settings.localRepository}</org.ops4j.pax.url.mvn.localRepository>
+                    </systemPropertyVariables>
                 </configuration>
                 <executions>
                     <execution>
@@ -102,20 +110,4 @@
         </plugins>
     </build>
 
-    <!--
-        Maven Site Configuration
-
-        The following configuration is necessary for maven-site-plugin to
-        correctly identify the correct deployment path for OpenDaylight Maven
-        sites.
-    -->
-    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-    <distributionManagement>
-        <site>
-            <id>opendaylight-site</id>
-            <url>${nexus.site.url}/${project.artifactId}/</url>
-        </site>
-    </distributionManagement>
-
 </project>