Bump versions to 8.1.1-SNAPSHOT

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

diff --git a/features-test/pom.xml b/features-test/pom.xml
index e40fb2b72f6e92cc99a9bab549dd25aba8baf156..a735fb21879f18c1b2205276a6fc13f6d91f290c 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>4.0.4-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>
@@ -47,7 +51,7 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <!-- required due to https://jira.opendaylight.org/browse/ODLPARENT-136 -->
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.cmpn</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
@@ -84,15 +88,20 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
+            <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <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>
@@ -121,7 +130,7 @@
              have to be repeated here so that the Embed-Dependency below for maven-bundle-plugin works: -->
         <dependency>
           <groupId>org.hamcrest</groupId>
-          <artifactId>hamcrest-core</artifactId>
+          <artifactId>hamcrest</artifactId>
           <scope>provided</scope>
         </dependency>
         <dependency>
@@ -160,7 +169,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                   <instructions>
-                    <Embed-Dependency>bundles4-test;inline=true,awaitility;inline=true,hamcrest-core;inline=true</Embed-Dependency>
+                    <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>
@@ -168,9 +177,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-                    <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-                </configuration>
                 <executions>
                     <execution>
                         <id>check-license</id>
@@ -186,45 +192,4 @@
         </plugins>
     </build>
 
-    <!-- We use profiles to handle the different archives which are user-configurable.
-         We need at least one archive to be built. -->
-    <profiles>
-        <profile>
-            <id>zip</id>
-            <activation>
-                <property>
-                    <name>karaf.archiveZip</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.odlparent</groupId>
-                    <artifactId>opendaylight-karaf-empty</artifactId>
-                    <type>zip</type>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>*</groupId>
-                            <artifactId>*</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-            <properties>
-                <archive.extension>zip</archive.extension>
-            </properties>
-        </profile>
-        <profile>
-            <id>tarGz</id>
-            <activation>
-                <property>
-                    <name>karaf.archiveTarGz</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <properties>
-                <archive.extension>tar.gz</archive.extension>
-            </properties>
-        </profile>
-    </profiles>
 </project>