Merge branch 'master' into alarm-search-provider

OpenNMS · Apr 9, 2014 · f705e36 · f705e36
2 parents 587dfb4 + e2280e3
commit f705e36
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/opennms-full-assembly/pom.xml b/opennms-full-assembly/pom.xml
@@ -197,7 +197,7 @@
             <configuration>
               <karafVersion>DONT_USE_STANDARD_FEATURES</karafVersion>
               <descriptors>
-                <descriptor>mvn:org.opennms.osgi/all/${project.version}/xml/features</descriptor>
+                <descriptor>mvn:org.opennms.karaf/opennms/${project.version}/xml/features</descriptor>
               </descriptors>
               <features>
                 <feature>http-whiteboard</feature>
@@ -492,8 +492,8 @@
       <classifier>etc</classifier>
     </dependency>
     <dependency>
-      <groupId>org.opennms.osgi</groupId>
-      <artifactId>all</artifactId>
+      <groupId>org.opennms.karaf</groupId>
+      <artifactId>opennms</artifactId>
       <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>