X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-test%2Fpom.xml;h=a735fb21879f18c1b2205276a6fc13f6d91f290c;hb=977a1e6956c517c05c66969e1da6139c3b02b7f4;hp=cfeba4390e3d0b87cc1ae539f125a7dfab24e935;hpb=98b1098b38944dc4a39a521c0bebd6958ef8fcc3;p=odlparent.git

diff --git a/features-test/pom.xml b/features-test/pom.xml
index cfeba4390..a735fb218 100644
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ Copyright © 2014, 2017 Cisco Systems, Inc. and others.  All rights reserved.
 
  This program and the accompanying materials are made available under the
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>8.1.1-SNAPSHOT</version>
         <relativePath>../bundle-parent</relativePath>
     </parent>
 
@@ -22,6 +22,10 @@
     <packaging>bundle</packaging>
     <name>ODL :: odlparent :: ${project.artifactId}</name>
 
+    <properties>
+        <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+    </properties>
+
     <dependencies>
         <!-- Dependencies for pax exam karaf container -->
         <dependency>
@@ -44,11 +48,17 @@
             <artifactId>pax-url-aether</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <!-- required due to https://jira.opendaylight.org/browse/ODLPARENT-136 -->
+            <artifactId>osgi.cmpn</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
-            <artifactId>org.apache.karaf.features.core</artifactId>
+            <artifactId>standard</artifactId>
             <version>${karaf.version}</version>
-            <scope>compile</scope>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -59,24 +69,90 @@
             <groupId>org.apache.karaf.deployer</groupId>
             <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
             <version>${karaf.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.deployer</groupId>
             <artifactId>org.apache.karaf.deployer.features</artifactId>
             <version>${karaf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.deployer</groupId>
-            <artifactId>org.apache.karaf.deployer.spring</artifactId>
-            <version>${karaf.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-wrap</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.guicedee.services</groupId>
+            <artifactId>javax.inject</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>opendaylight-karaf-empty</artifactId>
+            <type>zip</type>
+        </dependency>
+        <!-- BEWARE of adding additional dependencies here...
+             It will cause weird issues e.g. in integration/distribution/features/repos/distribution -->
+        <dependency>
+          <groupId>org.opendaylight.odlparent</groupId>
+          <artifactId>karaf-util</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bundles4-test</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.bundle</groupId>
+            <artifactId>org.apache.karaf.bundle.core</artifactId>
+            <version>${karaf.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+          <scope>compile</scope>
+        </dependency>
+        <!-- The following, which are just transitive dependencies of bundles4-test,
+             have to be repeated here so that the Embed-Dependency below for maven-bundle-plugin works: -->
+        <dependency>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest</artifactId>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.awaitility</groupId>
+          <artifactId>awaitility</artifactId>
+          <scope>provided</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>cglib</groupId>
+              <artifactId>cglib-nodep</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.objenesis</groupId>
+              <artifactId>objenesis</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <!-- Real <scope>test dependencies, just for SingleFeatureTestUnitTest -->
+        <dependency>
+          <groupId>com.google.truth</groupId>
+          <artifactId>truth</artifactId>
+          <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -91,28 +167,24 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                  <instructions>
+                    <Embed-Dependency>bundles4-test;inline=true,awaitility;inline=true,hamcrest;inline=true</Embed-Dependency>
+                    <!-- same as in bundles4-test/pom.xml: -->
+                    <Import-Package>!net.sf.cglib.proxy,!org.objenesis,*</Import-Package>
+                  </instructions>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>check-license</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>process-sources</phase>
                         <configuration>
-                            <configLocation>check-license.xml</configLocation>
-                            <headerLocation>EPL-LICENSE.regexp.txt</headerLocation>
-                            <includeResources>false</includeResources>
-                            <includeTestResources>false</includeTestResources>
-                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
                             <excludes>
                                 <!-- Skip Apache Licensed files -->
-                                org/opendaylight/odlparent/featuretest/CustomBundleURLStreamHandlerFactory.java
+                                org/opendaylight/odlparent/featuretest/CustomBundleUrlStreamHandlerFactory.java
                             </excludes>
-                            <failsOnError>false</failsOnError>
-                            <consoleOutput>true</consoleOutput>
                         </configuration>
                     </execution>
                 </executions>
@@ -120,19 +192,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>