Update .gitreview to stable/carbon

[odlparent.git] / features-test / pom.xml

diff --git a/features-test/pom.xml b/features-test/pom.xml
index 7a73a75decbc0af8f93eaec3641edafa2be7244e..a9aa2c1fcf5ec6c3c014104ef73deaa9c3b372d0 100644 (file)
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../bundle-parent</relativePath>
     </parent>
 
@@ -44,11 +44,18 @@
             <artifactId>pax-url-aether</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-http</artifactId>
+            <version>2.10</version>
+            <scope>compile</scope>
+        </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 +66,49 @@
             <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>
+            <scope>compile</scope>
         </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.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bundles-test</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -94,26 +126,17 @@
             </plugin>
             <plugin>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>${checkstyle.version}</version>
+                <configuration>
+                    <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+                </configuration>
                 <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>