Freeze upstream versions

[genius.git] / karaf / pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 22f5393737f723ef2bbb320944e4fbcebf6ccd40..9fdf6f49a7a6b7bcd533b45aab0a5aff411fe7b7 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,56 +12,46 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>1.9.0</version>
+    <version>8.1.1</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.genius</groupId>
   <artifactId>genius-karaf</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: genius :: ${project.artifactId}</name>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>genius-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <!-- scope is compile so all features (there is only one) are installed
       into startup.properties and the feature repo itself is not installed -->
       <groupId>org.apache.karaf.features</groupId>
       <artifactId>framework</artifactId>
+      <version>${karaf.version}</version>
       <type>kar</type>
+      <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>features4-genius</artifactId>
+      <artifactId>genius-features</artifactId>
+      <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
 
-  <!-- For CSIT, temporarily *DO* install or deploy the karaf artifact! -->
-  <!-- TODO : Change 'false' back to 'true' and comment: DO NOT install or deploy the karaf artifact -->
+  <!-- DO NOT install or deploy the karaf artifact -->
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>          
-          <skip>false</skip>
+        <configuration>
+          <skip>true</skip>
         </configuration>
       </plugin>
     </plugins>