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

[netconf.git] / netconf / sal-netconf-connector / pom.xml

diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml
index 2f2a091302fb20acc90594c866b4855aea1cd850..b2bcb60259b92d6c19d62b1f187172e1e03bbeb5 100644 (file)
--- a/netconf/sal-netconf-connector/pom.xml
+++ b/netconf/sal-netconf-connector/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.4-SNAPSHOT</version>
     <relativePath>../netconf-parent</relativePath>
   </parent>
 
@@ -19,7 +19,7 @@
   <artifactId>sal-netconf-connector</artifactId>
 
   <!-- Preserve version from mdsal -->
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.4-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -40,8 +40,8 @@
       <artifactId>ietf-netconf-notifications</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>ietf-netconf-yang-library</artifactId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>rfc7895</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -59,10 +59,6 @@
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-generator-impl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
-      <artifactId>model-inventory</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-topology</artifactId>
@@ -99,6 +95,10 @@
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types-2013-07-15</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>yang-ext</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -107,11 +107,6 @@
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>config-netconf-connector</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-impl</artifactId>
@@ -153,13 +148,8 @@
       <artifactId>gson</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -174,16 +164,4 @@
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
   </scm>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>