Bump versions by x.y.(z+1)

[netconf.git] / netconf / netconf-console / pom.xml

diff --git a/netconf/netconf-console/pom.xml b/netconf/netconf-console/pom.xml
index 034881267a43538bc02b6d9c03991b4cc16a3536..98166dd48ba699486f079b55ca9515152aabd999 100644 (file)
--- a/netconf/netconf-console/pom.xml
+++ b/netconf/netconf-console/pom.xml
@@ -9,56 +9,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>bundle-parent</artifactId>
-    <version>3.0.2</version>
-    <relativePath/>
+    <groupId>org.opendaylight.netconf</groupId>
+    <artifactId>netconf-parent</artifactId>
+    <version>1.6.3-SNAPSHOT</version>
+    <relativePath>../netconf-parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-console</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.6.3-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.1</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
       <!-- Apache Karaf console dependency -->
       <dependency>
           <groupId>org.apache.karaf.shell</groupId>
           <artifactId>org.apache.karaf.shell.console</artifactId>
-          <version>${karaf.version}</version>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.karaf.shell</groupId>
-          <artifactId>org.apache.karaf.shell.table</artifactId>
-          <version>${karaf.version}</version>
           <scope>provided</scope>
       </dependency>
 
@@ -68,44 +35,39 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
           <artifactId>sal-netconf-connector</artifactId>
       </dependency>
       <dependency>
-          <groupId>org.mockito</groupId>
-          <artifactId>mockito-core</artifactId>
-          <scope>test</scope>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-test-util</artifactId>
       </dependency>
       <dependency>
-          <groupId>org.powermock</groupId>
-          <artifactId>powermock-module-junit4</artifactId>
+          <groupId>org.opendaylight.mdsal</groupId>
+          <artifactId>mdsal-binding-dom-adapter</artifactId>
           <scope>test</scope>
       </dependency>
       <dependency>
-          <groupId>org.powermock</groupId>
-          <artifactId>powermock-api-mockito</artifactId>
+          <groupId>org.opendaylight.mdsal</groupId>
+          <artifactId>mdsal-binding-dom-adapter</artifactId>
           <scope>test</scope>
+          <type>test-jar</type>
       </dependency>
       <dependency>
-          <groupId>org.powermock</groupId>
-          <artifactId>powermock-core</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-test-util</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-broker-impl</artifactId>
+          <groupId>org.awaitility</groupId>
+          <artifactId>awaitility</artifactId>
           <scope>test</scope>
-    </dependency>
+      </dependency>
   </dependencies>
 
   <build>
-    <plugins>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <configuration>
-                <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-            </configuration>
-        </plugin>
-    </plugins>
-  </build>
+      <plugins>
+          <plugin>
+              <groupId>org.apache.felix</groupId>
+              <artifactId>maven-bundle-plugin</artifactId>
+              <extensions>true</extensions>
+              <configuration>
+                  <instructions>
+                      <Karaf-Commands>*</Karaf-Commands>
+                  </instructions>
+              </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>